diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index d4a3000cb..849055699 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -10,11 +10,14 @@ 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/http.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:](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)
@@ -69,9 +72,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)
@@ -104,6 +109,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](bardjs/bardjs.d.ts) [bardjs](https://github.com/wardbell/bardjs) by [Andrew Archibald](https://github.com/TepigMC)
 * [: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)
@@ -112,6 +118,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)
@@ -119,7 +126,7 @@ 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)
@@ -144,7 +151,7 @@ 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/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)
@@ -155,6 +162,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)
@@ -167,11 +175,13 @@ 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/showhint.d.ts) [CodeMirror](https://github.com/marijnh/CodeMirror) by [jacqt](https://github.com/jacqt)
 * [: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:](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:](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)
@@ -192,7 +202,10 @@ 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:](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)
@@ -236,6 +249,7 @@ 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), [Samira Bazuzi](https://github.com/bazuzi)
 * [:link:](domo/domo.d.ts) [Domo](http://domo-js.com) by [Steve Fenton](https://github.com/Steve-Fenton)
@@ -265,6 +279,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
@@ -307,12 +322,14 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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), [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)
@@ -320,7 +337,7 @@ 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)
@@ -331,17 +348,19 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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.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-core-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)
@@ -356,6 +375,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)
@@ -383,18 +403,22 @@ 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/Core.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)
 * [: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)
 * [: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)
@@ -403,6 +427,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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-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)
@@ -414,6 +439,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
@@ -422,9 +449,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)
@@ -455,8 +485,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](html2canvas/html2canvas.d.ts) [html2canvas.js](https://github.com/niklasvh/html2canvas) by [Richard Hepburn](https://github.com/rwhepburn)
 * [:link:](htmlparser2/htmlparser2.d.ts) [htmlparser2 v3.7.x](https://github.com/fb55/htmlparser2) by [James Roland Cabresos](https://github.com/staticfunction)
 * [:link:](htmltojsx/htmltojsx.d.ts) [htmltojsx](https://www.npmjs.com/package/htmltojsx) by [Basarat Ali Syed](https://github.com/basarat)
-* [:link:](statuses/statuses.d.ts) [http-errors](https://github.com/jshttp/statuses) by [Tanguy Krotoff](https://github.com/tkrotoff)
 * [:link:](http-errors/http-errors.d.ts) [http-errors](https://github.com/jshttp/http-errors) by [Tanguy Krotoff](https://github.com/tkrotoff)
+* [: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)
@@ -476,6 +506,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)
@@ -497,10 +528,12 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
@@ -519,7 +552,7 @@ 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.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)
@@ -543,6 +576,7 @@ 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)
@@ -585,13 +619,13 @@ 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-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-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)
@@ -608,6 +642,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)
@@ -627,6 +662,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
@@ -667,6 +703,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)
@@ -709,15 +746,18 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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:](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)
@@ -745,16 +785,18 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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.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:](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-node.d.ts) [mocha](http://mochajs.org) by [Vadim Macagon](https://github.com/enlight), [vvakame](https://github.com/vvakame)
+* [: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-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)
 * [:link:](modernizr/modernizr.d.ts) [Modernizr](http://modernizr.com) by [Boris Yankov](https://github.com/borisyankov), [Theodore Brown](https://github.com/theodorejb)
 * [:link:](moment-timezone/moment-timezone.d.ts) [moment-timezone.js](http://momentjs.com/timezone) by [Michel Salib](https://github.com/michelsalib)
-* [:link:](moment/moment-node.d.ts) [Moment.js](https://github.com/timrwood/moment) by [Michael Lakerveld](https://github.com/Lakerfield), [Aaron King](https://github.com/kingdango), [Hiroki Horiuchi](https://github.com/horiuchi), [Dick van den Brink](https://github.com/DickvdBrink), [Adi Dahiya](https://github.com/adidahiya), [Matt Brooks](https://github.com/EnableSoftware)
 * [:link:](moment/moment.d.ts) [Moment.js](https://github.com/timrwood/moment) by [Michael Lakerveld](https://github.com/Lakerfield), [Aaron King](https://github.com/kingdango), [Hiroki Horiuchi](https://github.com/horiuchi), [Dick van den Brink](https://github.com/DickvdBrink), [Adi Dahiya](https://github.com/adidahiya), [Matt Brooks](https://github.com/EnableSoftware)
 * [:link:](moment-range/moment-range.d.ts) [Moment.js](https://github.com/gf3/moment-range) by [Bart van den Burg](https://github.com/Burgov), [Wilgert Velinga](https://github.com/wilgert)
+* [:link:](moment/moment-node.d.ts) [Moment.js](https://github.com/timrwood/moment) by [Michael Lakerveld](https://github.com/Lakerfield), [Aaron King](https://github.com/kingdango), [Hiroki Horiuchi](https://github.com/horiuchi), [Dick van den Brink](https://github.com/DickvdBrink), [Adi Dahiya](https://github.com/adidahiya), [Matt Brooks](https://github.com/EnableSoftware)
 * [:link:](mongodb/mongodb.d.ts) [MongoDB](https://github.com/mongodb/node-mongodb-native) by [Boris Yankov](https://github.com/borisyankov)
 * [:link:](mongoose/mongoose.d.ts) [Mongoose](http://mongoosejs.com) by [horiuchi](https://github.com/horiuchi)
 * [:link:](mongoose-mock/mongoose-mock.d.ts) [mongoose-mock](https://github.com/JohanObrink/mongoose-mock) by [jt000](https://github.com/jt000)
@@ -767,7 +809,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)
@@ -778,8 +821,10 @@ 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)
@@ -791,10 +836,15 @@ 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:](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)
@@ -806,10 +856,11 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
@@ -821,12 +872,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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)
@@ -834,19 +882,21 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](nodeunit/nodeunit.d.ts) [nodeunit](https://github.com/caolan/nodeunit) by [Jeff Goddard](https://github.com/jedigo)
 * [:link:](nomnom/nomnom.d.ts) [nomnom](https://github.com/harthur/nomnom) by [Paul Vick](https://github.com/panopticoncentral)
 * [:link:](nopt/nopt.d.ts) [nopt](https://github.com/npm/nopt) by [jbondc](https://github.com/jbondc)
-* [:link:](notify/notify.d.ts) [Notify.js](https://github.com/jpillora/notifyjs) by [Xiaohan Zhang](https://github.com/hellochar)
 * [:link:](notifyjs/notifyjs.d.ts) [notify.js](https://github.com/alexgibson/notify.js) by [soundTricker](https://github.com/soundTricker)
-* [:link:](wnumb/wnumb.d.ts) [nouislider](https://github.com/leongersen/wnumb) by [Corey Jepperson](https://github.com/acoreyj)
+* [: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:](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:](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)
@@ -869,9 +919,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](pascal-case/pascal-case.d.ts) [pascal-case](https://github.com/blakeembrey/pascal-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
 * [:link:](passport/passport.d.ts) [Passport](http://passportjs.org) by [Horiuchi_H](https://github.com/horiuchi)
 * [:link:](passport-strategy/passport-strategy.d.ts) [Passport Strategy module](https://github.com/jaredhanson/passport-strategy) by [Lior Mualem](https://github.com/liorm)
-* [:link:](passport-twitter/passport-twitter.d.ts) [passport-facebook](https://github.com/jaredhanson/passport-facebook) by [James Roland Cabresos](https://github.com/staticfunction)
-* [:link:](passport-google-oauth/passport-google-oauth.d.ts) [passport-facebook](https://github.com/jaredhanson/passport-facebook) by [James Roland Cabresos](https://github.com/staticfunction)
 * [:link:](passport-facebook/passport-facebook.d.ts) [passport-facebook](https://github.com/jaredhanson/passport-facebook) by [James Roland Cabresos](https://github.com/staticfunction)
+* [:link:](passport-google-oauth/passport-google-oauth.d.ts) [passport-facebook](https://github.com/jaredhanson/passport-facebook) by [James Roland Cabresos](https://github.com/staticfunction)
+* [:link:](passport-twitter/passport-twitter.d.ts) [passport-facebook](https://github.com/jaredhanson/passport-facebook) by [James Roland Cabresos](https://github.com/staticfunction)
 * [:link:](passport-facebook-token/passport-facebook-token.d.ts) [passport-facebook-token](https://github.com/drudge/passport-facebook-token) by [Ray Martone](https://github.com/rmartone)
 * [:link:](passport-local/passport-local.d.ts) [passport-local](https://github.com/jaredhanson/passport-local) by [Maxime LUCE](https://github.com/SomaticIT)
 * [:link:](path-case/path-case.d.ts) [path-case](https://github.com/blakeembrey/path-case) by [Sam Saint-Pettersen](https://github.com/stpettersens)
@@ -890,6 +940,8 @@ 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:](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)
@@ -914,6 +966,7 @@ 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)
@@ -925,10 +978,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)
@@ -936,21 +991,29 @@ 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-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:](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)
@@ -961,13 +1024,16 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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)
@@ -1008,8 +1074,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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](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:](serve-favicon/serve-favicon.d.ts) [serve-favicon](https://github.com/expressjs/serve-favicon) by [Uros Smolnik](https://github.com/urossmolnik)
 * [: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)
 * [:link:](serve-static/serve-static.d.ts) [serve-static](https://github.com/expressjs/serve-static) by [Uros Smolnik](https://github.com/urossmolnik)
 * [:link:](sharedworker/SharedWorker.d.ts) [SharedWorker](http://www.w3.org/TR/workers) by [Toshiya Nakakura](https://github.com/nakakura)
 * [:link:](sharepoint/SharePoint.d.ts) [SharePoint 2010 and 2013](http://sptypescript.codeplex.com) by [Stanislav Vyshchepan](http://blog.gandjustas.ru), [Andrey Markeev](http://markeev.com)
@@ -1023,6 +1089,7 @@ 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)
@@ -1040,6 +1107,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](snapsvg/snapsvg.d.ts) [Snap-SVG](https://github.com/adobe-webplatform/Snap.svg) by [Lars Klein](https://github.com/lhk)
 * [: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-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)
@@ -1057,6 +1125,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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)
@@ -1066,6 +1135,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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)
@@ -1075,10 +1145,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)
@@ -1090,6 +1162,7 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](switchery/switchery.d.ts) [switchery](https://github.com/abpetkov/switchery) by [Bruno Grieder](https://github.com/bgrieder)
 * [: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)
@@ -1125,13 +1198,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)
@@ -1154,15 +1228,16 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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-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)
-* [:link:](umbraco/umbraco-resources.d.ts) [Umbraco](https://github.com/umbraco) by [DeCareSystemsIreland](https://github.com/DeCareSystemsIreland)
+* [: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-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-resources.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:](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)
@@ -1202,7 +1277,9 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [: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:](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)
@@ -1222,6 +1299,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)
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/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/amplify-deferred/amplify-deferred-tests.ts.tscparams b/amplify-deferred/amplify-deferred-tests.ts.tscparams
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/amplify-deferred/amplify-deferred-tests.ts.tscparams
@@ -0,0 +1 @@
+
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/angular-growl-v2/angular-growl-v2.d.ts b/angular-growl-v2/angular-growl-v2.d.ts
index 1c324723f..81338aaca 100644
--- a/angular-growl-v2/angular-growl-v2.d.ts
+++ b/angular-growl-v2/angular-growl-v2.d.ts
@@ -45,7 +45,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-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 dccd8f7b1..694059f77 100644
--- a/angular-ui-router/angular-ui-router-tests.ts
+++ b/angular-ui-router/angular-ui-router-tests.ts
@@ -158,7 +158,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) {
           //
         }
@@ -172,6 +174,20 @@ class UrlLocatorTestService implements IUrlLocatorTestService {
         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;
diff --git a/angular-ui-router/angular-ui-router.d.ts b/angular-ui-router/angular-ui-router.d.ts
index febe1c090..d6c60f47e 100644
--- a/angular-ui-router/angular-ui-router.d.ts
+++ b/angular-ui-router/angular-ui-router.d.ts
@@ -228,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;
@@ -237,10 +240,15 @@ 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;
     }
     
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-tests.ts b/angular2/angular2-tests.ts
index 1cd77cdf4..70deab5d2 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!',
@@ -27,9 +27,9 @@ Cmp.annotations = [
     properties: [
       'text: tooltip'
     ],
-    hostListeners: {
-      'onmouseenter': 'onMouseEnter()',
-      'onmouseleave': 'onMouseLeave()'
+    host: {
+      '(onmouseenter)': 'onMouseEnter()',
+      '(onmouseleave)': 'onMouseLeave()'
     }
   })
 ];
diff --git a/angular2/angular2.d.ts b/angular2/angular2.d.ts
index 15d7f1461..733c9e8ef 100644
--- a/angular2/angular2.d.ts
+++ b/angular2/angular2.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Angular v2.0.0-alpha.36
+// 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
@@ -13,14 +13,26 @@
 // 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 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 */ {
@@ -31,6 +43,27 @@ 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 {}
+}
+
+
 
 
 
@@ -39,6 +72,135 @@ declare module ng {
  */
 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.
    *
@@ -81,14 +243,12 @@ declare module ng {
      * 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;
 
 
     /**
@@ -131,7 +291,7 @@ declare module ng {
      *
      * ```
      */
-     viewBindings: List<any>;
+     viewBindings: any[];
   }
 
 
@@ -614,7 +774,7 @@ declare module ng {
      * <div [class-set]="someExpression | somePipe">
      * ```
      */
-     properties: List<string>;
+     properties: string[];
 
 
     /**
@@ -659,7 +819,7 @@ declare module ng {
      * }
      * ```
      */
-     events: List<string>;
+     events: string[];
 
 
     /**
@@ -760,32 +920,6 @@ declare module ng {
      *
      * 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>;
 
@@ -795,7 +929,7 @@ declare module ng {
      *
      * See {@link LifecycleEvent} for details.
      */
-     lifecycle: List<LifecycleEvent>;
+     lifecycle: LifecycleEvent[];
 
 
     /**
@@ -834,7 +968,7 @@ declare module ng {
      * }
      * ```
      */
-     bindings: List<any>;
+     bindings: any[];
 
 
     /**
@@ -888,14 +1022,40 @@ declare module ng {
 
   /**
    * 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`
+   * - `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.
      *
@@ -904,7 +1064,7 @@ declare module ng {
      * ```
      * @Directive({
      *   ...,
-     *   lifecycle: [LifecycleEvent.onDestroy]
+     *   lifecycle: [LifecycleEvent.OnDestroy]
      * })
      * class ClassSet {
      *   onDestroy() {
@@ -913,7 +1073,7 @@ declare module ng {
      * }
      * ```
      */
-     onDestroy,
+     OnDestroy,
 
 
     /**
@@ -933,12 +1093,12 @@ declare module ng {
      *     'propA',
      *     'propB'
      *   ],
-     *   lifecycle: [LifecycleEvent.onChange]
+     *   lifecycle: [LifecycleEvent.OnChanges]
      * })
      * class ClassSet {
      *   propA;
      *   propB;
-     *   onChange(changes:{[idx: string, PropertyUpdate]}) {
+     *   onChanges(changes:{[idx: string, PropertyUpdate]}) {
      *     // This will get called after any of the properties have been updated.
      *     if (changes['propA']) {
      *       // if propA was updated
@@ -950,7 +1110,7 @@ declare module ng {
      * }
      *  ```
      */
-     onChange,
+     OnChanges,
 
 
     /**
@@ -966,61 +1126,106 @@ declare module ng {
      * ```
      * @Directive({
      *   selector: '[class-set]',
-     *   lifecycle: [LifecycleEvent.onCheck]
+     *   lifecycle: [LifecycleEvent.DoCheck]
      * })
      * class ClassSet {
-     *   onCheck() {
+     *   doCheck() {
      *   }
      * }
      *  ```
      */
-     onCheck,
+     DoCheck,
 
 
     /**
-     * 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.
+     * 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.onInit]
+     *   lifecycle: [LifecycleEvent.AfterContentInit]
      * })
      * class ClassSet {
-     *   onInit() {
+     *
+     *   afterContentInit() {
      *   }
+     *
      * }
      *  ```
      */
-     onInit,
+     AfterContentInit,
 
 
     /**
-     * Notify a directive when the bindings of all its children have been checked (whether they have
-     * changed or not).
+     * 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.onAllChangesDone]
+     *   lifecycle: [LifecycleEvent.AfterContentChecked]
      * })
      * class ClassSet {
      *
-     *   onAllChangesDone() {
+     *   afterContentChecked() {
      *   }
      *
      * }
      *  ```
      */
-     onAllChangesDone
+     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
   }
 
 
@@ -1077,13 +1282,13 @@ declare module ng {
     /**
      * Specifies stylesheet URLs for an angular component.
      */
-     styleUrls: List<string>;
+     styleUrls: string[];
 
 
     /**
      * Specifies an inline stylesheet for an angular component.
      */
-     styles: List<string>;
+     styles: string[];
 
 
     /**
@@ -1108,16 +1313,16 @@ declare module ng {
      * }
      * ```
      */
-     directives: List<Type | any | List<any>>;
+     directives: Array<Type | any | any[]>;
 
-     pipes: List<Type | any | List<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
+     * 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;
   }
@@ -1133,19 +1338,19 @@ declare module ng {
      * Emulate scoping of styles by preprocessing the style rules
      * and adding additional attributes to elements. This is the default.
      */
-     EMULATED,
+     Emulated,
 
 
     /**
      * Uses the native mechanism of the renderer. For the DOM this means creating a ShadowRoot.
      */
-     NATIVE,
+     Native,
 
 
     /**
      * Don't scope the template nor the styles.
      */
-     NONE
+     None
   }
 
 
@@ -1164,7 +1369,7 @@ declare module ng {
 
      isVarBindingQuery: boolean;
 
-     varBindings: List<string>;
+     varBindings: string[];
 
      toString(): string;
   }
@@ -1288,11 +1493,11 @@ declare module ng {
      View(obj: {
     templateUrl?: string,
     template?: string,
-    directives?: List<Type | any | List<any>>,
-    pipes?: List<Type | any | List<any>>,
+    directives?: Array<Type | any | any[]>,
+    pipes?: Array<Type | any | any[]>,
     renderer?: string,
-    styles?: List<string>,
-    styleUrls?: List<string>,
+    styles?: string[],
+    styleUrls?: string[],
   }): ViewDecorator;
   }
 
@@ -1344,31 +1549,29 @@ declare module ng {
 
      new(obj: {
     selector?: string,
-    properties?: List<string>,
-    events?: List<string>,
+    properties?: string[],
+    events?: string[],
     host?: StringMap<string, string>,
-    lifecycle?: List<LifecycleEvent>,
-    bindings?: List<any>,
+    lifecycle?: LifecycleEvent[],
+    bindings?: any[],
     exportAs?: string,
     compileChildren?: boolean,
-    viewBindings?: List<any>,
-    changeDetection?: string,
+    viewBindings?: any[],
+    changeDetection?: ChangeDetectionStrategy,
   }): ComponentMetadata;
 
 
      (obj: {
     selector?: string,
-    properties?: List<string>,
-    events?: List<string>,
+    properties?: string[],
+    events?: string[],
     host?: StringMap<string, string>,
-    lifecycle?: List<LifecycleEvent>,
-    bindings?: List<any>,
+    lifecycle?: LifecycleEvent[],
+    bindings?: any[],
     exportAs?: string,
     compileChildren?: boolean,
-    viewBindings?: List<any>,
-    changeDetection?: string,
-    // NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590
-    injectables?: any[]
+    viewBindings?: any[],
+    changeDetection?: ChangeDetectionStrategy,
   }): ComponentDecorator;
 
   }
@@ -1432,18 +1635,16 @@ 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;
+    selector?: string, properties?: string[], events?: string[], host?: StringMap<string, string>,
+        lifecycle?: LifecycleEvent[], bindings?: 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;
-        // NOTE https://github.com/borisyankov/DefinitelyTyped/pull/5590 
-        hostListeners?: any;
+    selector?: string, properties?: string[], events?: string[], host?: StringMap<string, string>,
+        lifecycle?: LifecycleEvent[], bindings?: any[], exportAs?: string,
+        compileChildren?: boolean;
   }): DirectiveDecorator;
 
   }
@@ -1469,11 +1670,11 @@ declare module ng {
      View(obj: {
     templateUrl?: string,
     template?: string,
-    directives?: List<Type | any | List<any>>,
-    pipes?: List<Type | any | List<any>>,
+    directives?: Array<Type | any | any[]>,
+    pipes?: Array<Type | any | any[]>,
     renderer?: string,
-    styles?: List<string>,
-    styleUrls?: List<string>,
+    styles?: string[],
+    styleUrls?: string[],
   }): ViewDecorator;
   }
 
@@ -1526,20 +1727,20 @@ declare module ng {
      new(obj: {
     templateUrl?: string,
     template?: string,
-    directives?: List<Type | any | List<any>>,
+    directives?: Array<Type | any | any[]>,
     encapsulation?: ViewEncapsulation,
-    styles?: List<string>,
-    styleUrls?: List<string>,
+    styles?: string[],
+    styleUrls?: string[],
   }): ViewMetadata;
 
 
      (obj: {
     templateUrl?: string,
     template?: string,
-    directives?: List<Type | any | List<any>>,
+    directives?: Array<Type | any | any[]>,
     encapsulation?: ViewEncapsulation,
-    styles?: List<string>,
-    styleUrls?: List<string>,
+    styles?: string[],
+    styleUrls?: string[],
   }): ViewDecorator;
 
   }
@@ -1651,27 +1852,60 @@ declare module ng {
 
   /**
    * Defines lifecycle method
-   * {@link annotations/LifeCycleEvent#onAllChangesDone `LifeCycleEvent.onAllChangesDone`}
-   * called when the bindings of all its children have been changed.
+   * {@link metadata/LifeCycleEvent#AfterContentInit `LifeCycleEvent.afterContentInit`}
+   * called when the bindings of all its content children have been checked the first time.
    */
-  interface OnAllChangesDone {
+  interface AfterContentInit {
 
-     onAllChangesDone(): void;
+     afterContentInit(): void;
   }
 
 
   /**
-   * Defines lifecycle method {@link annotations/LifeCycleEvent#onChange `LifeCycleEvent.onChange`}
+   * 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 OnChange {
+  interface OnChanges {
 
-     onChange(changes: StringMap<string, any>): void;
+     onChanges(changes: StringMap<string, any>): void;
   }
 
 
   /**
-   * Defines lifecycle method {@link annotations/LifeCycleEvent#onDestroy `LifeCycleEvent.onDestroy`}
+   * Defines lifecycle method {@link metadata/LifeCycleEvent#OnDestroy `LifeCycleEvent.OnDestroy`}
    * called when a directive is being destroyed.
    */
   interface OnDestroy {
@@ -1681,7 +1915,7 @@ declare module ng {
 
 
   /**
-   * Defines lifecycle method {@link annotations/LifeCycleEvent#onInit `LifeCycleEvent.onInit`}
+   * Defines lifecycle method {@link metadata/LifeCycleEvent#OnInit `LifeCycleEvent.OnInit`}
    * called when a directive is being checked the first time.
    */
   interface OnInit {
@@ -1691,12 +1925,12 @@ declare module ng {
 
 
   /**
-   * Defines lifecycle method {@link annotations/LifeCycleEvent#onCheck `LifeCycleEvent.onCheck`}
+   * Defines lifecycle method {@link metadata/LifeCycleEvent#DoCheck `LifeCycleEvent.DoCheck`}
    * called when a directive is being checked.
    */
-  interface OnCheck {
+  interface DoCheck {
 
-     onCheck(): void;
+     doCheck(): boolean;
   }
 
 
@@ -1805,7 +2039,7 @@ declare module ng {
      *
      * See {@link Class} for example of usage.
      */
-     constructor: (Function | Array<any>);
+     constructor: (Function | any[]);
   }
 
 
@@ -1846,7 +2080,7 @@ declare module ng {
      *
      * Used by {@link Class} to annotate the generated class.
      */
-     annotations: Array<any>;
+     annotations: any[];
 
 
     /**
@@ -1855,45 +2089,54 @@ declare module ng {
      Class(obj: ClassDefinition): Type;
   }
 
-
-  /**
-   * CHECK_ONCE means that after calling detectChanges the mode of the change detector
-   * will become CHECKED.
-   */
-  const CHECK_ONCE : string ;
+  enum ChangeDetectionStrategy {
 
 
-  /**
-   * CHECK_ALWAYS means that after calling detectChanges the mode of the change detector
-   * will remain CHECK_ALWAYS.
-   */
-  const CHECK_ALWAYS : string ;
+    /**
+     * `CheckedOnce` means that after calling detectChanges the mode of the change detector
+     * will become `Checked`.
+     */
+     CheckOnce,
 
 
-  /**
-   * 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
+     * `CheckOnce`.
+     */
+     Checked,
 
 
-  /**
-   * CHECKED means that the change detector should be skipped until its mode changes to
-   * CHECK_ONCE or CHECK_ALWAYS.
-   */
-  const CHECKED : string ;
+    /**
+     * `CheckAlways` means that after calling detectChanges the mode of the change detector
+     * will remain `CheckAlways`.
+     */
+     CheckAlways,
 
 
-  /**
-   * ON_PUSH means that the change detector's mode will be set to CHECK_ONCE during hydration.
-   */
-  const ON_PUSH : string ;
+    /**
+     * `Detached` means that the change detector sub tree is not a part of the main tree and
+     * should be skipped.
+     */
+     Detached,
 
 
-  /**
-   * DEFAULT means that the change detector's mode will be set to CHECK_ALWAYS during hydration.
-   */
-  const DEFAULT : string ;
+    /**
+     * `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
+  }
 
 
   /**
@@ -1927,7 +2170,7 @@ declare module ng {
 
      parent: ChangeDetector;
 
-     mode: string;
+     mode: ChangeDetectionStrategy;
 
      ref: ChangeDetectorRef;
 
@@ -1980,9 +2223,9 @@ declare module ng {
 
 
     /**
-     * Request to check all ON_PUSH ancestors.
+     * Request to check all OnPush ancestors.
      */
-     requestCheck(): void;
+     markForCheck(): void;
 
 
     /**
@@ -1997,8 +2240,7 @@ declare module ng {
      * 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.
+     * checked during the next change detection run.
      */
      reattach(): void;
   }
@@ -2045,7 +2287,7 @@ declare module ng {
    */
   interface PipeTransform {
 
-     transform(value: any, args: List<any>): any;
+     transform(value: any, args: any[]): any;
   }
 
 
@@ -2201,135 +2443,6 @@ declare module ng {
   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.
    *
@@ -2337,7 +2450,7 @@ declare module ng {
    */
   interface Type extends Function {
 
-     new(args: any): any;
+     new(...args: any[]): any;
 
   }
 
@@ -2693,7 +2806,7 @@ declare module ng {
    */
   class QueryList<T> {
 
-     reset(newList: List<T>): void;
+     reset(newList: T[]): void;
 
      add(obj: T): void;
 
@@ -3615,7 +3728,7 @@ declare module ng {
      * such as
      * `fromResolvedBindings` and `createChildFromResolved`.
      */
-     static resolve(bindings: List<Type | Binding | List<any>>): List<ResolvedBinding>;
+     static resolve(bindings: Array<Type | Binding | any[]>): ResolvedBinding[];
 
 
     /**
@@ -3631,7 +3744,7 @@ declare module ng {
      * bindings.
      * @param `depProvider`
      */
-     static resolveAndCreate(bindings: List<Type | Binding | List<any>>, depProvider?: DependencyProvider): Injector;
+     static resolveAndCreate(bindings: Array<Type | Binding | any[]>, depProvider?: DependencyProvider): Injector;
 
 
     /**
@@ -3642,7 +3755,7 @@ declare module ng {
      * {@link Injector}.
      * @param `depProvider`
      */
-     static fromResolvedBindings(bindings: List<ResolvedBinding>, depProvider?: DependencyProvider): Injector;
+     static fromResolvedBindings(bindings: ResolvedBinding[], depProvider?: DependencyProvider): Injector;
 
 
     /**
@@ -3706,7 +3819,7 @@ declare module ng {
      * recursive list of more bindings.
      * @param `depProvider`
      */
-     resolveAndCreateChild(bindings: List<Type | Binding | List<any>>, depProvider?: DependencyProvider): Injector;
+     resolveAndCreateChild(bindings: Array<Type | Binding | any[]>, depProvider?: DependencyProvider): Injector;
 
 
     /**
@@ -3717,7 +3830,7 @@ declare module ng {
      * @param `depProvider`
      * @returns a new child {@link Injector}.
      */
-     createChildFromResolved(bindings: List<ResolvedBinding>, depProvider?: DependencyProvider): Injector;
+     createChildFromResolved(bindings: ResolvedBinding[], depProvider?: DependencyProvider): Injector;
 
 
     /**
@@ -3924,7 +4037,7 @@ declare module ng {
      * expect(injector.get(String)).toEqual('Value: 3');
      * ```
      */
-     dependencies: List<any>;
+     dependencies: any[];
 
 
     /**
@@ -4045,7 +4158,7 @@ declare module ng {
      * expect(injector.get(String)).toEqual('Value: 3');
      * ```
      */
-     toFactory(factoryFunction: Function, dependencies?: List<any>): Binding;
+     toFactory(factoryFunction: Function, dependencies?: any[]): Binding;
   }
 
 
@@ -4074,7 +4187,7 @@ declare module ng {
     /**
      * Arguments (dependencies) to the `factory` function.
      */
-     dependencies: List<Dependency>;
+     dependencies: Dependency[];
   }
 
 
@@ -4093,7 +4206,7 @@ declare module ng {
 
      upperBoundVisibility: any;
 
-     properties: List<any>;
+     properties: any[];
   }
 
 
@@ -4182,9 +4295,9 @@ declare module ng {
 
      message: string;
 
-     keys: List<Key>;
+     keys: Key[];
 
-     injectors: List<Injector>;
+     injectors: Injector[];
 
      constructResolvingMessage: Function;
 
@@ -4427,7 +4540,7 @@ declare module ng {
    * }
    * ```
    */
-  const CORE_DIRECTIVES : List<Type> ;
+  const CORE_DIRECTIVES : Type[] ;
 
 
   /**
@@ -4456,7 +4569,7 @@ declare module ng {
 
      rawClass: any;
 
-     onCheck(): void;
+     doCheck(): void;
 
      onDestroy(): void;
   }
@@ -4494,9 +4607,9 @@ declare module ng {
    */
   class NgFor {
 
-     static bulkRemove(tuples: List<RecordViewTuple>, viewContainer: ViewContainerRef): List<RecordViewTuple>;
+     static bulkRemove(tuples: RecordViewTuple[], viewContainer: ViewContainerRef): RecordViewTuple[];
 
-     static bulkInsert(tuples: List<RecordViewTuple>, viewContainer: ViewContainerRef, templateRef: TemplateRef): List<RecordViewTuple>;
+     static bulkInsert(tuples: RecordViewTuple[], viewContainer: ViewContainerRef, templateRef: TemplateRef): RecordViewTuple[];
 
      viewContainer: ViewContainerRef;
 
@@ -4508,7 +4621,7 @@ declare module ng {
 
      ngForOf: any;
 
-     onCheck(): void;
+     doCheck(): void;
   }
 
   class RecordViewTuple {
@@ -4589,7 +4702,7 @@ declare module ng {
 
      rawStyle: any;
 
-     onCheck(): void;
+     doCheck(): void;
   }
 
   class SwitchView {
@@ -4702,11 +4815,11 @@ declare module ng {
 
      updateValueAndValidity({onlySelf, emitEvent}?: {onlySelf?: boolean, emitEvent?: boolean}): void;
 
-     find(path: List<string | number>| string): AbstractControl;
+     find(path: Array<string | number>| string): AbstractControl;
 
-     getError(errorCode: string, path?: List<string>): any;
+     getError(errorCode: string, path?: string[]): any;
 
-     hasError(errorCode: string, path?: List<string>): boolean;
+     hasError(errorCode: string, path?: string[]): boolean;
   }
 
 
@@ -4772,7 +4885,7 @@ declare module ng {
    */
   class ControlArray extends AbstractControl {
 
-     controls: List<AbstractControl>;
+     controls: AbstractControl[];
 
      at(index: number): AbstractControl;
 
@@ -4839,7 +4952,7 @@ declare module ng {
 
      formDirective: Form;
 
-     path: List<string>;
+     path: string[];
   }
 
 
@@ -4909,13 +5022,13 @@ declare module ng {
 
      ngValidators: QueryList<NgValidator>;
 
-     onChange(c: StringMap<string, any>): void;
+     onChanges(c: StringMap<string, any>): void;
 
      onDestroy(): void;
 
      viewToModelUpdate(newValue: any): void;
 
-     path: List<string>;
+     path: string[];
 
      formDirective: any;
 
@@ -4982,9 +5095,9 @@ declare module ng {
 
      ngValidators: QueryList<NgValidator>;
 
-     onChange(c: StringMap<string, any>): void;
+     onChanges(c: StringMap<string, any>): void;
 
-     path: List<string>;
+     path: string[];
 
      control: Control;
 
@@ -5020,11 +5133,11 @@ declare module ng {
 
      ngValidators: QueryList<NgValidator>;
 
-     onChange(c: StringMap<string, any>): void;
+     onChanges(c: StringMap<string, any>): void;
 
      control: Control;
 
-     path: List<string>;
+     path: string[];
 
      validator: Function;
 
@@ -5045,7 +5158,7 @@ declare module ng {
 
      validator: Function;
 
-     path: List<string>;
+     path: string[];
 
      viewToModelUpdate(newValue: any): void;
   }
@@ -5096,7 +5209,7 @@ declare module ng {
 
      control: ControlGroup;
 
-     path: List<string>;
+     path: string[];
 
      formDirective: Form;
   }
@@ -5172,17 +5285,17 @@ declare module ng {
 
      form: ControlGroup;
 
-     directives: List<NgControl>;
+     directives: NgControl[];
 
      ngSubmit: any;
 
-     onChange(_: any): void;
+     onChanges(_: any): void;
 
      formDirective: Form;
 
      control: ControlGroup;
 
-     path: List<string>;
+     path: string[];
 
      addControl(dir: NgControl): void;
 
@@ -5244,7 +5357,7 @@ declare module ng {
 
      control: ControlGroup;
 
-     path: List<string>;
+     path: string[];
 
      controls: StringMap<string, AbstractControl>;
 
@@ -5419,7 +5532,7 @@ declare module ng {
    *
    *  This is a shorthand for importing them each individually.
    */
-  const FORM_DIRECTIVES : List<Type> ;
+  const FORM_DIRECTIVES : Type[] ;
 
 
   /**
@@ -5437,7 +5550,7 @@ declare module ng {
 
      static nullValidator(c: any): StringMap<string, boolean>;
 
-     static compose(validators: List<Function>): Function;
+     static compose(validators: Function[]): Function;
 
      static group(c:ControlGroup): StringMap<string, boolean>;
 
@@ -5525,10 +5638,10 @@ declare module ng {
 
      control(value: Object, validator?: Function): Control;
 
-     array(controlsConfig: List<any>, validator?: Function): ControlArray;
+     array(controlsConfig: any[], validator?: Function): ControlArray;
   }
 
-  const FORM_BINDINGS : List<Type> ;
+  const FORM_BINDINGS : Type[] ;
 
   class RenderDirectiveMetadata {
 
@@ -5537,22 +5650,26 @@ declare module ng {
      static COMPONENT_TYPE: any;
 
      static create({id, selector, compileChildren, events, host, properties, readAttributes, type,
-                 callOnDestroy, callOnChange, callOnCheck, callOnInit, callOnAllChangesDone,
-                 changeDetection, exportAs}: {
+                 callOnDestroy, callOnChanges, callDoCheck, callOnInit, callAfterContentInit,
+                 callAfterContentChecked, callAfterViewInit, callAfterViewChecked, changeDetection,
+                 exportAs}: {
     id?: string,
     selector?: string,
     compileChildren?: boolean,
-    events?: List<string>,
+    events?: string[],
     host?: Map<string, string>,
-    properties?: List<string>,
-    readAttributes?: List<string>,
+    properties?: string[],
+    readAttributes?: string[],
     type?: number,
     callOnDestroy?: boolean,
-    callOnChange?: boolean,
-    callOnCheck?: boolean,
+    callOnChanges?: boolean,
+    callDoCheck?: boolean,
     callOnInit?: boolean,
-    callOnAllChangesDone?: boolean,
-    changeDetection?: string,
+    callAfterContentInit?: boolean,
+    callAfterContentChecked?: boolean,
+    callAfterViewInit?: boolean,
+    callAfterViewChecked?: boolean,
+    changeDetection?: ChangeDetectionStrategy,
     exportAs?: string
   }): RenderDirectiveMetadata;
 
@@ -5562,25 +5679,31 @@ declare module ng {
 
      compileChildren: boolean;
 
-     events: List<string>;
+     events: string[];
 
-     properties: List<string>;
+     properties: string[];
 
-     readAttributes: List<string>;
+     readAttributes: string[];
 
      type: number;
 
      callOnDestroy: boolean;
 
-     callOnChange: boolean;
+     callOnChanges: boolean;
 
-     callOnCheck: boolean;
+     callDoCheck: boolean;
 
      callOnInit: boolean;
 
-     callOnAllChangesDone: boolean;
+     callAfterContentInit: boolean;
 
-     changeDetection: string;
+     callAfterContentChecked: boolean;
+
+     callAfterViewInit: boolean;
+
+     callAfterViewChecked: boolean;
+
+     changeDetection: ChangeDetectionStrategy;
 
      exportAs: string;
 
@@ -5589,8 +5712,6 @@ declare module ng {
      hostProperties: Map<string, string>;
 
      hostAttributes: Map<string, string>;
-
-     hostActions: Map<string, string>;
   }
 
   class DomRenderer extends Renderer {
@@ -5603,7 +5724,7 @@ declare module ng {
 
      getNativeElementSync(location: RenderElementRef): any;
 
-     getRootNodes(fragment: RenderFragmentRef): List<Node>;
+     getRootNodes(fragment: RenderFragmentRef): Node[];
 
      attachFragmentAfterFragment(previousFragmentRef: RenderFragmentRef, fragmentRef: RenderFragmentRef): void;
 
@@ -5623,7 +5744,7 @@ declare module ng {
 
      setElementStyle(location: RenderElementRef, styleName: string, styleValue: string): void;
 
-     invokeElementMethod(location: RenderElementRef, methodName: string, args: List<any>): void;
+     invokeElementMethod(location: RenderElementRef, methodName: string, args: any[]): void;
 
      setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
 
@@ -5641,8 +5762,9 @@ declare module ng {
      * 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>): void;
+     dispatchRenderEvent(elementIndex: number, eventName: string, locals: Map<string, any>): boolean;
   }
 
   class Renderer {
@@ -5742,7 +5864,7 @@ declare module ng {
     /**
      * Calls a method on an element.
      */
-     invokeElementMethod(location: RenderElementRef, methodName: string, args: List<any>): void;
+     invokeElementMethod(location: RenderElementRef, methodName: string, args: any[]): void;
 
 
     /**
@@ -5804,11 +5926,11 @@ declare module ng {
 
      template: string;
 
-     directives: List<RenderDirectiveMetadata>;
+     directives: RenderDirectiveMetadata[];
 
-     styleAbsUrls: List<string>;
+     styleAbsUrls: string[];
 
-     styles: List<string>;
+     styles: string[];
 
      encapsulation: ViewEncapsulation;
   }
@@ -5841,7 +5963,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
@@ -5920,3 +6042,6173 @@ declare module ng {
 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/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.d.ts b/angular2/http.d.ts
new file mode 100644
index 000000000..b1f284954
--- /dev/null
+++ b/angular2/http.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/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
index fd5891af9..c86237638 100644
--- a/angular2/router-2.0.0-alpha.36.d.ts
+++ b/angular2/router-2.0.0-alpha.36.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>;
     
@@ -596,9 +596,9 @@ declare module ngRouter {
   
   const ROUTE_DATA : OpaqueToken ;
   
-  const ROUTER_DIRECTIVES : List<any> ;
+  const ROUTER_DIRECTIVES : Array<any> ;
   
-  const ROUTER_BINDINGS : List<any> ;
+  const ROUTER_BINDINGS : Array<any> ;
   
   class Route implements RouteDefinition {
     
@@ -669,7 +669,7 @@ declare module ngRouter {
      data?: any;
   }
   
-  var RouteConfig : (configs: List<RouteDefinition>) => ClassDecorator ;
+  var RouteConfig : (configs: Array<RouteDefinition>) => ClassDecorator ;
   
   interface ComponentDefinition {
     
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.d.ts b/angular2/router.d.ts
index fd5891af9..69ea2a5af 100644
--- a/angular2/router.d.ts
+++ b/angular2/router.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Angular v2.0.0-alpha.36
+// 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
@@ -28,52 +28,75 @@ 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.
+     * 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.
-     * 
+     *
      * # Usage
-     * 
+     *
      * ```
      * router.config([
      *   { 'path': '/', 'component': IndexComp },
@@ -81,129 +104,153 @@ declare module ngRouter {
      * ]);
      * ```
      */
-     config(definitions: List<RouteDefinition>): Promise<any>;
-    
+     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: List<any>): Instruction;
+     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 {
-    
-     childRouter: Router;
-    
+
      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: Instruction): Promise<any>;
+     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
@@ -211,21 +258,23 @@ declare module ngRouter {
    * 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.
@@ -233,83 +282,83 @@ declare module ngRouter {
    * 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: List<any>, parentComponent: any): Instruction;
+     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:
@@ -318,47 +367,49 @@ declare module ngRouter {
    * - `/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: List<Function>;
-    
+
+     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({
@@ -372,17 +423,17 @@ declare module ngRouter {
    *  ```
    */
   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({
@@ -392,7 +443,7 @@ declare module ngRouter {
    *   canReuse() {
    *     return true;
    *   }
-   * 
+   *
    *   onReuse(next, prev) {
    *     this.params = next.params;
    *   }
@@ -400,18 +451,18 @@ declare module ngRouter {
    *  ```
    */
   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({
@@ -421,7 +472,7 @@ declare module ngRouter {
    *   canReuse() {
    *     return true;
    *   }
-   * 
+   *
    *   onReuse(next, prev) {
    *     this.params = next.params;
    *   }
@@ -429,19 +480,19 @@ declare module ngRouter {
    *  ```
    */
   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({
@@ -455,19 +506,19 @@ declare module ngRouter {
    *  ```
    */
   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({
@@ -477,7 +528,7 @@ declare module ngRouter {
    *   canReuse(next, prev) {
    *     return next.params.id == prev.params.id;
    *   }
-   * 
+   *
    *   onReuse(next, prev) {
    *     this.id = next.params.id;
    *   }
@@ -485,22 +536,22 @@ declare module ngRouter {
    *  ```
    */
   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({
@@ -514,172 +565,170 @@ declare module ngRouter {
    */
   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: List<string>;
-    
+
+     urlParams: string[];
+
      params: StringMap<string, any>;
-    
+
      componentType: any;
-    
-     resolveComponentType(): Promise<Type>;
-    
+
+     resolveComponentType(): Promise<ng.Type>;
+
      specificity: any;
-    
+
      terminal: any;
-    
+
      routeData(): Object;
   }
-  
-  class Url {
-    
-     path: string;
-    
-     child: Url;
-    
-     auxiliary: List<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.
+   * This class represents a parsed URL
    */
-  interface Type extends Function {
-    
-     new(args: any): any;
-  
+  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 : List<any> ;
-  
-  const ROUTER_BINDINGS : List<any> ;
-  
+
+  const ROUTER_DIRECTIVES : any[] ;
+
+  const ROUTER_BINDINGS : any[] ;
+
   class Route implements RouteDefinition {
-    
+
      data: any;
-    
+
      path: string;
-    
-     component: Type;
-    
+
+     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: Type;
-    
+
+     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?: Type | ComponentDefinition;
-    
+
+     component?: ng.Type | ComponentDefinition;
+
      loader?: Function;
-    
+
      redirectTo?: string;
-    
+
      as?: string;
-    
+
      data?: any;
   }
-  
-  var RouteConfig : (configs: List<RouteDefinition>) => ClassDecorator ;
-  
+
+  var RouteConfig : (configs: RouteDefinition[]) => ClassDecorator ;
+
   interface ComponentDefinition {
-    
+
      type: string;
-    
+
      loader?: Function;
-    
-     component?: Type;
+
+     component?: ng.Type;
   }
-  
+
 }
 
 declare module "angular2/router" {
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.d.ts b/angularjs/angular-mocks.d.ts
index 84b6d7262..d94337273 100644
--- a/angularjs/angular-mocks.d.ts
+++ b/angularjs/angular-mocks.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 = _;
diff --git a/angularjs/angular-tests.ts b/angularjs/angular-tests.ts
index 50e756217..0174a0d61 100644
--- a/angularjs/angular-tests.ts
+++ b/angularjs/angular-tests.ts
@@ -933,3 +933,19 @@ function NgModelControllerTyping() {
             });
     };
 }
+
+function ngFilterTyping() {
+    var $filter:  angular.IFilterService;
+    var items: string[];
+    
+    $filter("name")(items, "test");
+    $filter("name")(items, {name: "test"});
+    $filter("name")(items, (val, index, array) => {
+        return array;
+    });
+    $filter("name")(items, (val, index, array) => {
+        return array;
+    }, (actual, expected) => {
+        return actual == expected;
+    });
+}
\ No newline at end of file
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index d183167b5..9f7fa07b0 100644
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -782,7 +782,23 @@ declare module angular {
          *
          * @param name Name of the filter function to retrieve
          */
-        (name: string): Function;
+        (name: string): IFilterFunc;
+    }
+    
+    interface IFilterFunc {
+        <T>(array: T[], expression: string | IFilterPatternObject | IFilterPredicateFunc<T>, comparator?: IFilterComparatorFunc<T>|boolean): T[];
+    }
+    
+    interface IFilterPatternObject {
+        [name: string]: string;
+    }
+    
+    interface IFilterPredicateFunc<T> {
+        (value: T, index: number, array: T[]): T[];
+    }
+    
+    interface IFilterComparatorFunc<T> {
+        (actual: T, expected: T): boolean;
     }
 
     /**
@@ -1230,8 +1246,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 {
@@ -1312,51 +1329,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.
@@ -1364,25 +1355,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;
     }
@@ -1425,31 +1403,98 @@ declare module angular {
         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;
 
@@ -1669,18 +1714,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)
     ///////////////////////////////////////////////////////////////////////////
@@ -1693,7 +1726,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/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/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/auto-launch/auto-launch-tests.ts b/auto-launch/auto-launch-tests.ts
index 735985624..24d6aad14 100644
--- a/auto-launch/auto-launch-tests.ts
+++ b/auto-launch/auto-launch-tests.ts
@@ -14,4 +14,11 @@ var a2 = new AutoLaunch({
 
 a1.enable();
 a2.disable();
-var enabled: boolean = a1.isEnabled();
+
+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
index c208d10fd..0b277c79f 100644
--- a/auto-launch/auto-launch.d.ts
+++ b/auto-launch/auto-launch.d.ts
@@ -32,7 +32,7 @@ declare class AutoLaunch {
 	/**
 	 * Returns if auto start up is enabled
 	 */
-	isEnabled(callback?: (err: Error) => void): boolean;
+	isEnabled(callback: (enabled: boolean) => void): void;
 }
 
 declare module "auto-launch" {
diff --git a/backbone/backbone.d.ts b/backbone/backbone.d.ts
index 701cc6d9d..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 {
diff --git a/bardjs/bardjs-tests.ts b/bardjs/bardjs-tests.ts
index 71671b23e..312b06496 100644
--- a/bardjs/bardjs-tests.ts
+++ b/bardjs/bardjs-tests.ts
@@ -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/better-curry/better-curry-tests.ts b/better-curry/better-curry-tests.ts
new file mode 100644
index 000000000..ba95326f5
--- /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..59ebe0a37
--- /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/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 2377da0d0..b8eecf2ca 100644
--- a/bluebird/bluebird-tests.ts
+++ b/bluebird/bluebird-tests.ts
@@ -550,6 +550,13 @@ fooArrProm = fooArrProm.filter<Foo>((item: Foo) => {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+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);
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
 
 fooProm = Promise.try(() => {
 	return foo;
@@ -1123,3 +1130,43 @@ fooArrProm = Promise.filter(fooArr, (item: Foo, index: number, arrayLength: numb
 });
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+// 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 543a2ef0a..350761fdd 100644
--- a/bluebird/bluebird.d.ts
+++ b/bluebird/bluebird.d.ts
@@ -328,6 +328,11 @@ declare class Promise<R> implements Promise.Thenable<R>, Promise.Inspection<R> {
 	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.
 	 *
@@ -607,6 +612,18 @@ declare class Promise<R> implements Promise.Thenable<R>, Promise.Inspection<R> {
 	// array with values
 	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 {
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/chai/chai-2.0.0.d.ts b/chai/chai-2.0.0.d.ts
new file mode 100644
index 000000000..f693582c5
--- /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..da4d718e1 100644
--- a/chai/chai.d.ts
+++ b/chai/chai.d.ts
@@ -1,10 +1,13 @@
-// Type definitions for chai 2.0.0
+// 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>
+//                 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 {
@@ -16,9 +19,11 @@ declare module 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 {
@@ -49,15 +54,20 @@ declare module Chai {
     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;
@@ -70,20 +80,35 @@ declare module Chai {
         property: Property;
         ownProperty: OwnProperty;
         haveOwnProperty: OwnProperty;
+        ownPropertyDescriptor: OwnPropertyDescriptor;
+        haveOwnPropertyDescriptor: OwnPropertyDescriptor;
         length: Length;
         lengthOf: Length;
-        match(regexp: RegExp|string, message?: string): Assertion;
+        match: Match;
+        matches: Match;
         string(string: string, message?: string): Assertion;
         keys: Keys;
         key(string: string): Assertion;
         throw: Throw;
         throws: Throw;
         Throw: Throw;
-        respondTo(method: string, message?: string): Assertion;
+        respondTo: RespondTo;
+        respondsTo: RespondTo;
         itself: Assertion;
-        satisfy(matcher: Function, message?: string): 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 {
@@ -134,6 +159,11 @@ declare module Chai {
         equal: Equal;
         include: Include;
         property: Property;
+        members: Members;
+    }
+
+    interface KeyFilter {
+        keys: Keys;
     }
 
     interface Equal {
@@ -148,6 +178,11 @@ declare module Chai {
         (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;
     }
@@ -158,11 +193,18 @@ declare module Chai {
         (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 {
@@ -175,10 +217,22 @@ declare module Chai {
         (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.
@@ -189,7 +243,9 @@ declare module Chai {
         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;
@@ -209,6 +265,12 @@ declare module Chai {
         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;
 
@@ -279,9 +341,27 @@ declare module Chai {
         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;
+        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 {
@@ -305,4 +385,4 @@ declare module "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..a4419eb4d
--- /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/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 f4e208d89..341738435 100644
--- a/chrome/chrome-tests.ts
+++ b/chrome/chrome-tests.ts
@@ -245,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 2fc2fb6fc..34bb95205 100755
--- a/chrome/chrome.d.ts
+++ b/chrome/chrome.d.ts
@@ -1649,6 +1649,7 @@ declare module chrome.runtime {
     export function getPackageDirectoryEntry(callback: (directoryEntry: any) => void): void;
     export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
     export function getURL(path: string): string;
+    export function openOptionsPage(callback?: () => void): void;
     export function reload(): void;
     export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
     export function restart(): void;
diff --git a/ckeditor/ckeditor.d.ts b/ckeditor/ckeditor.d.ts
index 3bb90c760..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;
     }
 
 
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 22ab1858a..58a3e096f 100644
--- a/classnames/classnames.d.ts
+++ b/classnames/classnames.d.ts
@@ -1,14 +1,18 @@
 // Type definitions for classnames
 // Project: https://github.com/JedWatson/classnames
-// Definitions by: Dave Keen <http://www.keendevelopment.ch>, Adi Dahiya <https://github.com/adidahiya>
+// 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: (string | ClassDictionary)[]): string;
+	(...classes: ClassValue[]): string;
 }
 
 declare var classNames: ClassNamesFn;
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.d.ts b/codemirror/codemirror-showhint.d.ts
index 340871db4..48a904a3b 100644
--- a/codemirror/codemirror-showhint.d.ts
+++ b/codemirror/codemirror-showhint.d.ts
@@ -1,10 +1,12 @@
 // Type definitions for CodeMirror
 // Project: https://github.com/marijnh/CodeMirror
-// Definitions by: jacqt <https://github.com/jacqt>
+// 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;
+    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
@@ -12,13 +14,12 @@ declare module CodeMirror {
     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?: IShowHintOptions) : void;
-
+    function showHint(cm: CodeMirror.Doc, hinter?: (doc: CodeMirror.Doc) => Hints, options?: ShowHintOptions): void;
 
     interface Hints {
         from: Position;
         to: Position;
-        list: Hint[] | string[];
+        list: (Hint | string)[];
     }
 
     /** Interface used by showHint.js Codemirror add-on
@@ -28,25 +29,27 @@ declare module CodeMirror {
         className?: string;
         displayText?: string;
         from?: Position;
-        render?: (element: any, self: any, data: any) => void;
+        /** 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;
+        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: IShowHintOptions) => void;
+        showHint: (options: ShowHintOptions) => void;
     }
 
-    interface IShowHintOptions {
+    interface ShowHintOptions {
         completeSingle: boolean;
-        hint: (doc : CodeMirror.Doc) => Hints;
+        hint: (doc: CodeMirror.Doc) => Hints;
     }
 
     /** The Handle used to interact with the autocomplete dialog box.*/
@@ -59,4 +62,13 @@ declare module CodeMirror {
         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 0f548a3fa..ca7c71792 100644
--- a/codemirror/codemirror.d.ts
+++ b/codemirror/codemirror.d.ts
@@ -787,7 +787,10 @@ declare module CodeMirror {
         viewportMargin?: number;
 
         /** Optional lint configuration to be used in conjunction with CodeMirror's linter addon. */
-        lint?: boolean | LintOptions;
+        lint?: boolean | LintOptions;
+
+	/** Optional value to be used in conduction with CodeMirror’s placeholder add-on. */
+	placeholder?: string;
     }
 
     interface TextMarkerOptions {
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/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/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/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/d3/d3-tests.ts b/d3/d3-tests.ts
index 105e8f29c..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;
             }
@@ -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/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/dropzone/dropzone.d.ts b/dropzone/dropzone.d.ts
index 50dd433e3..93f9ca25b 100644
--- a/dropzone/dropzone.d.ts
+++ b/dropzone/dropzone.d.ts
@@ -41,7 +41,7 @@ interface DropzoneOptions {
 	filesizeBase?: number;
 	maxFiles?: number;
 	params?: {};
-	headers?: {},
+	headers?: {};
 	clickable?: boolean|string|HTMLElement|(string|HTMLElement)[];
 	ignoreHiddenFiles?: boolean;
 	acceptedFiles?: string;
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/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/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/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/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/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/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/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/github-electron/github-electron-main-tests.ts b/github-electron/github-electron-main-tests.ts
index a849295b6..4e359e257 100644
--- a/github-electron/github-electron-main-tests.ts
+++ b/github-electron/github-electron-main-tests.ts
@@ -43,6 +43,8 @@ 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()
@@ -409,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 fb0980520..92fff65f7 100644
--- a/github-electron/github-electron.d.ts
+++ b/github-electron/github-electron.d.ts
@@ -400,7 +400,10 @@ declare module GitHubElectron {
 		/**
 		 * Same with webContents.loadUrl(url).
 		 */
-		loadUrl(url: string): void;
+		loadUrl(url: string, options?: {
+			httpReferrer?: string;
+			userAgent?: string;
+		}): void;
 		/**
 		 * Same with webContents.reload.
 		 */
@@ -537,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.
 		 */
@@ -1212,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/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..b3167ea5d
--- /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..4bb379483
--- /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-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-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-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-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-sass/gulp-sass-tests.ts b/gulp-sass/gulp-sass-tests.ts
index b566b4cdf..429df6572 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')
diff --git a/gulp-sass/gulp-sass.d.ts b/gulp-sass/gulp-sass.d.ts
index 8d6d4c055..781df0af7 100644
--- a/gulp-sass/gulp-sass.d.ts
+++ b/gulp-sass/gulp-sass.d.ts
@@ -43,7 +43,10 @@ declare module "gulp-sass" {
         sync?: boolean;
     }
 
-    function sass(opts?: Options): NodeJS.ReadWriteStream;
+    interface Sass {
+        (opts?: 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-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-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/hammerjs/hammerjs.d.ts b/hammerjs/hammerjs.d.ts
index 84d4f9431..4d1091f68 100644
--- a/hammerjs/hammerjs.d.ts
+++ b/hammerjs/hammerjs.d.ts
@@ -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/highcharts-ng/highcharts-ng.d.ts b/highcharts-ng/highcharts-ng.d.ts
index dd15fd476..61dfef31d 100644
--- a/highcharts-ng/highcharts-ng.d.ts
+++ b/highcharts-ng/highcharts-ng.d.ts
@@ -24,7 +24,7 @@ interface HighChartsNGConfig {
         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.
diff --git a/highcharts/highcharts.d.ts b/highcharts/highcharts.d.ts
index f654b9749..16867937b 100644
--- a/highcharts/highcharts.d.ts
+++ b/highcharts/highcharts.d.ts
@@ -217,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;
@@ -229,6 +232,7 @@ interface HighchartsChartOptions {
     selectionMarkerFill?: string;
     shadow?: boolean | HighchartsShadow;
     showAxes?: boolean;
+    spacing?: number[];
     spacingBottom?: number;
     spacingLeft?: number;
     spacingRight?: number;
@@ -352,6 +356,11 @@ interface HighchartsLegendNavigationOptions {
     style?: HighchartsCSSObject;
 }
 
+interface HighchartsLegendTitleOptions {
+    style?: HighchartsCSSObject;
+    text?: string;
+}
+
 interface HighchartsLegendOptions {
     align?: string;
     backgroundColor?: string | HighchartsGradient;
@@ -360,6 +369,7 @@ interface HighchartsLegendOptions {
     borderWidth?: number;
     enabled?: boolean;
     floating?: boolean;
+    itemDistance?: number;
     itemHiddenStyle?: HighchartsCSSObject;
     itemHoverStyle?: HighchartsCSSObject;
     itemMarginBottom?: number;
@@ -368,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;
@@ -659,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;
@@ -864,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;
@@ -888,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;
     };
@@ -942,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;
@@ -993,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;
diff --git a/ionic/ionic.d.ts b/ionic/ionic.d.ts
index b1b215217..1b2e3265e 100644
--- a/ionic/ionic.d.ts
+++ b/ionic/ionic.d.ts
@@ -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/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/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.ajaxfile/jquery.ajaxFile-tests.ts b/jquery.ajaxfile/jquery.ajaxFile-tests.ts
index 4a98706a4..e5f82fb00 100644
--- a/jquery.ajaxfile/jquery.ajaxFile-tests.ts
+++ b/jquery.ajaxfile/jquery.ajaxFile-tests.ts
@@ -4,7 +4,7 @@
 
 function testRawApi(){
 	var inputElement:HTMLInputElement = null;
-	var resultPromise = AjaxFile.send({
+	var resultPromise = AjaxFile.send<number>({
 		method: 'POST',
 		url: '/',
 		desiredResponseDataType: JQueryAjaxFile.DataType.Json,
@@ -42,7 +42,7 @@ function testJQuery() {
         global: true,
         timeout: 60
     };
-    extension.ajaxWithFile(option);
+    extension.ajaxWithFile<number>(option);
 }
 
 function testKnockoutExtension(){
diff --git a/jquery.ajaxfile/jquery.ajaxFile.d.ts b/jquery.ajaxfile/jquery.ajaxFile.d.ts
index 459287a27..ff0a18a59 100644
--- a/jquery.ajaxfile/jquery.ajaxFile.d.ts
+++ b/jquery.ajaxfile/jquery.ajaxFile.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jquery.ajaxfile v0.1.0
+// 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
@@ -35,27 +35,28 @@ declare namespace JQueryAjaxFile {
 		isSuccess: boolean;
 	}
 
-	interface IAjaxFileResult {
+	interface IAjaxFileResult<T> {
 		error?: any;
 		data?: any;
 		status?: IResponseStatus;
 	}
 
-	interface IAjaxFileResultCallback {
-		(result: IAjaxFileResult): void;
+	interface IAjaxFileResultCallback<T> {
+		(result: IAjaxFileResult<T>): void;
 	}
 
-	interface IAjaxFilePromise {
-		then(success: IAjaxFileResultCallback, error?: IAjaxFileResultCallback): IAjaxFilePromise;
-		done(success: IAjaxFileResultCallback): IAjaxFilePromise;
-		fail(error: IAjaxFileResultCallback): IAjaxFilePromise;
-		always(error: IAjaxFileResultCallback): IAjaxFilePromise;
+	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 {
-		send(option: IOption): IAjaxFilePromise;
+		DataType: typeof DataType;
+		send<T>(option: IOption): IAjaxFilePromise<T>;
 	}
 	
 	interface IJQueryXHR {
@@ -97,7 +98,7 @@ declare namespace JQueryAjaxFile {
     }
 
     interface IAjaxFileJQueryExtension {
-        ajaxWithFile(jqueryOption: IJQueryOption): JQueryDeferred<any>;
+        ajaxWithFile<T>(jqueryOption: IJQueryOption): JQueryDeferred<T>;
     }
 }
 
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.fileupload/jquery.fileupload.d.ts b/jquery.fileupload/jquery.fileupload.d.ts
index 8c9e93737..69821b0ed 100644
--- a/jquery.fileupload/jquery.fileupload.d.ts
+++ b/jquery.fileupload/jquery.fileupload.d.ts
@@ -204,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;
 
 }
 
@@ -213,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/jquery-tests.ts b/jquery/jquery-tests.ts
index 1a9a6dd26..1f723fde3 100644
--- a/jquery/jquery-tests.ts
+++ b/jquery/jquery-tests.ts
@@ -3359,7 +3359,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 ad9e93455..3641af850 100644
--- a/jquery/jquery.d.ts
+++ b/jquery/jquery.d.ts
@@ -241,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
@@ -395,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.
@@ -409,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.
@@ -425,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.
@@ -1998,6 +1998,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
      *
@@ -2012,6 +2016,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 393c3d972..ad722fdb1 100644
--- a/jquerymobile/jquerymobile.d.ts
+++ b/jquerymobile/jquerymobile.d.ts
@@ -171,6 +171,7 @@ interface SelectMenuOptions {
     iconshadow?: boolean;
     initSelector?: string;
     inline?: boolean;
+    hidePlaceholderMenuItems: boolean;
     mini?: boolean;
     nativeMenu?: boolean;
     overlayTheme?: string;
@@ -463,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 34f1f4b7e..bc84cb475 100644
--- a/jqueryui/jqueryui-tests.ts
+++ b/jqueryui/jqueryui-tests.ts
@@ -1438,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" });
diff --git a/jqueryui/jqueryui.d.ts b/jqueryui/jqueryui.d.ts
index d5e60cd0d..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,7 +37,7 @@ declare module JQueryUI {
         create?: AccordionEvent;
     }
 
-    interface Accordion extends Widget, AccordionOptions, AccordionEvents {
+    interface Accordion extends Widget, AccordionOptions {
     }
 
 
@@ -86,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 {
@@ -341,7 +342,7 @@ declare module JQueryUI {
 
     interface DialogOptions extends DialogEvents {
         autoOpen?: boolean;
-        buttons?: { [buttonText: string]: (event?: Event) => void } | ButtonOptions[];
+        buttons?: { [buttonText: string]: (event?: Event) => void } | DialogButtonOptions[];
         closeOnEscape?: boolean;
         closeText?: string;
         dialogClass?: string;
@@ -365,6 +366,14 @@ 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;
@@ -516,9 +525,10 @@ declare module JQueryUI {
 
     // Progressbar //////////////////////////////////////////////////
 
-    interface ProgressbarOptions {
+    interface ProgressbarOptions extends ProgressbarEvents {
         disabled?: boolean;
         value?: number | boolean;
+        max?: number;
     }
 
     interface ProgressbarUIParams {
@@ -534,7 +544,7 @@ declare module JQueryUI {
         create?: ProgressbarEvent;
     }
 
-    interface Progressbar extends Widget, ProgressbarOptions, ProgressbarEvents {
+    interface Progressbar extends Widget, ProgressbarOptions {
     }
 
 
@@ -792,7 +802,7 @@ declare module JQueryUI {
 
     // Tooltip //////////////////////////////////////////////////
 
-    interface TooltipOptions {
+    interface TooltipOptions extends TooltipEvents {
         content?: any; // () or string
         disabled?: boolean;
         hide?: any; // boolean, number, string or object
@@ -815,7 +825,7 @@ declare module JQueryUI {
         open?: TooltipEvent;
     }
 
-    interface Tooltip extends Widget, TooltipOptions, TooltipEvents {
+    interface Tooltip extends Widget, TooltipOptions {
     }
 
 
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/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/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
index c423a3dfe..a0d0a9618 100644
--- a/kefir/kefir-tests.ts
+++ b/kefir/kefir-tests.ts
@@ -48,7 +48,7 @@ import { Observable, ObservablePool, Stream, Property, Event, Emitter } from 'ke
 {
 	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)));
+	//let property03: Property<number, void> = Kefir.fromPromise<number, void>(new Promise<number>(fulfill => fulfill(1)));
 }
 
 // Convert observables
@@ -69,7 +69,7 @@ import { Observable, ObservablePool, Stream, Property, Event, Emitter } from 'ke
 	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 => console.log('fulfilled with:', x));
+	Kefir.sequentially(1000, [1, 2]).toPromise().then((x: number) => console.log('fulfilled with:', x));
 }
 
 // Modify an observable
diff --git a/kefir/kefir.d.ts b/kefir/kefir.d.ts
index 6a9544a7c..9e3303f01 100644
--- a/kefir/kefir.d.ts
+++ b/kefir/kefir.d.ts
@@ -4,9 +4,9 @@
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../node/node.d.ts" />
-/// <reference path="../es6-promise/es6-promise.d.ts" />
 
 declare module "kefir" {
+	
 	export interface Observable<T, S> {
 		// Subscribe / add side effects
 		onValue(callback: (value: T) => void): void;
@@ -19,7 +19,7 @@ declare module "kefir" {
 		offAny(callback: (event: Event<T | S>) => void): void;
 		log(name?: string): void;
 		offLog(name?: string): void;
-		toPromise(PromiseConstructor?: typeof Promise): Promise<T>;
+		toPromise(PromiseConstructor?: any): any;
 	}
 	
 	export interface Stream<T, S> extends Observable<T, S> {
@@ -163,7 +163,7 @@ declare module "kefir" {
 	// 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: Promise<T>): Property<T, S>;
+	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>;
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/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/leaflet-tests.ts b/leaflet/leaflet-tests.ts
index 6bec7e217..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,65 +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}', {
-	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
@@ -413,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 56d702485..110bdd6f7 100755
--- a/leaflet/leaflet.d.ts
+++ b/leaflet/leaflet.d.ts
@@ -382,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.
@@ -478,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.
@@ -503,7 +541,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface ControlOptions {
 
@@ -517,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
@@ -549,7 +587,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Creates a div icon instance with the given options.
@@ -568,7 +606,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface DivIconOptions {
 
@@ -602,7 +640,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface DomEvent {
 
@@ -663,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
@@ -766,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
@@ -816,7 +854,7 @@ declare module L {
 
 
 
-declare module L {
+declare namespace L {
 
     /**
       * Create a layer group, optionally given an initial set of layers.
@@ -894,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
@@ -994,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
@@ -1031,7 +1032,7 @@ declare module L {
 
 
 
-declare module L {
+declare namespace L {
 
     /**
       * Creates an icon instance with the given options.
@@ -1058,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.
@@ -1068,7 +1069,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface IconOptions {
 
@@ -1133,7 +1134,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface IControl {
 
@@ -1153,7 +1154,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface ICRS {
 
@@ -1205,7 +1206,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface IEventPowered<T> {
 
@@ -1285,7 +1286,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface IHandler {
 
@@ -1310,7 +1311,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface ILayer {
 
@@ -1329,8 +1330,8 @@ declare module L {
     }
 }
 
-declare module L {
-    module Mixin {
+declare namespace L {
+    namespace Mixin {
         export interface LeafletMixinEvents extends IEventPowered<LeafletMixinEvents> {
         }
 
@@ -1338,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
@@ -1398,7 +1399,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface ImageOverlayOptions {
 
@@ -1409,7 +1410,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface IProjection {
 
@@ -1425,7 +1426,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
     * A constant that represents the Leaflet version in use.
@@ -1439,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.
@@ -1524,7 +1525,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Creates a LatLngBounds object by defining south-west and north-east corners
@@ -1650,7 +1651,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Create a layer group, optionally given an initial set of layers.
@@ -1736,7 +1737,7 @@ declare module L {
 }
 
 
-declare module L {
+declare namespace L {
 
     export interface LayersOptions {
 
@@ -1766,7 +1767,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletErrorEvent extends LeafletEvent {
 
@@ -1782,7 +1783,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletEvent {
 
@@ -1798,7 +1799,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletGeoJSONEvent extends LeafletEvent {
 
@@ -1824,7 +1825,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletLayerEvent extends LeafletEvent {
 
@@ -1835,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 {
@@ -1883,7 +1900,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletMouseEvent extends LeafletEvent {
 
@@ -1911,7 +1928,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletPopupEvent extends LeafletEvent {
 
@@ -1922,7 +1939,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletDragEndEvent extends LeafletEvent {
 
@@ -1933,7 +1950,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletResizeEvent extends LeafletEvent {
 
@@ -1949,7 +1966,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LeafletTileEvent extends LeafletEvent {
 
@@ -1965,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
@@ -1999,7 +2016,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface LocateOptions {
 
@@ -2052,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 {
@@ -2074,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
@@ -2082,7 +2099,7 @@ declare module L {
           *
           * @constructor
           */
-        new(id: string, options?: MapOptions): Map;
+        new(id: string, options?: Map.MapOptions): Map;
     }
     export var Map: MapStatic;
 
@@ -2093,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
@@ -2150,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
@@ -2162,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
@@ -2422,7 +2439,7 @@ declare module L {
         /**
           * Map state options
           */
-        options: MapOptions;
+        options: Map.MapOptions;
 
         ////////////////
         ////////////////
@@ -2442,7 +2459,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L.Map {
 
     export interface MapOptions {
 
@@ -2680,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 {
 
@@ -2723,7 +2813,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a Marker object given a geographical point and optionally
@@ -2873,7 +2963,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface MarkerOptions {
 
@@ -2953,7 +3043,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a multi-polyline object given an array of latlngs arrays (one
@@ -2996,7 +3086,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a multi-polyline object given an array of arrays of geographical
@@ -3037,7 +3127,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface PanOptions {
 
@@ -3073,7 +3163,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface Path extends ILayer, IEventPowered<Path> {
 
@@ -3171,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).
           */
@@ -3201,7 +3291,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface PathOptions {
 
@@ -3297,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
@@ -3373,7 +3463,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a polygon object given an array of geographical points and
@@ -3401,7 +3491,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a polyline object given an array of geographical points and
@@ -3453,7 +3543,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface PolylineOptions extends PathOptions {
 
@@ -3474,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.
@@ -3488,7 +3578,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a Popup object given an optional options object that describes
@@ -3567,7 +3657,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface PopupOptions {
 
@@ -3665,7 +3755,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface PosAnimationStatic extends ClassStatic {
         /**
@@ -3702,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,
@@ -3730,7 +3820,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     /**
       * Instantiates a rectangle object with the given geographical bounds and
@@ -3756,7 +3846,7 @@ declare module L {
 }
 
 
-declare module L {
+declare namespace L {
 
     export interface ScaleOptions {
 
@@ -3794,7 +3884,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
 
     export interface TileLayerStatic extends ClassStatic {
         /**
@@ -3894,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
@@ -3942,7 +4032,7 @@ declare module L {
     export var tileLayer: TileLayerFactory;
 }
 
-declare module L {
+declare namespace L {
 
     export interface TileLayerOptions {
 
@@ -4089,7 +4179,7 @@ declare module L {
     }
 }
 
-declare module L {
+declare namespace L {
     export interface TransformationStatic extends ClassStatic {
         /**
           * Creates a transformation object with the given coefficients.
@@ -4113,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
@@ -4197,7 +4287,7 @@ declare module L {
 }
 
 
-declare module L {
+declare namespace L {
 
     export interface WMSOptions {
 
@@ -4237,52 +4327,6 @@ declare module L {
     }
 }
 
-
-declare module L {
-
-    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;
-    }
-}
-
-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/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..045e43f10 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;
     }
  
@@ -34,25 +43,25 @@ declare module "libxmljs" {
         name(newName:string):void;
         text():string;
         attr(name:string):string;
-        attr(attr: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, ns_uri:{[key:string]:string;}):Element;
         defineNamespace(href:string):Namespace;
         defineNamespace(prefix:string, href:string):Namespace;
         namespace():Namespace;
@@ -84,28 +93,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/lodash-tests.ts b/lodash/lodash-tests.ts
index 4e3bb97da..1d5525300 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -135,8 +135,6 @@ 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);
@@ -157,23 +155,80 @@ 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 *
+ *********/
+
+// _.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 = <any[]>_.compact([0, 1, false, 2, '', 3]);
 result = <_.LoDashArrayWrapper<any>>_([0, 1, false, 2, '', 3]).compact();
 
-result = <number[]>_.difference([1, 2, 3, 4, 5], [5, 2, 10]);
-result = <_.LoDashArrayWrapper<number>>_([1, 2, 3, 4, 5]).difference([5, 2, 10]);
+// _.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();
+}
 
 result = <number[]>_.rest([1, 2, 3]);
 result = <number[]>_.rest([1, 2, 3], 2);
@@ -181,12 +236,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)
@@ -215,37 +264,16 @@ result = <number>_.findLastIndex(['apple', 'banana', 'beet'], function (f: strin
 result = <number>_.findLastIndex(['apple', 'banana', 'beet'], 'apple');
 result = <number>_.findLastIndex([{ food: 'apple' }, { food: 'banana' }, { food: 'beet' }], { food: 'apple' });
 
-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 = <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 = <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' });
-
-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();
+// _.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 = <number[]>_.take([1, 2, 3]);
 result = <number[]>_.take([1, 2, 3], 2);
@@ -278,19 +306,44 @@ result = <_.LoDashArrayWrapper<number>>_([1, [2], [3, [[4]]]]).flatten(true);
 
 result = <_.LoDashArrayWrapper<number>>_([1, [2], [3, [[4]]]]).flattenDeep();
 
+// _.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>_.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);
 
-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' });
+//_.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[]>_.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1]);
+// _.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>_.last([1, 2, 3]);
 result = <number>_([1, 2, 3]).last();
@@ -298,6 +351,57 @@ result = <number>_([1, 2, 3]).last();
 result = <number>_.lastIndexOf([1, 2, 3, 1, 2, 3], 2);
 result = <number>_.lastIndexOf([1, 2, 3, 1, 2, 3], 2, 3);
 
+// _.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]);
 result = <_.Dictionary<any>>_.object(['moe', 'larry'], [30, 40]);
@@ -307,14 +411,23 @@ 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);
-
 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' });
 
+// _.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');
 var sortedIndexDict: { wordToNumber: { [idx: string]: number } } = {
@@ -327,6 +440,21 @@ result = <number>_.sortedIndex(['twenty', 'thirty', 'fifty'], 'fourty', function
     return this.wordToNumber[word];
 }, sortedIndexDict);
 
+// _.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();
+}
+
 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();
@@ -363,7 +491,46 @@ 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[];
@@ -403,12 +570,144 @@ 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 *
+ **************/
+
+// _.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);
@@ -555,21 +854,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);
@@ -1482,26 +1820,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'
+{
+    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 = <boolean>_.has({ 'a': 1, 'b': 2, 'c': 3 }, 'b');
+// _.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]);
 
-interface FirstSecond {
-    first: string;
-    second: string;
+// _.invert
+{
+    let result: TResult;
+    result = _.invert<Object, TResult>({});
+    result = _.invert<Object, TResult>({}, true);
+    result = _({}).invert<TResult>().value();
+    result = _({}).invert<TResult>(true).value();
 }
-result = <FirstSecond>_.invert({ 'first': 'moe', 'second': 'larry' });
 
 // _.isEqual (alias: _.eq)
 result = <boolean>_.isEqual(1, 1);
@@ -1541,6 +1890,54 @@ 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' },
@@ -1594,27 +1991,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 {
@@ -1652,14 +2130,6 @@ var testAttempFn: TestAttemptFn;
 result = <TResult|Error>_.attempt<TResult>(testAttempFn);
 result = <TResult|Error>_(testAttempFn).attempt<TResult>();
 
-_.mixin({
-    'capitalize': function (string) {
-        return string.charAt(0).toUpperCase() + string.slice(1).toLowerCase();
-    }
-});
-
-var lodash = <typeof _>_.noConflict();
-
 result = <number>_.random(0, 5);
 result = <number>_.random(5);
 result = <number>_.random(5, true);
@@ -1677,25 +2147,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',
-    'one': 1,
-    'nested': {
-        'two': 2
-    },
-    'stuff': function () {
-        return 'nonsense';
-    }
-};
-
-result = <string>_.result(object, 'cheese');
-result = <string>_.result(object, 'stuff');
-result = _.result<number>(object, 'one');
-result = _.result<number>(object, ['nested', 'two'] );
-
-var tempObject = {};
-result = <typeof _>_.runInContext(tempObject);
-
 // _.property
 interface TestPropertyObject {
     a: {
@@ -1883,9 +2334,32 @@ 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);
@@ -1915,6 +2389,29 @@ result = <() => {}>_({}).constant<{}>();
     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();
+}
+
 // _.method
 class TestMethod {
     a = {
@@ -1939,6 +2436,38 @@ 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('');
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index f54bbbbb4..102811a16 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -258,7 +258,6 @@ declare module _ {
         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,33 +313,39 @@ 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 {
         /**
@@ -367,34 +372,86 @@ declare module _ {
     //_.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>;
     }
 
     //_.findIndex
@@ -505,162 +562,31 @@ declare module _ {
     //_.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;
+         * Gets the first element of array.
+         *
+         * @alias _.head
+         *
+         * @param array The array to query.
+         * @return Returns the first element of array.
+         */
+        first<T>(array: List<T>): T;
+    }
 
+    interface LoDashArrayWrapper<T> {
         /**
-        * @see _.first
-        **/
-        first<T>(array?: List<T>): T;
+         * @see _.first
+         */
+        first(): T;
+    }
 
+    interface LoDashObjectWrapper<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
+         */
+        first<TResult>(): TResult;
+    }
 
+    interface LoDashStatic {
         /**
         * @see _.first
         **/
@@ -694,9 +620,9 @@ declare module _ {
         takeWhile<T>(
             array: (Array<T>|List<T>),
             predicate?: ListIterator<T, boolean>,
-            thisArg?: any 
+            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
@@ -706,7 +632,7 @@ declare module _ {
             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
@@ -719,70 +645,6 @@ declare module _ {
     }
 
     interface LoDashArrayWrapper<T> {
-        /**
-        * @see _.first
-        **/
-        first(): 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
         **/
@@ -875,6 +737,28 @@ 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 {
         /**
@@ -937,108 +821,52 @@ declare module _ {
     //_.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
@@ -1086,42 +914,72 @@ declare module _ {
     //_.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<T>(
-            array: Array<T>,
-            ...values: T[]): T[];
-
-        /**
-        * @see _.pull
-        **/
-        pull<T>(
-            array: List<T>,
-            ...values: T[]): T[];
-    }
-
-    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
@@ -1280,74 +1138,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 +1207,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 +1304,35 @@ declare module _ {
             whereValue: W): number;
     }
 
+    //_.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>;
+    }
+
     //_.union
     interface LoDashStatic {
         /**
@@ -1502,7 +1348,7 @@ declare module _ {
         **/
         union<T>(...arrays: List<T>[]): T[];
     }
-    
+
     interface LoDashArrayWrapper<T> {
         /**
         * @see _.union
@@ -1852,24 +1698,72 @@ 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
@@ -2000,58 +1894,245 @@ 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 *
+     **************/
 
     //_.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
@@ -2514,13 +2595,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 +2764,7 @@ declare module _ {
         * @see _.filter
         **/
         filter(): LoDashArrayWrapper<T>;
-            
+
         /**
         * @see _.filter
         **/
@@ -3514,143 +3595,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
@@ -5096,7 +5161,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 +5191,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
@@ -7117,17 +7182,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;
     }
@@ -7135,22 +7200,40 @@ declare module _ {
     //_.has
     interface LoDashStatic {
         /**
-        * Checks if path is a direct property.
-        * @param object The object to query.
-        * @param path The path to check.
-        * @return True if path is a direct property, else False.
-        **/
-        has(object: any, path: string|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;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.invert
+         */
+        invert<TResult extends {}>(multiValue?: boolean): LoDashObjectWrapper<TResult>;
     }
 
     //_.isEqual
@@ -7267,6 +7350,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 {
         /**
@@ -7450,121 +7624,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
@@ -8059,6 +8309,64 @@ declare module _ {
         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 {
         /**
@@ -8090,6 +8398,57 @@ declare module _ {
         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>;
+    }
+
     //_.method
     interface LoDashStatic {
         /**
@@ -8151,20 +8510,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 _;
     }
 
@@ -8279,29 +8688,22 @@ 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 false then undefined 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 The resolved value.
-        **/
-
-        result<T>(object: any, path: string|string[], defaultValue?: T): T;
-    }
-
     //_.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 _;
+    }
+
+    interface LoDashObjectWrapper<T> {
+        /**
+         * @see _.runInContext
+         */
+        runInContext(): typeof _;
     }
 
     //_.times
@@ -8377,7 +8779,7 @@ 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> {
@@ -8389,19 +8791,18 @@ declare module _ {
     }
 
     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> {}
 
@@ -8414,6 +8815,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 98f23d1f7..44d226d0b 100644
--- a/log4javascript/log4javascript.d.ts
+++ b/log4javascript/log4javascript.d.ts
@@ -1051,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/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/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 64b5f93c4..66d90ba0c 100644
--- a/mailcheck/mailcheck.d.ts
+++ b/mailcheck/mailcheck.d.ts
@@ -46,6 +46,7 @@ declare module MailcheckModule {
     }
 
     export interface IOptions {
+        email: string;
         domains?: string[];
         secondLevelDomains?: string[];
         topLevelDomains?: string[];
diff --git a/maker.js/makerjs-tests.ts b/maker.js/makerjs-tests.ts
index ca2aea17b..be5b53229 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);
@@ -121,6 +127,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..bcba375f8 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.
@@ -294,6 +300,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 +402,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 +440,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 +498,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 +629,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 +694,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 {
     /**
@@ -1023,6 +1086,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 +1110,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 +1127,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 +1149,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/material-ui/material-ui-tests.tsx b/material-ui/material-ui-tests.tsx
new file mode 100644
index 000000000..eed734d95
--- /dev/null
+++ b/material-ui/material-ui-tests.tsx
@@ -0,0 +1,476 @@
+///<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 = 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/material-ui.d.ts b/material-ui/material-ui.d.ts
new file mode 100644
index 000000000..c5c37ee91
--- /dev/null
+++ b/material-ui/material-ui.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/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/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..77f208cc0
--- /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/msportalfx-test/msportalfx-test-tests.ts b/msportalfx-test/msportalfx-test-tests.ts
new file mode 100644
index 000000000..98f86dcd4
--- /dev/null
+++ b/msportalfx-test/msportalfx-test-tests.ts
@@ -0,0 +1,93 @@
+
+/// <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 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');
+}
+
+function TestBlades() {
+    var blade = new testFx.Blades.Blade(resourceName);
+    blade.clickCommand('Delete');
+
+    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');
+}
+
+function TestParts() {
+    var part = new testFx.Parts.Part(summaryBlade.getLocator(), "Roles");
+    voidPromise = part.click();
+    boolPromise = part.isSelected();
+    boolPromise = part.waitUntilLoaded();
+    boolPromise = part.isLoaded();
+
+    var resourceSummary = new testFx.Parts.ResourceSummaryPart(summaryBlade.getLocator());
+    var count = resourceSummary.properties.length;
+
+    var pricingTier = new testFx.Parts.PricingTierPart(summaryBlade.getLocator());
+    voidPromise = pricingTier.click();
+}
+
+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);
+}
+
+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();
+}
\ 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..5ba413484
--- /dev/null
+++ b/msportalfx-test/msportalfx-test.d.ts
@@ -0,0 +1,250 @@
+// 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>;
+        }
+
+        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 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<TextField>;
+        }
+
+        export class ResourceFilterTextField extends TextField {
+            constructor(parentLocator?: Locators.Locator);
+        }
+    }
+
+    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>;
+        }
+
+        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;
+
+            constructor(parentLocator?: Locators.Locator);
+        }
+
+        class PricingTierPart extends Part {
+        }
+
+        export class Tile extends MsPortalTestFx.PortalElement {
+            public progressLocator: Locators.Locator;
+
+            constructor(parentLocator?: Locators.Locator);
+        }
+    }
+
+    export class PortalElement {
+        protected baseLocator: Locators.Locator;
+        protected parentLocator: Locators.Locator;
+
+        constructor(baseLocator: Locators.Locator, parentLocator?: Locators.Locator);
+        getLocator(): Locators.Locator;
+        click(): Q.Promise<void>;
+        getAttribute(attributeName: string): Q.Promise<string>;
+    }
+
+    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;
+        click(locator: Locators.Locator): Q.Promise<void>;
+        sendKeys(locator: Locators.Locator, ...var_args: string[]): Q.Promise<void>
+        getText(locator: Locators.Locator): Q.Promise<string>;
+        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>;
+        getAttribute(locator: Locators.Locator, attributeName: string, timeout?: number): Q.Promise<string>;
+        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>;
+        takeScreenshot(filePrefix?: string): Q.Promise<string>;
+        goHome(timeout?: number): Q.Promise<void>;
+        getBrowserLogs(level: LogLevel): Q.Promise<string[]>;
+        applyFeature(name: string, value: string): void;
+        executeScript<T>(script: string): Q.Promise<T>;
+        quit(): Q.Promise<any>;
+    }
+
+    export class SplashScreen extends PortalElement {
+        clickUntrustedExtensionsOkButton(): Q.Promise<void>;
+    }
+
+    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/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-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/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-jsfl-runner/node-jsfl-runner-tests.ts b/node-jsfl-runner/node-jsfl-runner-tests.ts
index f92f4bfde..31202b9f7 100644
--- a/node-jsfl-runner/node-jsfl-runner-tests.ts
+++ b/node-jsfl-runner/node-jsfl-runner-tests.ts
@@ -8,11 +8,13 @@ let myJSFL: jsfl.JSFL = {
   }
 }
 
+let flashLocation: string = '';
+
 jsfl.createJSFL(myJSFL, 'fileName.jsfl', ['Hello!'], (err: NodeJS.ErrnoException) => {
 
 });
 
-jsfl.runJSFL('fileName.jsfl', (err: NodeJS.ErrnoException) => {
+jsfl.runJSFL(flashLocation, 'fileName.jsfl', (err: NodeJS.ErrnoException) => {
 
 });
 
diff --git a/node-jsfl-runner/node-jsfl-runner.d.ts b/node-jsfl-runner/node-jsfl-runner.d.ts
index b3f0a8688..f1d11561a 100644
--- a/node-jsfl-runner/node-jsfl-runner.d.ts
+++ b/node-jsfl-runner/node-jsfl-runner.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-jsfl-runner
+// 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
@@ -28,8 +28,9 @@ declare module "node-jsfl-runner" {
   
   /**
    * Runs a JSFL file
+   * @param flashLocation Path to Flash executable
    * @param fileName Path to JSFL file to run
    * @param callback Callback
    */
-  function runJSFL(fileName: string, callback: (err: NodeJS.ErrnoException) => void): void;
+  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 869aa823e..3d26b6e8b 100644
--- a/node-mysql-wrapper/node-mysql-wrapper-tests.ts
+++ b/node-mysql-wrapper/node-mysql-wrapper-tests.ts
@@ -1,4 +1,7 @@
 /// <reference path="./node-mysql-wrapper.d.ts" />
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../bluebird/bluebird.d.ts" />
+
 var express = require('express');
 var app = express();
 var server = require('http').createServer(app);
@@ -9,42 +12,37 @@ 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(() => {
 
 
     var usersDb = db.table<User>("users");
-    usersDb.rules.orderBy("userId", true);
-  
+    
+    //or var usersDb = db.table("users"); if you don't want intel auto complete from your ide/editor
 
-     usersDb.findAll().then(users=> {
-             users.forEach(user=> {
-                 console.log(user.userId);
-             });
-     });
-    
-  
-    //define new table rules: usersDb.rules.clear().orderBy....limit....groupBy...
-    
-    //define rules but keep unchanged (table's rules) in find method:
-    usersDb.find({ yearsOld: 22 }, (_users) => {
-    
-        console.log("-------------------------------------------------------");
-        _users.forEach(_user=> {
-            console.log(_user.userId + " " + _user.username + " found with limit 3 but this doesnt...");
-
-        });
-
-    }).limit(3).execute();
-    
     usersDb.findById(16, (_user) => {
 
         console.log("TEST1: \n");
@@ -56,20 +54,27 @@ db.ready(() => {
      }, (err) => { console.log("ERROR ON FETCHING FINDBY ID: " + err) });
    */
 
-    usersDb.find({ userId: 18, comments: { userId: '=' } }, _users=> {
-
-        var _user = _users[0];
-
-        console.log("TEST2: \n");
-        console.log(_user.username + " with ");
-        console.log(_user.comments.length + " comments ");
-        _user.comments.forEach(_comment=> {
-            console.log("--------------\n" + _comment.content);
+    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);
+            });
         });
 
-    }).execute();
-
-    usersDb.safeRemove(5620, answer=> {
+    usersDb.remove(5620, answer=> {
         console.log("TEST 3: \n");
         console.log(answer.affectedRows + ' (1) has removed from table:  ' + answer.table);
 
@@ -86,8 +91,107 @@ db.ready(() => {
     });
 
 
+
+    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() {
diff --git a/node-mysql-wrapper/node-mysql-wrapper.d.ts b/node-mysql-wrapper/node-mysql-wrapper.d.ts
index 095038faa..1de3ca1b2 100644
--- a/node-mysql-wrapper/node-mysql-wrapper.d.ts
+++ b/node-mysql-wrapper/node-mysql-wrapper.d.ts
@@ -1,10 +1,12 @@
 // 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='./../bluebird/bluebird.d.ts' />
+///<reference path="./my-meteor.d.ts" />
+
 
 declare module "node-mysql-wrapper" {
     import * as Mysql from 'mysql';
@@ -12,11 +14,44 @@ declare module "node-mysql-wrapper" {
     import {EventEmitter} from 'events';
 
     var EQUAL_TO_PROPERTY_SYMBOL: string;
+    var TABLE_RULES_PROPERTY: string;
+
+    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 IQuery<T> {
+        _table: Table<T>;
+        execute(rawCriteria: any, callback?: (_results: any) => any): Promise<any>;
+    }
+
+    interface IQueryConstructor<T> {
+        new (_table: Table<T>): IQuery<T>;
+    }
+
+
     class Helper {
         /** 
          * Callback like forEach
@@ -61,17 +96,15 @@ declare module "node-mysql-wrapper" {
          * @return {string}
          */
         static toRowProperty(objectKey: string): string;
-        
     
-        
         /**
          * Iterate object's keys and return their values to the callback.
-         * @param {Map<T>} map the object.
+         * @param {<T>} map the object.
          * @param {valueCallback}
          * @returnType {U}
          * @return {U}
          */
-        static forEachValue<T, U>(map: Map<T>, callback: (value: T) => U): U;
+        static forEachValue<T, U>(map: T, callback: (value: T) => U): U;
 
         /**
         * Iterate object's keys and return their names to the callback.
@@ -80,17 +113,38 @@ declare module "node-mysql-wrapper" {
         * @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 ICriteria {
+
+    interface ICriteriaParts {
         rawCriteriaObject: any;
-        tables: string[];
+        tables: TableToSearchPart[];
         noDatabaseProperties: string[];
         whereClause: string;
+
+        selectFromClause<T>(_table: Table<T>): string;
+
     }
 
-    class Criteria implements ICriteria {
+
+
+    class CriteriaParts implements ICriteriaParts {
         
         /**
          * The raw format of the criteria eg: {yearsOld:22}.
@@ -100,7 +154,7 @@ declare module "node-mysql-wrapper" {
         /**
          * Which tables to search after the find method of the proto table finish.
          */
-        tables: string[];
+        tables: TableToSearchPart[];
         
         /**
          * The properties of the criteria which don't belong to the database's table.
@@ -112,10 +166,12 @@ declare module "node-mysql-wrapper" {
          */
         whereClause: string;
 
-        constructor(rawCriteriaObject: any, tables: string[], noDatabaseProperties: string[], whereClause: string);
+        constructor(rawCriteriaObject: any, tables: TableToSearchPart[], noDatabaseProperties: string[], whereClause: string);
+
+        selectFromClause<T>(_table: Table<T>): string;
     }
 
-    class CriteriaBuilder<T> {
+    class CriteriaDivider<T> {
         private _table;
         constructor(table: Table<T>);
         
@@ -125,70 +181,288 @@ declare module "node-mysql-wrapper" {
          * @returnType {Criteria}
          * @return {Criteria}
          */
-        build(rawCriteriaObject: any): Criteria;
+        build(rawCriteriaObject: any): CriteriaParts;
     }
 
     class SelectQueryRules {
-        orderByClause: string;
-        groupByClause: string;
-        limitClause: string;
-
-
+        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;
-        static build(parentRule?: SelectQueryRules): 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;
     }
 
-    class SelectQuery<T> {
+    class CriteriaBuilder<T>{
 
-        private _rules: SelectQueryRules;
-        private _table: Table<T>;
-        private _criteriaRawJsObject: any;
-        private _callback: (_results: T[]) => any;
-        private callback: (resolve?: (thenableOrResult?: T | Promise.Thenable<T>) => void, reject?: (error?: any) => void) => void;
+        private rawCriteria: any;
+        private primaryTable: Table<T>;
+        private parentBuilder: CriteriaBuilder<any>;
 
-        constructor(table: Table<T>, criteriaRawJsObject: any, callback?: (_results: T[]) => any);
+        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>);
 
-        orderBy(columnKey: string, descending?: boolean): SelectQuery<T>;
+        except(...columns: string[]): CriteriaBuilder<T>;
+        
+        /**
+	    * Same as .except(...columns)
+	    */
+        exclude(...columns: string[]): CriteriaBuilder<T>;
 
-        groupBy(columnKey: string): SelectQuery<T>;
+        where(key: string, value: any): CriteriaBuilder<T>;
 
-        limit(limitRowsOrStart: number, limitEnd?: number): SelectQuery<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>
+
+    }
+
+    class SelectQuery<T> implements IQuery<T> { // T for Table's result type.
+       
+        _table: Table<T>
+        constructor(_table: Table<T>);
+
+        private parseQueryResult(result: any, criteria: ICriteriaParts): Promise<any>;
 
         /**
-        * Executes the select and returns the Promise.
-        */
-        promise(): Promise<T[]>;
-        
+         * Executes the select and returns the Promise.
+         */
+        promise(rawCriteria: any, callback?: (_results: T[]) => any): Promise<T[]>;
+
         /**
          * Exactly the same thing as promise().
          * Executes the select and returns the Promise.
-         */
-        execute(): Promise<T[]>;
+        */
+        execute(rawCriteria: any, callback?: (_results: T[]) => any): Promise<T[]>;
+    }
 
-        then(onFulfill: (value: any[]) => any|Promise.Thenable<any>): Promise<any>;
-        then<U>(onFulfill: (value: T[]) => U|Promise.Thenable<U>, onReject: (error: any) => Promise.Thenable<U>, onProgress?: (note: any) => any): Promise<U>;
-        then<U>(onFulfill: (value: T[]) => U|Promise.Thenable<U>, onReject?: (error: any) => U, onProgress?: (note: any) => any): Promise<U>;
+    class SaveQuery<T> implements IQuery<T> {
+        _table: Table<T>
+        constructor(_table: Table<T>);
+        execute(criteriaRawJsObject: any, callback?: (_result: T | any) => any): Promise<T | any>;
+    }
+
+    class DeleteQuery<T> implements IQuery<T>{
+        _table: Table<T>
+        constructor(_table: Table<T>);
+        execute(criteriaOrID: any | number | string, callback?: (_result: DeleteAnswer) => any): Promise<DeleteAnswer>;
+    }
+
+
+    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;
 
     }
 
+    enum CollectionChangedAction {
+        INSERT, DELETE, RESET//for now I will use only add, remove and reset . replace and move is for future., REPLACE, MOVE
+    }
+
+    class CollectionChangedEventArgs<T> {
+        action: CollectionChangedAction;
+        oldItems: (T | (T & ObservableObject))[];
+        newItems: (T | (T & ObservableObject))[];
+        oldStartingIndex: number;
+        newStartingIndex: number;
+
+        constructor(action: CollectionChangedAction, oldItems?: (T | (T & ObservableObject))[], newItems?: (T | (T & ObservableObject))[], oldStartingIndex?: number, newStartingIndex?: number);
+    }
+
+
+    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;
+    }
+
+    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 {
         
         /**
@@ -211,15 +485,15 @@ declare module "node-mysql-wrapper" {
          */
         tables: Table<any>[];
 
-        constructor(connection: string | Mysql.IConnection);
+        constructor(connection: string | Mysql.IConnection | Mysql.IConnectionConfig);
         
         /**
          * Creates the MysqlConnection from the connection url or the real connection object.
-         * @param {string | Mysql.IConnection} connection 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): void;
+        create(connection: string | Mysql.IConnection | Mysql.IConnectionConfig): void;
         
         /**
          * Attach a real connection.
@@ -243,6 +517,13 @@ declare module "node-mysql-wrapper" {
          */
         destroy(): void;
         
+        /**
+         * 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.
@@ -264,7 +545,7 @@ declare module "node-mysql-wrapper" {
          * @returnType {Promise}
          * @return {Promise}
          */
-        fetchDatabaseInfornation(): Promise<void>;
+        fetchDatabaseInformation(): Promise<void>;
         
         /**
          * Escape the query column's value  and return it.
@@ -278,21 +559,21 @@ declare module "node-mysql-wrapper" {
          * 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[]} parsedResults the parsed results (results after a method parse/edit/export them as objects), these are passing to the watch listener(s).
+         * @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, parsedResults: any[]): void;
+        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 parsedResults (results after query executed and exports to object(s)). 
+         * @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: (parsedResults: any[]) => void): void;
+        watch(tableName: string, evtType: any, callback: (rawRows: any[]) => void): void;
         
         /**
          * Removes an event listener/watcher from a table for a specific event type.
@@ -302,7 +583,7 @@ declare module "node-mysql-wrapper" {
          * @returnType {nothing}
          * @return {nothing}
          */
-        unwatch(tableName: string, evtType: string, callbackToRemove: (parsedResults: any[]) => void): void;
+        unwatch(tableName: string, evtType: string, callbackToRemove: (rawResults: any[]) => void): void;
         
         /**
          * Executes a database query.
@@ -324,15 +605,24 @@ declare module "node-mysql-wrapper" {
         table<T>(tableName: string): Table<T>;
     }
 
-    class Table<T> {
-        private _name;
-        private _connection;
-        private _columns;
-        private _primaryKey;
-        private _criteriaBuilder;
-        private _rules;
+    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.
          */
@@ -355,17 +645,31 @@ declare module "node-mysql-wrapper" {
         
         /**
          * 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 parsedResults (results after query executed and exports to object(s)). 
+        * @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: (parsedResults: any[]) => void): void;
+        on(evtType: string, callback: (rawResults: any[]) => void): void;
             
         /**
          * Removes or turn off an event listener/watcher from a table for a specific event type.
@@ -374,8 +678,8 @@ declare module "node-mysql-wrapper" {
          * @returnType {nothing}
          * @return {nothing}
          */
-        off(evtType: string, callbackToRemove: (parsedResults: any[]) => void): void;
-        
+        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.
@@ -424,52 +728,52 @@ declare module "node-mysql-wrapper" {
          * @return {number | string}
          */
         getPrimaryKeyValue(jsObject: any): number | string;
-
-        parseQueryResult(result: any, criteria: ICriteria): Promise<any>;
         
         /**
          * 
          */
-        find(criteriaRawJsObject: any): SelectQuery<T>; // only criteria 
-        find(criteriaRawJsObject: any, callback: ((_results: T[]) => any)): SelectQuery<T>; // criteria and callback
-        find(criteriaRawJsObject: any, callback?: (_results: T[]) => any): SelectQuery<T>;
+        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[]>;
 
-        findById(id: number|string): Promise<T>; // without callback
+        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(): SelectQuery<T>; // without callback
-        findAll(callback?: (_results: T[]) => any): SelectQuery<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>;
 
-        safeRemove(id: number | string): Promise<{
-            affectedRows: number;
-            table: string;
-        }>; //withoutcallback
-        safeRemove(id: number | string, callback?: (_result: {
-            affectedRows: number;
-            table: string;
-        }) => any): Promise<{
-            affectedRows: number;
-            table: string;
-        }>;
+        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>;
 
-        remove(criteriaRawObject: any): Promise<{
-            affectedRows: number;
-            table: string;
-        }>; // without callback
-        remove(criteriaRawJsObject: any, callback?: (_result: {
-            affectedRows: number;
-            table: string;
-        }) => any): Promise<{
-            affectedRows: number;
-            table: string;
-        }>;
     }
 
-    class Wrapper {
+    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>;
@@ -484,7 +788,7 @@ declare module "node-mysql-wrapper" {
         useOnly(...useTables: any[]): void;
 
         has(tableName: string, functionName?: string): boolean;
-        ready(callback: () => void): void;
+        ready(callback?: () => void): void;
         table<T>(tableName: string): Table<T>;
         noticeReady(): void;
         removeReadyListener(callback: () => void): void;
@@ -508,7 +812,19 @@ declare module "node-mysql-wrapper" {
 
         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[]): Wrapper;
+    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.d.ts b/node-notifier/node-notifier.d.ts
index d003001a3..9e612453e 100644
--- a/node-notifier/node-notifier.d.ts
+++ b/node-notifier/node-notifier.d.ts
@@ -3,7 +3,6 @@
 // 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" />
 
 declare module "node-notifier" {
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 b7edca1f7..140a72c74 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;
@@ -1671,14 +1679,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;
     }
@@ -1691,15 +1698,12 @@ declare module "stream" {
     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 +1714,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 +1729,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 +1737,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 +1771,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/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 3458cb8a6..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,9 +22,9 @@
               "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.3",
@@ -33,9 +32,9 @@
                   "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.6",
@@ -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.10",
-                  "from": "minimatch@>=2.0.1 <3.0.0",
-                  "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.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",
@@ -204,12 +141,17 @@
                   "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.2",
-          "from": "lazy.js@>=0.4.0 <0.5.0",
+          "from": "lazy.js@>=0.4.2 <0.5.0",
           "resolved": "https://registry.npmjs.org/lazy.js/-/lazy.js-0.4.2.tgz"
         },
         "manticore": {
@@ -305,9 +247,9 @@
       }
     },
     "typescript": {
-      "version": "1.6.0-beta",
-      "from": "typescript@1.6.0-beta",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.6.0-beta.tgz"
+      "version": "1.6.2",
+      "from": "typescript@1.6.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.6.2.tgz"
     }
   }
 }
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/openlayers/openlayers-tests.ts b/openlayers/openlayers-tests.ts
index 3effa928a..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,13 +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
@@ -102,17 +120,172 @@ 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
 //
@@ -161,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 
@@ -174,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 9974ef9eb..89680ac91 100644
--- a/openlayers/openlayers.d.ts
+++ b/openlayers/openlayers.d.ts
@@ -22,23 +22,23 @@ declare module olx {
     interface FrameState {
 
         /**
-         * 
+         *
          */
         pixelRatio: number;
 
         /**
-         * 
+         *
          */
         time: number;
 
         /**
-         * 
+         *
          */
         viewState: olx.ViewState;
     }
 
     interface FeatureOverlayOptions {
-        
+
         /**
          * Features
          */
@@ -88,6 +88,71 @@ 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.
      */
@@ -101,6 +166,7 @@ declare module olx {
        * Image src for the logo
        */
       src: string;
+
     }
 
     interface MapOptions {
@@ -238,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().
              */
@@ -284,7 +389,7 @@ declare module olx {
         }
 
         interface PanOptions {
-            
+
             /**
              * The resolution to start the bounce from, typically map.getView().getResolution().
              */
@@ -307,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.
              */
@@ -335,7 +440,7 @@ declare module olx {
         }
 
         interface ZoomOptions {
-            
+
             /**
              * The resolution to begin zooming from, typically map.getView().getResolution().
              */
@@ -383,14 +488,14 @@ 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;
@@ -729,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.
              */
@@ -852,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.
      */
@@ -862,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.
      */
@@ -925,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
          */
@@ -952,7 +1061,7 @@ declare module ol {
          */
         removeAt(index: number): T;
 
-        /** 
+        /**
          * Set the element at the provided index.
          * @param index Index.
          * @param elem Element.
@@ -984,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;
 
@@ -996,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;
 
@@ -1014,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.
      */
@@ -1145,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;
 
@@ -1217,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;
 
@@ -1247,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;
 
@@ -1259,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;
 
@@ -1298,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 {
 
@@ -1351,13 +1460,13 @@ declare module ol {
     }
 
     /**
-     * 
+     *
      */
     class ImageBase {
     }
 
     /**
-     * 
+     *
      */
     class ImageTile extends ol.Tile {
 
@@ -1446,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;
 
@@ -1457,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;
 
@@ -1470,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;
 
@@ -1496,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;
 
@@ -1521,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;
 
@@ -1537,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;
@@ -1561,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;
 
@@ -1620,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.
      */
@@ -1646,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
          */
@@ -1662,12 +1771,12 @@ declare module ol {
          */
         originalEvent: Event;
 
-        /** 
+        /**
          * The pixel of the original browser event.
          */
         pixel: Pixel;
 
-        
+
         // Methods
 
         /**
@@ -1715,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.
          */
@@ -1732,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.
          */
@@ -1910,7 +2019,7 @@ declare module ol {
          */
         setPositioning(positioning: ol.OverlayPositioning): void;
     }
-    
+
     /**
      * Events emitted by ol.interaction.Select instances are instances of this type.
      */
@@ -2089,7 +2198,7 @@ declare module ol {
          */
         setZoom(zoom: number): void;
     }
-    
+
     // NAMESPACES
 
     /**
@@ -2102,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.
@@ -2160,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'.
          */
@@ -2203,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;
 
@@ -2234,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;
 
@@ -2271,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.
@@ -2341,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;
 
@@ -2478,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
@@ -2492,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
@@ -2628,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;
         }
 
         /**
@@ -2653,35 +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;
 
-        class MultiPolygon {
+            /**
+             * Set the coordinates of the multipolygon.
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            setCoordinates(coordinates: Array<Array<Array<ol.Coordinate>>>, layout?: ol.geom.GeometryLayout): void;
         }
 
+        /**
+        * Point geometry.
+        */
         class Point extends SimpleGeometry {
-          constructor(coordinates: ol.Coordinate, layout?: geom.GeometryLayout);
-          getCoordinates(): ol.Coordinate;
-          setCoordinates(coordinates: ol.Coordinate, opt?: geom.GeometryLayout): void;
+
+            /**
+             * 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 Polygon {
-        }
+        /**
+        * Polygon geometry.
+        */
+        class Polygon extends SimpleGeometry {
 
-        class SimpleGeometry extends Geometry {
+            /**
+             * constructor
+             * @param coordinates Coordinates.
+             * @param layout Layout.
+             */
+            constructor(coordinates: Array<Array<ol.Coordinate>>, layout?: ol.geom.GeometryLayout);
+
+            /**
+             * 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;
         }
     }
 
@@ -2798,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;
 
@@ -2971,7 +3664,7 @@ declare module ol {
         class Layer extends ol.layer.Base {
 
             /**
-             * @constructor 
+             * @constructor
              * @param options Layer options
              */
             constructor(options?: olx.layer.LayerOptions);
@@ -2988,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.
          */
@@ -3193,7 +3886,8 @@ declare module ol {
          */
         function transformExtent(extent: Extent, source: ProjectionLike, destination: ProjectionLike): Extent;
 
-        interface Projection {
+        class Projection {
+            constructor(options: olx.Projection)
         }
     }
 
@@ -3238,6 +3932,7 @@ declare module ol {
         }
 
         class ImageWMS {
+            constructor(options: olx.ImageWMSOptions);
         }
 
         class MapQuest {
@@ -3278,6 +3973,7 @@ declare module ol {
         }
 
         class TileWMS {
+            constructor(options: olx.TileWMSOptions);
         }
 
         class Vector {
@@ -3514,7 +4210,7 @@ declare module ol {
              */
             getTileSize(z: number): number | ol.Size;
         }
-        
+
         /**
          * Set the grid pattern for sources accessing WMTS tiled-image servers.
          */
@@ -3540,7 +4236,7 @@ declare module ol {
              */
             getMatrixIds(): Array<string>;
         }
-        
+
         /**
          * Set the grid pattern for sources accessing Zoomify tiled-image servers.
          */
@@ -3572,7 +4268,7 @@ declare module ol {
              */
             constructor(canvas: HTMLCanvasElement, gl: WebGLRenderingContext);
 
-            /** 
+            /**
             Get the WebGL rendering context
              @returns The rendering context.
             */
@@ -3595,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; }
 
@@ -3671,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/os-locale/os-locale-tests.ts b/os-locale/os-locale-tests.ts
index 65763a112..bcf5b0129 100644
--- a/os-locale/os-locale-tests.ts
+++ b/os-locale/os-locale-tests.ts
@@ -5,4 +5,8 @@ import osLocale, { sync } from 'os-locale';
 osLocale((err: any, locale: string) => {
 });
 
-var locale: string = sync();
+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
index 17933ae67..74b2d6922 100644
--- a/os-locale/os-locale.d.ts
+++ b/os-locale/os-locale.d.ts
@@ -1,12 +1,14 @@
-// Type definitions for os-locale 1.2.1
+// 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 e82eb15b0..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.6.0-beta"
+    "definition-tester": "0.3.0",
+    "typescript": "1.6.2"
   }
 }
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 ca136f3a2..e4006d5c1 100644
--- a/photoswipe/photoswipe-tests.ts
+++ b/photoswipe/photoswipe-tests.ts
@@ -51,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 16ce87a68..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
@@ -308,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/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/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/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/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-dnd/react-dnd-tests.ts b/react-dnd/react-dnd-tests.ts
index d270a041d..ef51367e8 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');
@@ -197,6 +198,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 +264,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-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.d.ts b/react-router/react-router.d.ts
index bc19e568c..4cebcfab3 100644
--- a/react-router/react-router.d.ts
+++ b/react-router/react-router.d.ts
@@ -113,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;
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/react.d.ts b/react/react.d.ts
index 906bc9da1..a529c34f5 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -135,7 +135,7 @@ declare namespace __React {
         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;
@@ -336,7 +336,7 @@ declare namespace __React {
         ref?: string | ((component: T) => any);
     }
 
-    interface DOMAttributes extends Props<DOMComponent<any>> {
+    interface DOMAttributesBase<T> extends Props<T> {
         onCopy?: ClipboardEventHandler;
         onCut?: ClipboardEventHandler;
         onPaste?: ClipboardEventHandler;
@@ -377,6 +377,9 @@ declare namespace __React {
         };
     }
 
+    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 {
@@ -406,9 +409,7 @@ declare namespace __React {
         [propertyName: string]: any;
     }
 
-    interface HTMLAttributes extends DOMAttributes {
-        ref?: string | ((component: HTMLComponent) => void);
-
+    interface HTMLAttributesBase<T> extends DOMAttributesBase<T> {
         accept?: string;
         acceptCharset?: string;
         accessKey?: string;
@@ -528,6 +529,9 @@ declare namespace __React {
         unselectable?: boolean;
     }
 
+    interface HTMLAttributes extends HTMLAttributesBase<HTMLComponent> {
+    }
+
     interface SVGElementAttributes extends HTMLAttributes {
         viewBox?: string;
         preserveAspectRatio?: string;
@@ -568,6 +572,7 @@ declare namespace __React {
         stroke?: string;
         strokeDasharray?: string;
         strokeLinecap?: string;
+        strokeMiterlimit?: string;
         strokeOpacity?: number | string;
         strokeWidth?: number | string;
         textAnchor?: string;
@@ -932,7 +937,7 @@ declare module "react/addons" {
         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;
@@ -1133,7 +1138,7 @@ declare module "react/addons" {
         ref?: string | ((component: T) => any);
     }
 
-    interface DOMAttributes extends Props<DOMComponent<any>> {
+    interface DOMAttributesBase<T> extends Props<T> {
         onCopy?: ClipboardEventHandler;
         onCut?: ClipboardEventHandler;
         onPaste?: ClipboardEventHandler;
@@ -1174,6 +1179,9 @@ declare module "react/addons" {
         };
     }
 
+    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 {
@@ -1203,9 +1211,7 @@ declare module "react/addons" {
         [propertyName: string]: any;
     }
 
-    interface HTMLAttributes extends DOMAttributes {
-        ref?: string | ((component: HTMLComponent) => void);
-
+    interface HTMLAttributesBase<T> extends DOMAttributesBase<T> {
         accept?: string;
         acceptCharset?: string;
         accessKey?: string;
@@ -1325,6 +1331,9 @@ declare module "react/addons" {
         unselectable?: boolean;
     }
 
+    interface HTMLAttributes extends HTMLAttributesBase<HTMLComponent> {
+    }
+
     interface SVGElementAttributes extends HTMLAttributes {
         viewBox?: string;
         preserveAspectRatio?: string;
@@ -1365,6 +1374,7 @@ declare module "react/addons" {
         stroke?: string;
         strokeDasharray?: string;
         strokeLinecap?: string;
+        strokeMiterlimit?: string;
         strokeOpacity?: number | string;
         strokeWidth?: number | string;
         textAnchor?: string;
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.d.ts b/redlock/redlock.d.ts
index 4c55f3b62..07760e102 100644
--- a/redlock/redlock.d.ts
+++ b/redlock/redlock.d.ts
@@ -39,7 +39,6 @@ declare module RedlockTypes {
 		servers: any[]; // array of redis.RedisClient
 
 		constructor(clients: any[], options?: RedlockOptions);
-		//new (clients: any[], options?: IRedlockOptions);
 
 		acquire(resource: string, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
 		lock(resource: string, ttl: number, callback?: NodeifyCallback<Lock>): Promise<Lock>;
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/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/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/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 bce357482..b09e4affd 100644
--- a/restangular/restangular.d.ts
+++ b/restangular/restangular.d.ts
@@ -43,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/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/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/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..181c40491 100644
--- a/sharepoint/SharePoint.d.ts
+++ b/sharepoint/SharePoint.d.ts
@@ -7159,7 +7159,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 +7191,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 */
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 100755
index 000000000..abf906a08
--- /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 100755
index 000000000..bab795e1a
--- /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/slickgrid/SlickGrid.d.ts b/slickgrid/SlickGrid.d.ts
index 741124ffa..e012194c4 100644
--- a/slickgrid/SlickGrid.d.ts
+++ b/slickgrid/SlickGrid.d.ts
@@ -1601,9 +1601,9 @@ declare module Slick {
 			public expandGroup(...varArgs: string[]): void;
 			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;
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/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/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/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/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/tether-shepherd/tether-shepherd-tests.ts b/tether-shepherd/tether-shepherd-tests.ts
index 7325a8464..085da575b 100644
--- a/tether-shepherd/tether-shepherd-tests.ts
+++ b/tether-shepherd/tether-shepherd-tests.ts
@@ -46,6 +46,9 @@ var step2Options: TetherShepherd.IShepherdTourStepOptions = {
         destroy: () => {
             console.log('Destroyed the Step 2');
         }
+    },
+    showOn: () => {
+        return true;
     }
 };
 
@@ -55,4 +58,4 @@ var queriedStep = tour.getById('test-step-2');
 
 queriedStep.destroy();
 
-tour.start();
\ No newline at end of file
+tour.start();
diff --git a/tether-shepherd/tether-shepherd.d.ts b/tether-shepherd/tether-shepherd.d.ts
index eeee87104..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
@@ -149,6 +149,7 @@ declare module TetherShepherd {
         showCancelLink?: boolean;
         scrollTo?: boolean;
         when?: any;
+        showOn?: () => boolean;
 
         // TODO: Tie this in with the tether.d.ts
         tetherOptions?: any;
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..7afa46ddb
--- /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?: string;
+
+		/**
+		 * 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/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..f4bcdce7e 100644
--- a/ui-grid/ui-grid-tests.ts
+++ b/ui-grid/ui-grid-tests.ts
@@ -100,3 +100,11 @@ gridApi.core.queueGridRefresh()
 gridApi.core.queueRefresh();
 gridApi.core.registerColumnsProcessor(colProcessor, 100);
 
+var rowEntityToScrollTo = {anObject: 'inGridOptionsData'};
+var columnDefToScrollTo: uiGrid.IColumnDef;
+gridInstance.scrollTo();
+gridInstance.scrollTo(rowEntityToScrollTo);
+gridInstance.scrollTo(rowEntityToScrollTo, columnDefToScrollTo);
+
+var selectedRowEntities: Array<any> = 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 5f66eca1f..ece964280 100644
--- a/ui-grid/ui-grid.d.ts
+++ b/ui-grid/ui-grid.d.ts
@@ -445,7 +445,7 @@ declare module uiGrid {
          * @param {IColumnDef} colDef to make visible
          * @returns {ng.IPromise<any>} a promise that is resolved after any scrolling is finished
          */
-        scrollTo(rowEntity: IGridRow, colDef: IColumnDef): ng.IPromise<any>;
+        scrollTo(rowEntity?: any, colDef?: IColumnDef): 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.
@@ -489,6 +489,10 @@ declare module uiGrid {
          * 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
          */
@@ -805,10 +809,10 @@ declare module uiGrid {
         /**
          * By default, rows are compared using object equality.  This option can be overridden
          * to compare on any data item property or function
-         * @param {IGridRow} entityA First Data Item to compare
-         * @param {IGridRow} entityB Second Data Item to compare
+         * @param {any} entityA First Data Item to compare
+         * @param {any} entityB Second Data Item to compare
          */
-        rowEquality?(entityA: IGridRow, entityB: IGridRow): boolean;
+        rowEquality?(entityA: any, entityB: any): 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).
@@ -1182,14 +1186,14 @@ declare module uiGrid {
         }
 
         export interface IRowColConstructor {
-            new (row: IGridRow, col: IGridColumn): IRowCol;
+            new (row: uiGrid.IGridRow, col: IGridColumn): IRowCol;
         }
 
         /**
          * A row and column pair that represents the intersection of these two entities
          */
         export interface IRowCol {
-            row: IGridRow;
+            row: uiGrid.IGridRow;
             col: IGridColumn;
             /**
              * Gets the intersection of where the row and column meet
@@ -1282,7 +1286,7 @@ declare module uiGrid {
                reader.readAsText( files[0] );
            }
              */
-            editFileChooserCallback?: (gridRow: IGridRow, gridCol: IGridColumn, files: FileList) => void;
+            editFileChooserCallback?: (gridRow: uiGrid.IGridRow, gridCol: IGridColumn, 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:
@@ -1558,7 +1562,7 @@ declare module uiGrid {
              * @param {any} value The cell value
              * @returns {any} Formatted value
              */
-            exporterFieldCallback?: (grid: IGridInstance, row: IGridRow, col: IGridColumn, value: any) => any;
+            exporterFieldCallback?: (grid: IGridInstance, row: uiGrid.IGridRow, col: IGridColumn, 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.
@@ -2823,12 +2827,12 @@ declare module uiGrid {
              * returns all selected rows as gridRows
              * @returns {Array<IGridRow>} The selected rows
              */
-            getSelectedGridRows(): Array<IGridRow>;
+            getSelectedGridRows(): Array<uiGrid.IGridRow>;
             /**
              * Gets selected rows as entities
              * @returns {Array<any>} Selected row entities
              */
-            getSelectedRows(): Array<IGridRow>;
+            getSelectedRows(): Array<any>;
             /**
              * Selects all rows.  Does nothing if multiselect = false
              * @param {ng.IAngularEvent} event object if raised from event
@@ -2844,7 +2848,7 @@ declare module uiGrid {
              * @param {any} rowEntity gridOptions.data[] array value
              * @param {ng.IAngularEvent} event object if raised from event
              */
-            selectRow(rowEntity: IGridRow, event?: ng.IAngularEvent): void;
+            selectRow(rowEntity: any, 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).
@@ -2871,13 +2875,13 @@ declare module uiGrid {
              * @param {any} rowEntity gridOptions.data[] array value
              * @param {ng.IAngularEvent} event object if raised from event
              */
-            toggleRowSelection(rowEntity: IGridRow, event?: ng.IAngularEvent): void;
+            toggleRowSelection(rowEntity: any, event?: ng.IAngularEvent): void;
             /**
              * UnSelect the data row
              * @param {any} rowEntity gridOptions.data[] array value
              * @param {ng.IAngularEvent} event object if raised from event
              */
-            unSelectRow(rowEntity: IGridRow, event?: ng.IAngularEvent): void;
+            unSelectRow(rowEntity: any, event?: ng.IAngularEvent): void;
 
             // Events
             on: {
@@ -2903,7 +2907,7 @@ declare module uiGrid {
              * @param {IGridRow} row The selected rows
              * @param {ng.IAngularEvent} event object if raised from event
              */
-            (row: IGridRow, event?: ng.IAngularEvent): void;
+            (row: uiGrid.IGridRow, event?: ng.IAngularEvent): void;
         }
 
         export interface rowSelectionChangedBatchHandler {
@@ -2912,7 +2916,7 @@ declare module uiGrid {
              * @param {IGridRow} row The selected rows
              * @param {ng.IAngularEvent} event object if raised from event
              */
-            (row: Array<IGridRow>, event?: ng.IAngularEvent): void;
+            (row: Array<uiGrid.IGridRow>, event?: ng.IAngularEvent): void;
         }
     }
 
diff --git a/ui-router-extras/ui-router-extras-tests.ts b/ui-router-extras/ui-router-extras-tests.ts
index 22d9e4f73..a87b95863 100644
--- a/ui-router-extras/ui-router-extras-tests.ts
+++ b/ui-router-extras/ui-router-extras-tests.ts
@@ -3,10 +3,24 @@
 var myApp = angular.module('testModule')
 
 myApp.config(($stateProvider: angular.ui.IStateProvider, $stickyStateProvider: angular.ui.IStickyStateProvider) => {
-	var state: angular.ui.IStickyState = {
+    var state: angular.ui.IStickyState = {
 		name: 'test',
-		sticky: true,
-		controller: ($previousState: angular.ui.IPreviousStateService) => {
+        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', {});
@@ -14,8 +28,19 @@ myApp.config(($stateProvider: angular.ui.IStateProvider, $stickyStateProvider: a
 			$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);
diff --git a/ui-router-extras/ui-router-extras.d.ts b/ui-router-extras/ui-router-extras.d.ts
index 8e0c42828..df0d0aa3e 100644
--- a/ui-router-extras/ui-router-extras.d.ts
+++ b/ui-router-extras/ui-router-extras.d.ts
@@ -1,6 +1,6 @@
 // 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>
+// 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" />
@@ -13,12 +13,54 @@ declare module 'angular-ui-router-extras' {
 
 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?: {};
+    interface IPreviousState {      
+        state: IState;     
+        params?: ui.IStateParamsService;
     }
 
     /**
@@ -54,16 +96,42 @@ declare module angular.ui {
          * @param memoName Memo name
          */
         forget(memoName: string): void;
-
-    }
+    }    
 
     /**
-     * Sticky state
-     */
+    * 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?: {};
     }
 
+
     /**
      * Sticky state service
      */
diff --git a/underscore/underscore.d.ts b/underscore/underscore.d.ts
index 1f8faf2e2..7dea66a84 100644
--- a/underscore/underscore.d.ts
+++ b/underscore/underscore.d.ts
@@ -1614,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> {
@@ -2463,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/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/urijs/URIjs-tests.ts b/urijs/URIjs-tests.ts
index 2dfd15618..3501a6efc 100644
--- a/urijs/URIjs-tests.ts
+++ b/urijs/URIjs-tests.ts
@@ -34,3 +34,7 @@ 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']);
\ No newline at end of file
diff --git a/urijs/URIjs.d.ts b/urijs/URIjs.d.ts
index 7bab32074..a41e06cbf 100644
--- a/urijs/URIjs.d.ts
+++ b/urijs/URIjs.d.ts
@@ -95,10 +95,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/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/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-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/whatwg-fetch/whatwg-fetch-tests.ts b/whatwg-fetch/whatwg-fetch-tests.ts
index 5248f5d1d..3f29746ed 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 === 'basis') {
+			// 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..4d47904a2 100644
--- a/whatwg-fetch/whatwg-fetch.d.ts
+++ b/whatwg-fetch/whatwg-fetch.d.ts
@@ -10,20 +10,20 @@ declare class Request {
 	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 {
@@ -58,7 +58,7 @@ 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;
@@ -80,5 +80,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/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;
+}