diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..79ce17422
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+* text=auto
+
+*.pkgdef      text
+*.vstemplate  text
diff --git a/.gitignore b/.gitignore
index 986f7ddfb..5489f4321 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,8 @@ bin/
 obj/
 *.suo
 *.user
+*.cache
+*.trx
+Scripts/
+packages/
+TestResults/
diff --git a/History.txt b/History.txt
new file mode 100644
index 000000000..d93d10faa
--- /dev/null
+++ b/History.txt
@@ -0,0 +1,209 @@
+Changelog
+===============================================================================
+
+v0.7.6
+    - Removed script loading APIs from Script class in mscorlib
+      (moved them to Loader class in Script.Web)
+    - Removed script startup functionality from mscorlib.js ... all script
+      loading is now in ssloader.js (and included into the Runtime nuget
+      package)
+    - Removed Script.Alert/Confirm/Prompt from mscorlib and moved them to
+      Window in Script.Web
+    - Moved SetTimeout, SetInterval and ClearTimeout, ClearInterval from
+      Window object to Script object in mscorlib.
+    - Removed some methods from Type as part of cleanup (AddHandler,
+      GetProperty, RemoveHandler, SetProperty, IsEnum, IsFlags, IsNamespace,
+      GetInterfaces, Parse)
+    - Removed window dependency in mscorlib.js
+    - Debug class now maps directly to console
+    - Moved GetField, HasField, DeleteField, HasMethod, InvokeMethod,
+      CreateInstance, GetScriptType off Type and onto Script while
+      HasProperty, GetProperty, SetProperty, AddHandler, RemoveHandler are gone
+    - Optimize generation of static ctors to use a function scope only when
+      static ctors have a local variable reference.
+      Should help optimize generation of jQuery scripts, by reducing one extra
+      function scope.
+    - Removed Aggregate method from Array, ArrayList and List. Use Reduce instead.
+      Removed the corresponding custom implementation from mscorlib.js.
+    - [git #131] Correctly detect member references within array initializers
+    - [git #161] Add Slice, Splice, Shift, Unshift, Reduce, ReduceRight to
+                 Array, ArrayList and List.
+    - [git #228] Restore ability to generate public resource classes
+                 (Change Custom Tool property of resx file to
+                 ResxPublicScriptGenerator)
+    - [git #230] Add String.IsNullOrWhitespace
+    - [git #234] Knockout API update - added CompareResult status enum
+
+v0.7.5.0
+    - DOM metadata update (readyState property on Document,
+                           plugins on Navigator)
+    - jQuery API update (on/off methods)
+    - Knockout API updates for missing APIs
+    - Addition of support for jQuery validation plugin
+    - jQueryUI added!
+    - [git #130] ReadyState property on Document
+    - [git #132] DOM metadata for plugins
+    - [git #139] jQuery on/off APIs
+    - [git #141] Bing maps metadata missing APIs
+    - [git #145] Knockout additions
+    - [git #152] Knockout additions
+    - [git #155] ReadyState property on Document
+    - [git #156] Changed projects (incl. templates) to target .net framework v2.0
+    - [git #166] Fix generic Deffered API on jQuery
+    - [git #169] Missing jQuery API overload added
+    - [git #170] Fix bing maps metadata bug
+    - [git #173] Fix StringBuilder and appending empty string/isEmpty interaction
+    - [git #178] Issues with string extensions
+    - [git #180] Added workaround: Better error message for namespace-qualified name gotcha
+    - [git #183] Various DOM metadata additions (eg. ClassList)
+    - [git #187] Support for writing 'new Image()'
+    - [git #189] Fixed jQuery.when metadata
+    - [git #201] Strongly typed some Knockout API (KnockoutMapping)
+    - Nuget packages for compiler, and individual import libraries
+    - VSIX-based approach for getting script# and associated templates
+    - Breaking changes:
+      - In a csproj, the TemplateFile property has been changed to ScriptTemplate
+      - When creating a project there is no prompt to setup a DeploymentPath
+        ... but for now, msbuild support continues to exist (via manual edit)
+        ... will potentially be replaced eventually.
+      - No more support for WebAppParitioning. If you were compiling multiple script
+        files out of a single c# project, this feature is gone. You can switch your
+        msbuild scripts to use the ScriptCompilerExecTask, instead of ScriptCompilerTask
+        and invoke the compiler multiple times for each script file, passing in exactly
+        the right set of sources for each script file to be generated.
+      - Removed Script.Windows.dll and gadget project
+
+v0.7.4.0
+    - Fix/update bing maps metadata bug
+    - Fix observable bug where access to an observed property without an observer
+      registration would drop existing observers.
+    - Remove /copyRefs flag from ssc.exe (script references are no longer copied to output folder)
+      Same applies to ScriptCompilerExec task. The normal ScriptCompilerTask continues to provide
+      this capability.
+    - Added Sharpen.dom.js - a minimal set of helper APIs on top of HTML5 DOM APIs.
+    - Some enum related changes:
+      ToString/Enum parsing support removed (it didn't work for internal enums anyway)
+      ToString on named enums (and on strings) skipped as it is redundant
+      Inline enum values in generated script
+      Skip generating internal enum types
+    - [git #25] Importing multi-dimensional arrays
+    - [git #56] Switch statement when used with more then 6 cases will generate a compile error
+    - [git #62] Compile error due to assembly name sort order (with generic types being
+                imported, assembly load order starts to matter)
+    - [git #66] Support Nullable.GetValueOrDefault which is needed for ?? operator on
+                nullables.
+    - [git #67] BREAKING CHANGE: DateTime -> Date. Date is also no longer a value type.
+                (partially fixes #67, and also makes Date more representative of script semantics
+                which are not that of a value type)
+    - [git #84] Raise error for code which calls Type.CreateInstance with the results of a method
+                call/property access directly.
+    - [git #92] Don't generate internal consts since their values have been inlined
+                even in debug builds (for symmetry with release builds)
+                Also, at the same type skip generating types for internal enums marked
+                as Named/NumericValues, since their values have been inlined as well.
+                Also fixes [git #42] indirectly.
+    - [git #93] Error compiling cross-referenced projects in 0.7.3
+                Fix by requiring explicit references, and reporting failure on not doing so
+                instead of silent failure (this is temporary ... there must be a better
+                msbuild way of including transitive closure of assemblies, but even
+                referencing indirect references in the targets file raises an error to
+                include explicit references).
+    - [git #94] Raise error for code which calls Type.CreateInstance with the results of a method
+                call/property access directly.
+    - [git #96] Handle '+' unary operator
+    - [git #97] Unable to generate code for projects that don't reference Script.Web.dll.
+    - [git #103] Fix generation of custom delegates to use "Function" as generated script name
+    - [git #107] ScriptAlias is not respected on types defined in the current assembly
+    - [git #114] Window.ApplicationCache.Status.ToString() generates invalid JavaScript
+
+v0.7.3.0 [8/14/2011]
+    - [git #71] Fix formatting of GMT dates
+    - [git #70] Support for const decimal
+    - [git #69] Fix LocaleFormat typo
+    - [git #76] Compiler crash in 0.7.2 defining decimal type with non-integer value
+    - [git #75] Defining a local variable 'ss' hides the Script# ss global
+    - [git #60] List constructor with params for creating literal array
+    - [git #74] Fix date formatting to make it more in sync with .net
+    - [git #63] Fix internal partial class generation
+    - [git #65] Calling ToString() on a constant breaks minified script
+    - [git #73] Creating Record objects from another library
+    - [git #80] The decimal type is missing the Parse method
+    - [git #84] if(<var> is <type>) not compiled properly when <type> is a delegate.
+    - Enable creating derived jQueryEvent objects
+    - Knockout API updates (ability to create binding handlers for example)
+    - Propagate ScriptNamespace to generic instance class
+    - DOM API metadata updates
+    - Separate out msbuild tasks into ScriptSharp.Build.dll and Visual Studio generators
+      into ScriptSharp.VisualStudio.dll
+
+v0.7.2.0 [5/22/2011]
+    - Revert null equality check to non-falsey check
+    - Switch String.empty references to in generated script to string literal
+    - Fix delegate optimization bug involving Type.InvokeMember with first parameter being null
+    - Remove hack in metadata importer to try import generic types first
+      (instead design imported apis carefully so type don't have instance of generic type
+       as return type of a member)
+    - To fix above bug:
+      - jQueryXmlHttpRequest<TData> replaced with jQueryDataHttpRequest<TData>
+        and jQueryXmlHttpRequest is now non-generic
+      - Added non-generic versions of various jQuery ajax callbacks
+    - Improve jQuery deferred APIs
+    - jQuery 1.6.1 APIs and other missing APIs added
+    - [git #36] Misc jQuery apis added
+    - [git #50] Fix GeoLocation API: WatchCurrentPosition -> WatchPosition
+    - Added AudioElement
+    - Added Tuple, Callback, various component model interfaces
+    - FxCop rules for CSS Selector validation, Script.Literal usage and public fields
+    - [git #45] Apply [PreserveName] semantics in debug builds as well
+    - [git #52] DocumentFragment related API updates
+    - [git #54] DateTime metadata update
+
+v0.7.1.0 [5/2/2011]
+    - [git #19] Add CssFloat to Style
+    - [git #22] Fix issue with importing generic delegates - generic types were getting
+                created before their members were being imported.
+    - [git #20] If/While/For statements can have an no body statement when compiling in release
+                mode, and the only statement in source code is a debug-conditional statement.
+    - [git #27] Optimize generated script for checking equality against null, 0, true/false, empty
+                string by generating a check that works against false-y values
+    - [git #28] Fix jQueryAjaxOptions metadata
+    - [git #29] Add Select() to InputElement
+    - Added Observable<T> and mscorlib infrastructure for observables, and change notification
+    - Added ObservableCollection and ObservableCollection<T> along with mscorlib implementation
+    - Added Script.IsValue (equivalent of !Script.IsNullOrUndefined)
+    - Added Nullable<T> and T? syntax support; .HasValue -> Script.IsValue, .Value is a no-op at runtime
+    - Added ElementQuery, ElementListQuery, and ElementReference helper classes for emitting script
+      expressions when using AddScriptlet
+
+v0.7.0.2
+    - [git #7] Add missing jQueryObject.Html overload
+    - Add Document.ElementFromPoint
+    - DOM events API added
+    - [git #3] Fixed anonymous delegation creation by detecting use of 'this' context for
+      variable declaration
+    - [git #9] String literal optimization
+    - [git #11] Added SCRIPTSHARP to the defines list in the project template
+    - Remove Script.Windows.js and move the functionality into gadget project template.
+    - Add ss.init/ss.ready to mscorlib.js as well, in case page is not using ssloader.js.
+
+v0.7.0.1
+    - [git #4] Fixed typo in mscorlib.js
+    - Fix typo in web.config in nuget package
+    - Fix bug with jQuery.InArray signature
+
+v0.7.0.0 [4/13/2011]
+    - Added basic generic support - ability to consume some generic types such as List<T>, Dictionary<K, V>,
+      Action<T>, Func<T> etc.
+    - Fix bug with NamedValues enum not working with [ScriptName]
+    - New script loader
+    - New asp.net mvc integration
+    - Updates to project templates to match new script loader
+    - Various metadata updates - eg. Canvas, Image, Document etc.
+    - Replace ContextualCallback with Action<T>
+    - Replace CancelEventHandler with EventHandler<T>
+    - Replace Delegate.Null -> Delegate.Empty
+    - ScriptCompilerTask msbuild task removes "DEBUG" define for release build even when building
+      in Debug mode from an msbuild perspective.
+    - Some namespace changes (eg. System.Globalization)
+    - Nuget package
+    - Replace XmlDocumentParser class with parseXml method
diff --git a/License.txt b/License.txt
new file mode 100644
index 000000000..5f0dac0af
--- /dev/null
+++ b/License.txt
@@ -0,0 +1,180 @@
+   Script# Project
+   Copyright 2012, Script# Project
+   Copyright 2012, Nikhil Kothari
+
+   Apache License
+   Version 2.0, January 2004
+   http://www.apache.org/licenses/
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+ 
+   1. Definitions.
+ 
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+ 
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+ 
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+ 
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+ 
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+ 
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+ 
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work.
+ 
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+ 
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+ 
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+ 
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+ 
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+ 
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+ 
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+ 
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+ 
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+ 
+      (d) If the Work includes a "License.txt" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such License.txt file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a License.txt text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the License.txt file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the License.txt text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+ 
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+ 
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+ 
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+ 
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+ 
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+ 
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+ 
+   END OF TERMS AND CONDITIONS
diff --git a/Notice.txt b/Notice.txt
new file mode 100644
index 000000000..76e1ddbbc
--- /dev/null
+++ b/Notice.txt
@@ -0,0 +1,13 @@
+Script# Project
+Copyright 2012, Script# Project
+Copyright 2012, Nikhil Kothari
+
+Script# is licensed under the Apache License v2.0 (see License.txt).
+Script# also includes works distributed under the licenses listed below.
+
+Mono Cecil
+--------------
+Website:      https://github.com/jbevain/cecil
+Copyright:    Copyright (c) 2008 - 2011 Jb Evain
+License:      The MIT License
+              http://opensource.org/licenses/mit-license.php
diff --git a/README b/README
deleted file mode 100644
index 11f7fcc75..000000000
--- a/README
+++ /dev/null
@@ -1,4 +0,0 @@
-Script# Project
-
-Coming Soon!
-More information at http://projects.nikhilk.net/ScriptSharp
diff --git a/Readme.md b/Readme.md
new file mode 100644
index 000000000..3140c065d
--- /dev/null
+++ b/Readme.md
@@ -0,0 +1,37 @@
+# Script# Project #
+
+Script# is a development tool that generates JavaScript by compiling C# source code. It is especially interesting for scripting-in-the-large scenarios that is commonplace in the current generation of HTML5 and script-based Web applications.
+
+The driving principle behind Script# is that JavaScript is the "assembly language of the Web" ... the idea isn't to dislike JavaScript, but rather appreciate it for its flexibility and ubiquity, while bringing the productivity and familiarity of C# when building large scale (large codebase, large team or project over a longer period) application where stronger tools, more maintainable codebases are of utmost importance. You might have heard of this described as "application scale".
+
+Specifically, Script# lets you leverage the experience of C# (intellisense, build-time error checking, natural language syntax for OOP constructs), the power Visual Studio IDE and standard .NET tools ecosystem (such as msbuild, refactoring, unit testing, static analysis, code visualization, fxcop). Script# brings all this to you without abstracting the runtime environment - you're still authoring plain-old JavaScript and incorporating the best practices and idioms of JavaScript, just with a different set of tools.
+
+You can even use Script# to work against other existing frameworks and APIs such as jQuery, jQuery plugins and Knockout, and can be extended to work against other existing script.
+
+Script# requires .NET 4.0 and Visual Studio 2012. You can also use one of the free Express tools instead such as [Visual Studio 2012 Express for Web](http://www.microsoft.com/visualstudio/eng/downloads#d-express-web) or [Visual Studio 2012 Express for Windows Desktop](http://www.microsoft.com/visualstudio/eng/downloads#d-express-windows-desktop).
+
+## More Information ##
+The following set of links are relevant if you're using Script# and want to learn more or ask questions, or stay up-to-date.
+
+* [Script# Project page](http://scriptsharp.com)
+* [Latest released build](http://bit.ly/ssrelease) (packaged as a Visual Studio extension containing Script# project and item templates)
+* [Issues, suggestions](https://github.com/nikhilk/scriptsharp/issues) here on GitHub. Also, check this out to participate in future design questions, calls for feedback, etc.
+* For general discussion and Q&A, use [StackOverflow](http://stackoverflow.com/questions/tagged/scriptsharp)
+* Follow [@scriptsharp](http://twitter.com/scriptsharp) and [@nikhilk](http://twitter.com/nikhilk) on twitter to keep up with updates and announcements.
+
+The [Script# Wiki](https://github.com/nikhilk/scriptsharp/wiki/Wiki) contains the following bits of information if you're checking out the repository, are interested in creating a private build, or even better, looking to contribute to the project.
+
+* [Repository Contents](https://github.com/nikhilk/scriptsharp/wiki/Repository)
+* [Status](https://github.com/nikhilk/scriptsharp/wiki/Status), including roadmap and some thoughts about areas of contribution
+* [Building and testing](https://github.com/nikhilk/scriptsharp/wiki/Building-and-Testing) the sources, and information on using private as well as incremental pre-release builds
+* [Coding guidelines](https://github.com/nikhilk/scriptsharp/wiki/Coding-Guidelines)
+
+### Credits ###
+
+Script# builds on the excellent Mono.Cecil project. Thanks to Jb Evain.
+
+Thanks to [all the contributors](https://github.com/nikhilk/scriptsharp/graphs/contributors) who have contributed to Script# over time. Your contributions are welcome, and appreciated. Let me know how you can help - whether its in the form of a feature, a sample, or some evangelizing/spreading the word, or via a suggestion. See the [status page](https://github.com/nikhilk/scriptsharp/wiki/Status) in the wiki for roadmap, plans, and some thoughts about possible contributions.
+
+### License ###
+Copyright (c) 2012, Script# Project.
+Script# is licensed under the Apache 2.0 License.
diff --git a/bin/ref/ScriptSharp.dll b/bin/ref/ScriptSharp.dll
deleted file mode 100644
index f915e76ae..000000000
Binary files a/bin/ref/ScriptSharp.dll and /dev/null differ
diff --git a/bin/ref/mscorlib.dll b/bin/ref/mscorlib.dll
deleted file mode 100644
index d3d8a2b66..000000000
Binary files a/bin/ref/mscorlib.dll and /dev/null differ
diff --git a/bin/ref/ssc.exe b/bin/ref/ssc.exe
deleted file mode 100644
index 6b957f367..000000000
Binary files a/bin/ref/ssc.exe and /dev/null differ
diff --git a/bin/ref/sspp.exe b/bin/ref/sspp.exe
deleted file mode 100644
index 388e36e70..000000000
Binary files a/bin/ref/sspp.exe and /dev/null differ
diff --git a/samples/AroundMe/AroundMe.sln b/samples/AroundMe/AroundMe.sln
new file mode 100644
index 000000000..c69f9e195
--- /dev/null
+++ b/samples/AroundMe/AroundMe.sln
@@ -0,0 +1,43 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AroundMe", "AroundMe\AroundMe.csproj", "{C1AFF814-2C3A-4D04-88A4-5CF10D07AA56}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Twitter", "Twitter\Twitter.csproj", "{476312F9-5403-4C3A-848A-0F31213FC72E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapDemo", "MapDemo\MapDemo.csproj", "{2176DBB5-D8FD-493C-B896-59E7283E7127}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AroundMeTests", "AroundMeTests\AroundMeTests.csproj", "{E01AE039-4B10-4A3B-AB86-EBFC1E2F6B17}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F9ED6BAF-639F-4F4B-8E04-C6AE7EAE860A}"
+	ProjectSection(SolutionItems) = preProject
+		AroundMeTests.testsettings = AroundMeTests.testsettings
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2176DBB5-D8FD-493C-B896-59E7283E7127}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2176DBB5-D8FD-493C-B896-59E7283E7127}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2176DBB5-D8FD-493C-B896-59E7283E7127}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2176DBB5-D8FD-493C-B896-59E7283E7127}.Release|Any CPU.Build.0 = Release|Any CPU
+		{476312F9-5403-4C3A-848A-0F31213FC72E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{476312F9-5403-4C3A-848A-0F31213FC72E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{476312F9-5403-4C3A-848A-0F31213FC72E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{476312F9-5403-4C3A-848A-0F31213FC72E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C1AFF814-2C3A-4D04-88A4-5CF10D07AA56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C1AFF814-2C3A-4D04-88A4-5CF10D07AA56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C1AFF814-2C3A-4D04-88A4-5CF10D07AA56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C1AFF814-2C3A-4D04-88A4-5CF10D07AA56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E01AE039-4B10-4A3B-AB86-EBFC1E2F6B17}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E01AE039-4B10-4A3B-AB86-EBFC1E2F6B17}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E01AE039-4B10-4A3B-AB86-EBFC1E2F6B17}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E01AE039-4B10-4A3B-AB86-EBFC1E2F6B17}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/samples/AroundMe/AroundMe/AroundMe.csproj b/samples/AroundMe/AroundMe/AroundMe.csproj
new file mode 100644
index 000000000..ef7bf43cb
--- /dev/null
+++ b/samples/AroundMe/AroundMe/AroundMe.csproj
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{C1AFF814-2C3A-4D04-88A4-5CF10D07AA56}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>AroundMe</RootNamespace>
+    <AssemblyName>AroundMe</AssemblyName>
+    <ScriptTemplate>Properties\Script.template</ScriptTemplate>
+    <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateScript>True</GenerateScript>
+    <GenerateResources>True</GenerateResources>
+    <RestoreNugetPackages>true</RestoreNugetPackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Debug\AroundMe.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Release\AroundMe.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Page.cs" />
+    <Compile Include="PageModel.cs" />
+    <Compile Include="PhotoView.cs" />
+    <Compile Include="Services\Base58.cs" />
+    <Compile Include="Services\FlickrService.cs" />
+    <Compile Include="Services\HtmlStorageService.cs" />
+    <Compile Include="Services\IFlickrService.cs" />
+    <Compile Include="Services\IStorageService.cs" />
+    <Compile Include="Tests\MockFlickrService.cs" />
+    <Compile Include="Tests\PageModelTests.cs" />
+    <None Include="packages.config" />
+    <None Include="Properties\FxCop.ruleset" />
+    <None Include="Properties\Script.template" />
+    <Compile Include="Core\Model.cs" />
+    <Compile Include="Core\PropertyChangedEventArgs.cs" />
+    <Compile Include="Core\Utility.cs" />
+    <Compile Include="DataModel\Photo.cs" />
+    <Compile Include="Graphs\Graph.cs" />
+    <Compile Include="Graphs\GraphEdge.cs" />
+    <Compile Include="Graphs\GraphLayout.cs" />
+    <Compile Include="Graphs\GraphNode.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Script.Microsoft.BingMaps">
+      <HintPath>..\packages\ScriptSharp.Lib.BingMaps.0.7.5.0\lib\Script.Microsoft.BingMaps.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.Web">
+      <HintPath>..\packages\ScriptSharp.Lib.HTML.0.7.5.0\lib\Script.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Twitter\Twitter.csproj">
+      <Project>{476312f9-5403-4c3a-848a-0f31213fc72e}</Project>
+      <Name>Twitter</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <Content Include="Content\AroundMe.htm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\CloseButton.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Dot.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Flickr.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Heart.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Location.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\PlaceHolder.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\ProgressBar.gif">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Pushpin.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Reset.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Search.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Site.css">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Twitter.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets" Condition="Exists('..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets')" />
+  <Import Project="..\packages\nuget.targets" />
+</Project>
\ No newline at end of file
diff --git a/samples/AroundMe/AroundMe/Content/AroundMe.htm b/samples/AroundMe/AroundMe/Content/AroundMe.htm
new file mode 100644
index 000000000..d5846da06
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Content/AroundMe.htm
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head>
+  <title>Photos Around Me</title>
+  <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Schoolbell:regular" />
+  <link rel="stylesheet" type="text/css" href="Site.css" />
+</head>
+<body class="map" data-app="true"
+  data-flickr-key="be9b6f66bd7a1c0c0f1465a1b7e8a764"
+  data-bingmaps-key="AvROonkHlY0PHW8zAWDFW5JX8tMeSxzUlkR23_uGzUpeGzrJxf-8tSxAvQmO_5PX"
+  data-tile-url="http://{0}.tile.cloudmade.com/24f82a695d3f4b3ab1ea69d9eb63fdb0/43793/256/{1}/{2}/{3}.png">
+  <div id="mapContainer"></div>
+  <div id="inputContainer">
+    <div id="titleLabel">Photos Around Me</div>
+    <form id="searchForm" action="" onsubmit="return false;">
+      <input type="text" id="searchBox" placeholder="search keywords" />
+      <button type="submit" id="searchButton" title="Search">Search</button>
+      <button type="button" id="favButton" title="Show Favorites">Favorites</button>
+      <button type="button" id="locateMeButton" title="Locate Me">Locate Me</button>
+      <div id="searchProgress"></div>
+    </form>
+  </div>
+  <div id="photoOverlay">
+    <div id="photoContainer">
+      <span id="photo"></span>
+      <button id="photoCloseButton" type="button" class="photoAction">close</button>
+      <br />
+      <span id="photoTitle"></span>
+      <button id="photoSourceButton" type="button" class="photoAction" title="Flickr Page">flickr</button>
+      <button id="photoSaveButton" type="button" class="photoAction" title="Save to Favorites">save</button>
+      <button id="photoShareButton" type="button" class="photoAction" title="Share on Twitter">share</button>
+      <button id="photoAroundButton" type="button" class="photoAction" title="More Around this Photo">around</button>
+      <div id="photoTweet"></div>
+    </div>
+  </div>
+  <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0"></script>
+  <script type="text/javascript" src="http://platform.twitter.com/anywhere.js?id=BDvnYA8jh6osbRb83Ybw&v=1"></script>
+  <script type="text/javascript" src="../mscorlib.debug.js"></script>
+  <script type="text/javascript" src="../AroundMe.debug.js"></script>
+</body>
+</html>
diff --git a/samples/AroundMe/AroundMe/Content/CloseButton.png b/samples/AroundMe/AroundMe/Content/CloseButton.png
new file mode 100644
index 000000000..2589fabdd
Binary files /dev/null and b/samples/AroundMe/AroundMe/Content/CloseButton.png differ
diff --git a/samples/AroundMe/AroundMe/Content/Dot.png b/samples/AroundMe/AroundMe/Content/Dot.png
new file mode 100644
index 000000000..ae533882d
Binary files /dev/null and b/samples/AroundMe/AroundMe/Content/Dot.png differ
diff --git a/samples/AroundMe/AroundMe/Content/Flickr.png b/samples/AroundMe/AroundMe/Content/Flickr.png
new file mode 100644
index 000000000..1d0de586b
Binary files /dev/null and b/samples/AroundMe/AroundMe/Content/Flickr.png differ
diff --git a/samples/AroundMe/AroundMe/Content/Heart.png b/samples/AroundMe/AroundMe/Content/Heart.png
new file mode 100644
index 000000000..c8172ae17
Binary files /dev/null and b/samples/AroundMe/AroundMe/Content/Heart.png differ
diff --git a/samples/AroundMe/AroundMe/Content/Location.png b/samples/AroundMe/AroundMe/Content/Location.png
new file mode 100644
index 000000000..0c473d906
Binary files /dev/null and b/samples/AroundMe/AroundMe/Content/Location.png differ
diff --git a/samples/AroundMe/AroundMe/Content/PlaceHolder.png b/samples/AroundMe/AroundMe/Content/PlaceHolder.png
new file mode 100644
index 000000000..c985b8d84
Binary files /dev/null and b/samples/AroundMe/AroundMe/Content/PlaceHolder.png differ
diff --git a/samples/AroundMe/AroundMe/Content/ProgressBar.gif b/samples/AroundMe/AroundMe/Content/ProgressBar.gif
new file mode 100644
index 000000000..a3a539286
Binary files /dev/null and b/samples/AroundMe/AroundMe/Content/ProgressBar.gif differ
diff --git a/samples/AroundMe/AroundMe/Content/Pushpin.png b/samples/AroundMe/AroundMe/Content/Pushpin.png
new file mode 100644
index 000000000..e47fbe671
Binary files /dev/null and b/samples/AroundMe/AroundMe/Content/Pushpin.png differ
diff --git a/samples/AroundMe/AroundMe/Content/Reset.png b/samples/AroundMe/AroundMe/Content/Reset.png
new file mode 100644
index 000000000..aa774d270
Binary files /dev/null and b/samples/AroundMe/AroundMe/Content/Reset.png differ
diff --git a/samples/AroundMe/AroundMe/Content/Search.png b/samples/AroundMe/AroundMe/Content/Search.png
new file mode 100644
index 000000000..3ba13a452
Binary files /dev/null and b/samples/AroundMe/AroundMe/Content/Search.png differ
diff --git a/samples/AroundMe/AroundMe/Content/Site.css b/samples/AroundMe/AroundMe/Content/Site.css
new file mode 100644
index 000000000..f19ffd3b9
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Content/Site.css
@@ -0,0 +1,184 @@
+html, body {
+  padding: 0px; margin: 0px;
+  width: 100%; height: 100%;
+}
+#mapContainer {
+  width: 100%; height: 100%;
+}
+#inputContainer {
+  background-color: rgba(0,0,0,.85);
+  color: #fff;
+  height: 90px;
+  position: fixed;
+  top: 20px;
+  left: 20px;
+  width: 300px;
+  padding: 10px;
+  box-shadow: 0px 0px 8px 4px rgba(0,0,0,.4);
+  border-radius: 10px;
+}
+#titleLabel {
+  font-family: Schoolbell, serif;
+  font-weight: bold;
+  font-size: 30px;
+  margin: 0px;
+}
+#searchForm {
+  background-color: white;
+  border-radius: 2px;
+  position: relative;
+  height: 30px;
+  width: 300px;
+}
+#favButton {
+  width: 24px;
+  height: 24px;
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-image: url(Heart.png);
+  background-color: rgba(0,0,0,0);
+  position: absolute;
+  right: 30px;
+  top: -32px;
+  font-size: 0px;
+  border: none;
+  cursor: default;
+}
+#locateMeButton {
+  width: 24px;
+  height: 24px;
+  background-image: url(Location.png);
+  background-color: rgba(0,0,0,0);
+  background-size: cover;
+  position: absolute;
+  right: 0px;
+  top: -32px;
+  font-size: 0px;
+  border: none;
+  cursor: default;
+}
+#searchBox {
+  font-family: Georgia;
+  font-size: 18px;
+  margin-right: 24px;
+  border: none;
+  width: 266px;
+  left: 4px;
+  position: absolute;
+  top: 3px;
+  outline: none;
+}
+#searchButton {
+  position: absolute;
+  right: 4px;
+  top: 4px;
+  width: 22px;
+  height: 22px;
+  background-color: transparent;
+  background-image: url(Search.png);
+  background-repeat: no-repeat;
+  background-size: cover;
+  border: none;
+  font-size: 0px;
+  cursor: default;
+}
+#searchButton.reset {
+  background-image: url(Reset.png);
+}
+#searchProgress {
+  position: absolute;
+  left: -8px;
+  top: 32px;
+  width: 316px;
+  height: 19px;
+  background-image: url(ProgressBar.gif);
+  background-size: 316px 19px;
+  display: none;
+}
+#searchProgress.active {
+  display: block;
+  opacity: 0.5;
+}
+#photoOverlay {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  left: 0px;
+  top: 0px;
+  display: none;
+  background-color: rgba(0,0,0,.85);
+}
+#photoContainer {
+  box-shadow: 0px 0px 6px 6px rgba(0,0,0,.5);
+  background-color: White;
+  display: table;
+  padding: 8px;
+  width: auto;
+  margin-left: auto;
+  margin-right: auto;
+  position: relative;
+}
+#photo {
+}
+#photoTitle {
+  font-family: Georgia;
+  font-size: 18px;
+  text-overflow: ellipsis;
+  display: block;
+  margin-bottom: 8px;
+}
+button.photoAction {
+  width: 32px;
+  height: 32px;
+  font-size: 0px;
+  background-color: transparent;
+  background-size: cover;
+  background-repeat: no-repeat;
+  border: none;
+}
+#photoSaveButton {
+  background-image: url(Heart.png);
+}
+#photoAroundButton {
+  background-image: url(Location.png);
+}
+#photoShareButton {
+  background-image: url(Twitter.png);
+}
+#photoSourceButton {
+  background-image: url(Flickr.png);
+}
+#photoCloseButton {
+  width: 32px;
+  height: 32px;
+  background-image: url(CloseButton.png);
+  background-color: rgba(255,255,255,0);
+  position: absolute;
+  right: -14px;
+  top: -14px;
+}
+div.locationPushpin, div.currentPushpin {
+  font-size: 0pt;
+}
+div.photoInfobox {
+  font-size: 0pt;
+  width: 50px;
+  height: 50px;
+  background-size: cover;
+  background-repeat: no-repeat;
+  background-color: White;
+  cursor: default;
+  -webkit-box-shadow: 0px 0px 10px black;
+}
+body.map div.photoInfobox, body.map #mapContainer svg {
+  opacity: 0.15;
+}
+body.photos #mapContainer img {
+  opacity: 0.5;
+}
+body.photos #mapContainer div.currentPushpin img, body.photos #mapContainer div.locationPushpin img {
+  opacity: 1;
+}
+#mapContainer svg, div.photoInfobox, #mapContainer img {
+  -webkit-transition: opacity .25s ease-in-out;
+}
diff --git a/samples/AroundMe/AroundMe/Content/Twitter.png b/samples/AroundMe/AroundMe/Content/Twitter.png
new file mode 100644
index 000000000..96232f0a1
Binary files /dev/null and b/samples/AroundMe/AroundMe/Content/Twitter.png differ
diff --git a/samples/AroundMe/AroundMe/Core/Model.cs b/samples/AroundMe/AroundMe/Core/Model.cs
new file mode 100644
index 000000000..346caeeed
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Core/Model.cs
@@ -0,0 +1,19 @@
+// Model.cs
+//
+
+using System;
+using System.Html;
+
+namespace AroundMe.Core {
+
+    internal abstract class Model {
+
+        public event EventHandler<PropertyChangedEventArgs> PropertyChanged;
+
+        protected void RaisePropertyChanged(string propertyName) {
+            if (PropertyChanged != null) {
+                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/Core/PropertyChangedEventArgs.cs b/samples/AroundMe/AroundMe/Core/PropertyChangedEventArgs.cs
new file mode 100644
index 000000000..0a708bd64
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Core/PropertyChangedEventArgs.cs
@@ -0,0 +1,23 @@
+// Model.cs
+//
+
+using System;
+using System.Html;
+
+namespace AroundMe.Core {
+
+    internal sealed class PropertyChangedEventArgs : EventArgs {
+
+        private string _propertyName;
+
+        public PropertyChangedEventArgs(string propertyName) {
+            _propertyName = propertyName;
+        }
+
+        public string PropertyName {
+            get {
+                return _propertyName;
+            }
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/Core/Utility.cs b/samples/AroundMe/AroundMe/Core/Utility.cs
new file mode 100644
index 000000000..cbadcd571
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Core/Utility.cs
@@ -0,0 +1,30 @@
+// Utility.cs
+//
+
+using System;
+using System.Html;
+
+namespace AroundMe.Core {
+
+    internal static class Utility {
+
+        public static Element GetElement(string id) {
+            return Document.GetElementById(id);
+        }
+
+        public static void SubscribeBlur(string id, ElementEventListener listener) {
+            Element e = Document.GetElementById(id);
+            e.AddEventListener("blur", listener, false);
+        }
+
+        public static void SubscribeClick(string id, ElementEventListener listener) {
+            Element e = Document.GetElementById(id);
+            e.AddEventListener("click", listener, false);
+        }
+
+        public static void SubscribeKey(string id, ElementEventListener listener) {
+            Element e = Document.GetElementById(id);
+            e.AddEventListener("keyup", listener, false);
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/DataModel/Photo.cs b/samples/AroundMe/AroundMe/DataModel/Photo.cs
new file mode 100644
index 000000000..b9cbcdecd
--- /dev/null
+++ b/samples/AroundMe/AroundMe/DataModel/Photo.cs
@@ -0,0 +1,76 @@
+// Photo.cs
+//
+
+using System;
+
+namespace AroundMe.DataModel {
+
+    /// <summary>
+    /// Represents a geo-tagged photo along with various bits of metadata.
+    /// </summary>
+    internal sealed class Photo : Record {
+
+        /// <summary>
+        /// The ID of the photo.
+        /// </summary>
+        public string id;
+
+        /// <summary>
+        /// The text description of the photo.
+        /// </summary>
+        public string title;
+
+        /// <summary>
+        /// The URL of the page associated with the photo.
+        /// </summary>
+        public string url;
+
+        /// <summary>
+        /// The URL of the thumbnail of the photo.
+        /// </summary>
+        public string thumbnailUrl;
+
+        /// <summary>
+        /// The URL of the image itself.
+        /// </summary>
+        public string imageUrl;
+
+        /// <summary>
+        /// The width of the photo.
+        /// </summary>
+        public int width;
+
+        /// <summary>
+        /// The height of the photo.
+        /// </summary>
+        public int height;
+
+        /// <summary>
+        /// The latitude part of the geo-tag information.
+        /// </summary>
+        public double latitude;
+
+        /// <summary>
+        /// The longitude part of the geo-tag information.
+        /// </summary>
+        public double longitude;
+
+        /// <summary>
+        /// The set of tags associated with the photo.
+        /// </summary>
+        public string tags;
+
+        public Photo(string id, string title, string tags, string url, string imageUrl, int width, int height, string thumbnailUrl, double latitude, double longitude) {
+            this.id = id;
+            this.title = title;
+            this.tags = tags;
+            this.url = url;
+            this.imageUrl = imageUrl;
+            this.width = width;
+            this.height = height;
+            this.thumbnailUrl = thumbnailUrl;
+            this.latitude = latitude;
+            this.longitude = longitude;
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/Graphs/Graph.cs b/samples/AroundMe/AroundMe/Graphs/Graph.cs
new file mode 100644
index 000000000..5043c4e36
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Graphs/Graph.cs
@@ -0,0 +1,152 @@
+// Graph.cs
+//
+
+using System;
+using System.Collections.Generic;
+
+namespace AroundMe.Graphs {
+
+    internal delegate void GraphNodePairVisitor(GraphNode node1, GraphNode node2);
+
+    internal delegate void GraphNodeVisitor(GraphNode node);
+
+    internal delegate void GraphEdgeVisitor(GraphEdge edge);
+
+    internal class Graph {
+
+        private List<GraphNode> _nodes;
+        private List<GraphEdge> _edges;
+
+        private GraphLayout _layout;
+
+        private bool _updating;
+        private bool _updated;
+
+        public Graph() {
+            _nodes = new List<GraphNode>();
+            _edges = new List<GraphEdge>();
+            _layout = new GraphLayout(this);
+        }
+
+        public GraphLayout Layout {
+            get {
+                return _layout;
+            }
+        }
+
+        public List<GraphNode> Nodes {
+            get {
+                return _nodes;
+            }
+        }
+
+        public List<GraphEdge> Edges {
+            get {
+                return _edges;
+            }
+        }
+
+        public event EventHandler Changed;
+
+        public void AddNode(GraphNode node) {
+            _nodes.Add(node);
+            if (_updating == false) {
+                RaiseChangedEvent();
+            }
+            else {
+                _updated = true;
+            }
+        }
+
+        public void AddEdge(GraphEdge edge) {
+            _edges.Add(edge);
+            edge.FromNode.AddEdge(edge);
+            edge.ToNode.AddEdge(edge);
+
+            if (_updating == false) {
+                RaiseChangedEvent();
+            }
+            else {
+                _updated = true;
+            }
+        }
+
+        public void BeginUpdate() {
+            _updating = true;
+        }
+
+        public void EndUpdate() {
+            _updating = false;
+            if (_updated) {
+                _updated = false;
+                RaiseChangedEvent();
+            }
+        }
+
+        private void RaiseChangedEvent() {
+            if (Changed != null) {
+                Changed(this, EventArgs.Empty);
+            }
+        }
+
+        public void RemoveNode(GraphNode node) {
+            foreach (GraphEdge edge in node.Edges) {
+                RemoveEdge(edge);
+            }
+
+            _nodes.Remove(node);
+            if (_updating == false) {
+                RaiseChangedEvent();
+            }
+            else {
+                _updated = true;
+            }
+        }
+
+        public void RemoveEdge(GraphEdge edge) {
+            edge.FromNode.RemoveEdge(edge);
+            edge.ToNode.RemoveEdge(edge);
+
+            _edges.Remove(edge);
+            if (_updating == false) {
+                RaiseChangedEvent();
+            }
+            else {
+                _updated = true;
+            }
+        }
+
+        public void Reset() {
+            _nodes.Clear();
+            _edges.Clear();
+            if (_updating == false) {
+                RaiseChangedEvent();
+            }
+            else {
+                _updated = true;
+            }
+        }
+
+        public void VisitEdges(GraphEdgeVisitor visitor) {
+            foreach (GraphEdge edge in _edges) {
+                visitor(edge);
+            }
+        }
+
+        public void VisitNodes(GraphNodeVisitor visitor) {
+            foreach (GraphNode node in _nodes) {
+                visitor(node);
+            }
+        }
+
+        public void VisitNodePairs(GraphNodePairVisitor visitor) {
+            foreach (GraphNode n1 in _nodes) {
+                foreach (GraphNode n2 in _nodes) {
+                    if (n1 != n2) {
+                        visitor(n1, n2);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/Graphs/GraphEdge.cs b/samples/AroundMe/AroundMe/Graphs/GraphEdge.cs
new file mode 100644
index 000000000..84ea03662
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Graphs/GraphEdge.cs
@@ -0,0 +1,38 @@
+// GraphEdge.cs
+//
+
+using System;
+
+namespace AroundMe.Graphs {
+
+    internal class GraphEdge {
+
+        private GraphNode _fromNode;
+        private GraphNode _toNode;
+        private int _length;
+
+        public GraphEdge(GraphNode fromNode, GraphNode toNode, int length) {
+            _fromNode = fromNode;
+            _toNode = toNode;
+            _length = length;
+        }
+
+        public GraphNode FromNode {
+            get {
+                return _fromNode;
+            }
+        }
+
+        public int Length {
+            get {
+                return _length;
+            }
+        }
+
+        public GraphNode ToNode {
+            get {
+                return _toNode;
+            }
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/Graphs/GraphLayout.cs b/samples/AroundMe/AroundMe/Graphs/GraphLayout.cs
new file mode 100644
index 000000000..58f49fa3b
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Graphs/GraphLayout.cs
@@ -0,0 +1,247 @@
+// GraphLayout.cs
+//
+
+using System;
+using System.Diagnostics;
+
+namespace AroundMe.Graphs {
+
+    internal sealed class GraphLayout {
+
+        internal const double RepulsionFactor = 0.75f;
+        internal const double DefaultRepulsion = 100.0f;
+        private const double MotionLimit = 0.01f;
+
+        private Graph _graph;
+
+        private double _damper;
+        private bool _damping;
+        private double _rigidity;
+        private double _newRigidity;
+        private double _maxMotion;
+        private double _lastMaxMotion;
+        private double _intermediateMaxMotion;
+
+        // lastMaxMotion / maxMotion-1
+        private double _motionRatio;
+
+        public GraphLayout(Graph graph) {
+            _graph = graph;
+
+            // A low damper value causes the graph to move slowly; as
+            // layout proceeds, the damper value decreases.
+            _damper = 1.0f;
+            _damping = true;
+
+            // Rigidity has the same effect as the damper, except that it's a constant.
+            // A low rigidity value causes things to go slowly.
+            // A value that's too high will cause oscillation.
+            _rigidity = 0.25f;
+            _newRigidity = 0.25f;
+
+            // Allow's tracking the fastest moving node to see if the graph is stabilizing
+            _maxMotion = 0;
+            _lastMaxMotion = 0;
+            _motionRatio = 0;
+            _intermediateMaxMotion = 0;
+        }
+
+        private void LayoutNode(GraphNode node) {
+            if (node.moveable) {
+                double dx = node.dx;
+                double dy = node.dy;
+
+                // The damper slows things down.  It cuts down jiggling at the last moment, and optimizes
+                // layout. As an experiment, get rid of the damper in these lines, and make a
+                // long straight line of nodes. It wiggles too much and doesn't straighten out.
+                dx *= _damper;
+                dy *= _damper;
+
+                // Slow down, but dont stop. Nodes in motion store momentum. This helps when the force
+                // on a node is very low, but you still want to get optimal layout.
+                node.dx = dx / 2;
+                node.dy = dy / 2;
+
+                // How far did the node actually move?
+                double distanceMoved = Math.Sqrt(dx * dx + dy * dy);
+
+                // Don't move faster then 30 units at a time.
+                // Stops severed nodes from flying away?
+
+                node.x = node.x + Math.Max(-30, Math.Min(30, dx));
+                node.y = node.y + Math.Max(-30, Math.Min(30, dy));
+
+                _intermediateMaxMotion = Math.Max(distanceMoved, _intermediateMaxMotion);
+            }
+        }
+
+        private void LayoutNodes() {
+            _lastMaxMotion = _maxMotion;
+            _intermediateMaxMotion = 0f;
+            _graph.VisitNodes(new GraphNodeVisitor(LayoutNode));
+            _maxMotion = _intermediateMaxMotion;
+
+            if (_maxMotion > 0) {
+                // Subtract 1 to make a positive value that implies that
+                // things are moving faster
+                _motionRatio = _lastMaxMotion / _maxMotion - 1;
+            }
+            else {
+                _motionRatio = 0;
+            }
+
+            if (_damping) {
+                if (_motionRatio <= 0.001) {
+                    // Only damp when the graph starts to move faster
+                    // When there is noise, you damp roughly half the time. (Which is a lot)
+                    // If things are slowing down, then you can let them do so on their own,
+                    // without damping.
+
+                    if ((_maxMotion < 0.2 || (_maxMotion > 1 && _damper < 0.9)) &&
+                        (_damper > 0.01)) {
+                        // If maxMotion < 0.2, damp away
+                        // If by the time the damper has gone down to 0.9, and
+                        // maxMotion is still > 1, then damp away
+                        // We never want the damper to be negative though.
+
+                        _damper -= 0.01f;
+                    }
+                    else if (_maxMotion < 0.4 && _damper > 0.003) {
+                        // If we've slowed down significanly, damp more aggresively
+                        _damper -= 0.003f;
+                    }
+                    else if (_damper > 0.0001) {
+                        // If max motion is pretty high, and we just started damping,
+                        // then only damp slightly
+                        _damper -= 0.0001f;
+                    }
+                }
+            }
+            if (_maxMotion < MotionLimit && _damping) {
+                _damper = 0;
+            }
+        }
+
+        public bool PerformLayout() {
+            if (!(_damper < 0.1 && _damping && _maxMotion < MotionLimit)) {
+                for (int i = 0; i < 5; i++) {
+                    RelaxEdges();
+                    RemoveOverlaps();
+                    LayoutNodes();
+                }
+
+                if (_rigidity != _newRigidity) {
+                    _rigidity = _newRigidity;
+                }
+
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+
+        public void PauseLayout() {
+            _damping = false;
+        }
+
+        private void RelaxEdge(GraphEdge edge) {
+            // Pull nodes closes together by 'relaxing' each edge
+
+            double vx = edge.ToNode.x - edge.FromNode.x;
+            double vy = edge.ToNode.y - edge.FromNode.y;
+            double distance = Math.Sqrt(vx * vx + vy * vy);
+
+            // Rigidity makes edges tighter
+            double dx = vx * _rigidity;
+            double dy = vy * _rigidity;
+
+            int div = edge.Length * 100;
+            dx = dx / div;
+            dy = dy / div;
+
+            // Edges pull directly in proportion to the distance between the nodes. This is good,
+            // because we want the edges to be stretchy.  The edges are ideal rubberbands.  They
+            // They don't become springs when they are too short. That only causes the graph to
+            // oscillate.
+
+            edge.ToNode.dx = edge.ToNode.dx - dx * distance;
+            edge.ToNode.dy = edge.ToNode.dy - dy * distance;
+            edge.FromNode.dx = edge.FromNode.dx + dx * distance;
+            edge.FromNode.dy = edge.FromNode.dy + dy * distance;
+        }
+
+        private void RelaxEdges() {
+            _graph.VisitEdges(new GraphEdgeVisitor(RelaxEdge));
+        }
+
+        private void RemoveOverlap(GraphNode node1, GraphNode node2) {
+            double dx = 0;
+            double dy = 0;
+            double vx = node1.x - node2.x;
+            double vy = node1.y - node2.y;
+            double distance = vx * vx + vy * vy;
+
+            // TODO: 36 should be a property instead of hardcoded
+            // This is the radius of a node.
+
+            if (distance < 36 * 36 * 2) {
+                // If two nodes are right on top of each other, separate them
+                // apart randomly
+                dx = Math.Random();
+                dy = Math.Random();
+            }
+            else if (distance < 360000) {
+                // 600 * 600, because we don't want deleted nodes to fly too far away
+
+                // If it was sqrt(len) then a single node surrounded by many others will
+                // always look like a circle.  This might look good at first, but I think
+                // it makes large graphs look ugly + it contributes to oscillation.  A
+                // linear function does not fall off fast enough, so you get rough edges
+                // in the 'force field'
+
+                dx = vx / distance;
+                dy = vy / distance;
+            }
+
+            double totalRepulsion = DefaultRepulsion * DefaultRepulsion / 100;
+            double factor = totalRepulsion * _rigidity;
+
+            node1.dx += dx * factor;
+            node1.dy += dy * factor;
+            node2.dx -= dx * factor;
+            node2.dy -= dy * factor;
+        }
+
+        private void RemoveOverlaps() {
+            _graph.VisitNodePairs(new GraphNodePairVisitor(RemoveOverlap));
+        }
+
+        public void ResetLayout() {
+            _damping = true;
+            _damper = 1.0f;
+        }
+
+        public void ResumeLayout() {
+            _damping = true;
+        }
+
+        public void StopLayout() {
+            _damping = false;
+            _damper = 1.0f;
+        }
+
+        public void SlowLayout() {
+            // Stabilize the graph, but do so gently by setting the damper
+            // to a low value
+
+            _damping = true;
+            if (_damper > 0.3f) {
+                _damper = 0.3f;
+            }
+            else {
+                _damper = 0f;
+            }
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/Graphs/GraphNode.cs b/samples/AroundMe/AroundMe/Graphs/GraphNode.cs
new file mode 100644
index 000000000..f46b4aa59
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Graphs/GraphNode.cs
@@ -0,0 +1,42 @@
+// GraphNode.cs
+//
+
+using System;
+using System.Collections.Generic;
+
+namespace AroundMe.Graphs {
+
+	internal class GraphNode {
+
+        private List<GraphEdge> _edges;
+
+        public double x;
+        public double y;
+        internal double dx;
+        internal double dy;
+        public bool moveable;
+
+		public GraphNode() {
+            _edges = new List<GraphEdge>();
+            moveable = true;
+		}
+
+        public List<GraphEdge> Edges {
+            get {
+                return _edges;
+            }
+        }
+
+        internal void AddEdge(GraphEdge edge) {
+            _edges.Add(edge);
+        }
+
+        internal void ClearEdges() {
+            _edges.Clear();
+        }
+
+        internal void RemoveEdge(GraphEdge edge) {
+            _edges.Remove(edge);
+        }
+	}
+}
diff --git a/samples/AroundMe/AroundMe/Page.cs b/samples/AroundMe/AroundMe/Page.cs
new file mode 100644
index 000000000..47192e0f3
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Page.cs
@@ -0,0 +1,403 @@
+// Page.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Html;
+using System.Html.Media.Graphics;
+using System.Html.Services;
+using Microsoft.Maps;
+using TwitterApi;
+using AroundMe.Core;
+using AroundMe.DataModel;
+using AroundMe.Graphs;
+using AroundMe.Services;
+
+namespace AroundMe {
+
+    internal static class Page {
+
+        private const string MapModeClassName = "map";
+        private const string PhotosModeClassName = "photos";
+
+        private static PageModel _model;
+        private static Map _map;
+        private static MapEntityCollection _mapEntities;
+        private static MapPushpin _currentPushpin;
+        private static string _tileUrlFormat;
+
+        private static Graph _graph;
+        private static Dictionary<string, PhotoView> _photoViews;
+
+        private static bool _viewChanging;
+        private static int _zoomLevel;
+        private static string _oldMode;
+
+        static Page() {
+            if (Document.Body.GetAttribute("data-app") == null) {
+                return;
+            }
+
+            string flickrKey = (string)Document.Body.GetAttribute("data-flickr-key");
+            Debug.Assert(String.IsNullOrEmpty(flickrKey) == false);
+
+            string bingMapsKey = (string)Document.Body.GetAttribute("data-bingmaps-key");
+            Debug.Assert(String.IsNullOrEmpty(bingMapsKey) == false);
+
+            _tileUrlFormat = (string)Document.Body.GetAttribute("data-tile-url");
+            Debug.Assert(String.IsNullOrEmpty(_tileUrlFormat) == false);
+
+            _model = new PageModel(new FlickrService(flickrKey), new HtmlStorageService());
+            _model.PropertyChanged += delegate(object sender, PropertyChangedEventArgs e) {
+                if (e.PropertyName == "Searching") {
+                    Element progressElement = Utility.GetElement("searchProgress");
+                    if (_model.Searching) {
+                        progressElement.ClassName = "active";
+                    }
+                    else {
+                        progressElement.ClassName = "";
+                    }
+                }
+                else if (e.PropertyName == "Photos") {
+                    if (_model.SelectedPhoto != null) {
+                        ShowPhoto(null);
+                    }
+
+                    UpdatePhotos(/* newPhotos */ true);
+                }
+            };
+
+            MapOptions mapOptions = new MapOptions();
+            mapOptions.Credentials = bingMapsKey;
+            mapOptions.ShowMapTypeSelector = false;
+            mapOptions.ShowDashboard = false;
+            mapOptions.ShowScalebar = false;
+            mapOptions.ShowCopyright = false;
+            mapOptions.ShowLogo = false;
+            mapOptions.MapType = MapType.Custom;
+            mapOptions.Zoom = 2;
+            mapOptions.BackgroundColor = new MapColor(255, 255, 255, 255);
+            _map = new Map(Utility.GetElement("mapContainer"), mapOptions);
+
+            MapTileSourceOptions sourceOptions = new MapTileSourceOptions();
+            sourceOptions.UriGenerator = CreateTileUrl;
+
+            MapTileLayerOptions layerOptions = new MapTileLayerOptions();
+            layerOptions.Mercator = new MapTileSource(sourceOptions);
+            _map.Entities.Push(new MapTileLayer(layerOptions));
+
+            MapEvents.AddHandler(_map, "viewchangestart", delegate(MapEventArgs e) {
+                _viewChanging = true;
+                _zoomLevel = _map.GetZoom();
+            });
+            MapEvents.AddThrottledHandler(_map, "viewchangeend", delegate(MapEventArgs e) {
+                _viewChanging = false;
+
+                if (_zoomLevel != _map.GetZoom()) {
+                    UpdatePhotos(/* newPhotos */ false);
+                }
+            }, 250);
+            MapEvents.AddHandler(_map, "mousedown", delegate(MapEventArgs e) {
+                _oldMode = Document.Body.ClassName;
+                Document.Body.ClassName = MapModeClassName;
+            });
+            MapEvents.AddHandler(_map, "mouseup", delegate(MapEventArgs e) {
+                Document.Body.ClassName = _oldMode;
+            });
+
+            Utility.SubscribeKey("searchBox", delegate(ElementEvent e) {
+                Window.SetTimeout(delegate() {
+                    Document.GetElementById("searchButton").ClassName =
+                        String.IsNullOrEmpty(Utility.GetElement("searchBox").As<InputElement>().Value) ? "reset" : "";
+                }, 0);
+            });
+            Utility.SubscribeBlur("searchBox", delegate(ElementEvent e) {
+                Window.SetTimeout(delegate() {
+                    Document.GetElementById("searchButton").ClassName = "";
+                }, 0);
+            });
+            Utility.SubscribeClick("searchButton", delegate(ElementEvent e) {
+                Search(Utility.GetElement("searchBox").As<InputElement>().Value);
+                Document.ActiveElement.Blur();
+            });
+            Utility.SubscribeClick("locateMeButton", delegate(ElementEvent e) {
+                ShowLocation();
+            });
+            Utility.SubscribeClick("favButton", delegate(ElementEvent e) {
+                ShowFavorites();
+            });
+
+            Utility.SubscribeClick("photoAroundButton", delegate(ElementEvent e) {
+                SearchSimilar();
+            });
+            Utility.SubscribeClick("photoCloseButton", delegate(ElementEvent e) {
+                HidePhoto();
+            });
+            Utility.SubscribeClick("photoSaveButton", delegate(ElementEvent e) {
+                FavoritePhoto();
+            });
+            Utility.SubscribeClick("photoShareButton", delegate(ElementEvent e) {
+                SharePhoto();
+            });
+            Utility.SubscribeClick("photoSourceButton", delegate(ElementEvent e) {
+                ShowPhotoFlickrPage();
+            });
+
+            ShowLocation();
+        }
+
+        private static string CreateTileUrl(MapTile tile) {
+            int index = Math.Floor(Math.Random() * 3 + 1);
+            string domain = (index == 1) ? "a" : (index == 2) ? "b" : "c";
+
+            return String.Format(_tileUrlFormat, domain, tile.LevelOfDetail, tile.X, tile.Y);
+        }
+
+        private static void FavoritePhoto() {
+            Debug.Assert(_model.SelectedPhoto != null);
+            _model.AddFavorite();
+            Script.Alert("This photo has been saved to your favorites.");
+        }
+
+        private static void HidePhoto() {
+            Debug.Assert(_model.SelectedPhoto != null);
+            ShowPhoto(null);
+        }
+
+        private static void Search(string text) {
+            if (String.IsNullOrEmpty(text)) {
+                _model.ResetSearch();
+                return;
+            }
+
+            MapBounds bounds = _map.GetBounds();
+            _model.SearchRegion(text, bounds.GetWest(), bounds.GetSouth(),
+                                      bounds.GetEast(), bounds.GetNorth());
+        }
+
+        private static void SearchSimilar() {
+            Debug.Assert(_model.SelectedPhoto != null);
+
+            Photo selectedPhoto = _model.SelectedPhoto;
+            _model.SearchLocation(selectedPhoto.tags, selectedPhoto.latitude, selectedPhoto.longitude);
+            ShowPhoto(null);
+        }
+
+        private static void SharePhoto() {
+            Debug.Assert(_model.SelectedPhoto != null);
+
+            Twitter.Anywhere(delegate(TwitterObject t) {
+                Photo photo = _model.SelectedPhoto;
+
+                TweetBoxOptions options = new TweetBoxOptions();
+                options.Callback = delegate(string tweet, string htmlTweet) {
+                    Utility.GetElement("photoTweet").InnerHTML = String.Empty;
+                    Script.Alert("This photo has been shared with your followers on Twitter.");
+                };
+                options.Data = new TweetBoxData();
+                options.Data.Latitude = photo.latitude;
+                options.Data.Longitude = photo.longitude;
+                options.Label = "";
+                options.DefaultContent = photo.title + " " + photo.url;
+                options.Width = photo.width;
+
+                t.Select("#photoTweet").TweetBox(options);
+            });
+        }
+
+        private static void ShowFavorites() {
+            _model.ShowFavorites();
+
+            int favoriteCount = _model.Photos.Count;
+            if (favoriteCount != 0) {
+                MapLocation[] locations = new MapLocation[favoriteCount];
+
+                for (int i = 0; i < favoriteCount; i++) {
+                    locations[i] = new MapLocation(_model.Photos[i].latitude, _model.Photos[i].longitude);
+                }
+
+                MapViewOptions viewOptions = new MapViewOptions();
+                viewOptions.Bounds = MapBounds.FromLocations(locations);
+                viewOptions.Animate = true;
+
+                _map.SetView(viewOptions);
+                UpdatePhotos(/* newPhotos */ false);
+            }
+        }
+
+        private static void ShowLocation() {
+            Window.Navigator.Geolocation.GetCurrentPosition(delegate(Geolocation location) {
+                MapViewOptions viewOptions = new MapViewOptions();
+                viewOptions.Center = new MapLocation(location.Coordinates.Latitude,
+                                                     location.Coordinates.Longitude);
+                viewOptions.Zoom = 10;
+                viewOptions.Animate = true;
+
+                _map.SetView(viewOptions);
+                UpdatePhotos(/* newPhotos */ false);
+
+                if (_currentPushpin == null) {
+                    MapPushpinOptions pushpinOptions = new MapPushpinOptions();
+                    pushpinOptions.Icon = "Pushpin.png";
+                    pushpinOptions.Anchor = new MapPoint(12, 14);
+                    pushpinOptions.Width = 25;
+                    pushpinOptions.Height = 28;
+                    pushpinOptions.TypeName = "currentPushpin";
+
+                    _currentPushpin = new MapPushpin(viewOptions.Center, pushpinOptions);
+                    _map.Entities.Push(_currentPushpin);
+                }
+                else {
+                    _currentPushpin.SetLocation(viewOptions.Center);
+                }
+            });
+        }
+
+        private static void ShowPhoto(Photo photo) {
+            Element photoOverlay = Utility.GetElement("photoOverlay");
+            Element photoWrapper = Utility.GetElement("photo");
+            Element photoTitle = Utility.GetElement("photoTitle");
+            Element photoTweet = Utility.GetElement("photoTweet");
+
+            if (photo != null) {
+                ImageElement photoImage = Document.CreateElement("img").As<ImageElement>();
+                photoImage.Width = photo.width;
+                photoImage.Height = photo.height;
+                photoImage.Src = photo.imageUrl;
+
+                photoTitle.TextContent = photo.title;
+                photoTitle.Style.Width = photo.width + "px";
+                photoWrapper.AppendChild(photoImage);
+                photoOverlay.Style.Display = "block";
+
+                Element photoContainer = Utility.GetElement("photoContainer");
+                photoContainer.Style.MarginTop = Math.Max(20, Math.Truncate((Document.Body.OffsetHeight - photoContainer.OffsetHeight) / 2f) - 100) + "px";
+            }
+            else {
+                photoTitle.TextContent = String.Empty;
+                photoWrapper.InnerHTML = String.Empty;
+                photoTweet.InnerHTML = String.Empty;
+                photoOverlay.Style.Display = "none";
+            }
+
+            _model.SelectedPhoto = photo;
+        }
+
+        private static void ShowPhotoFlickrPage() {
+            Debug.Assert(_model.SelectedPhoto != null);
+            Window.Open(_model.SelectedPhoto.url, "_blank");
+        }
+
+        private static void UpdateLayout() {
+            if (_viewChanging) {
+                return;
+            }
+
+            bool continueLayout = _graph.Layout.PerformLayout();
+
+            _model.Photos.ForEach(delegate(Photo photo) {
+                PhotoView photoView = _photoViews[photo.id];
+
+                MapLocation pushpinLocation = photoView.pushpin.GetLocation();
+                MapLocation calloutLocation =
+                    _map.TryPixelToLocation(new MapPoint(photoView.calloutNode.x, photoView.calloutNode.y),
+                                            MapPointReference.Control);
+
+                photoView.callout.SetLocation(calloutLocation);
+                photoView.connector.SetLocations(new MapLocation[] { pushpinLocation, calloutLocation });
+            });
+
+            if (continueLayout) {
+                Window.SetTimeout(UpdateLayout, 30);
+            }
+        }
+
+        private static void UpdatePhotos(bool newPhotos) {
+            if (newPhotos) {
+                if (_mapEntities != null) {
+                    _map.Entities.Remove(_mapEntities);
+                }
+
+                _mapEntities = new MapEntityCollection();
+                _map.Entities.Push(_mapEntities);
+
+                _photoViews = new Dictionary<string, PhotoView>();
+            }
+
+            if (_model.Photos.Count == 0) {
+                Document.Body.ClassName = MapModeClassName;
+                return;
+            }
+
+            Document.Body.ClassName = PhotosModeClassName;
+
+            _graph = new Graph();
+            _model.Photos.ForEach(delegate(Photo photo) {
+                MapLocation location = new MapLocation(photo.latitude, photo.longitude);
+                MapPoint point = _map.TryLocationToPixel(location, MapPointReference.Control);
+
+                PhotoView photoView;
+                if (newPhotos) {
+                    MapPolylineOptions connectorOptions = new MapPolylineOptions();
+                    connectorOptions.StrokeColor = new MapColor(255, 0x4E, 0xD3, 0x4E);
+                    connectorOptions.StrokeThickness = 2;
+
+                    MapInfoboxOptions calloutOptions = new MapInfoboxOptions();
+                    calloutOptions.Width = 50;
+                    calloutOptions.Height = 50;
+                    calloutOptions.ShowPointer = false;
+                    calloutOptions.ShowCloseButton = false;
+                    calloutOptions.Offset = new MapPoint(-25, -25);
+                    calloutOptions.HtmlContent =
+                        "<div class=\"photoInfobox\" style=\"background-image: url(" + photo.thumbnailUrl + ")\"" +
+                        " title=\"" + photo.title.HtmlEncode() + "\"></div>";
+                    calloutOptions.Visible = true;
+
+                    MapPushpinOptions pushpinOptions = new MapPushpinOptions();
+                    pushpinOptions.Icon = "Dot.png";
+                    pushpinOptions.Width = 10;
+                    pushpinOptions.Height = 10;
+                    pushpinOptions.Anchor = new MapPoint(5, 5);
+                    pushpinOptions.TypeName = "locationPushpin";
+
+                    photoView = new PhotoView();
+                    photoView.pushpin = new MapPushpin(location, pushpinOptions);
+                    photoView.connector = new MapPolyline(new MapLocation[] { location, location }, connectorOptions);
+                    photoView.callout = new MapInfobox(location, calloutOptions);
+                    photoView.callout.Data = photo;
+                    _photoViews[photo.id] = photoView;
+
+                    _mapEntities.Insert(photoView.connector, 0);
+                    _mapEntities.Insert(photoView.callout, 0);
+                    _mapEntities.Insert(photoView.pushpin, 0);
+                    MapEvents.AddHandler(photoView.callout, "click", delegate(MapEventArgs e) {
+                        ShowPhoto(photo);
+                    });
+                }
+                else {
+                    photoView = _photoViews[photo.id];
+                }
+
+                photoView.pushpinNode = new GraphNode();
+                photoView.pushpinNode.x = point.X;
+                photoView.pushpinNode.y = point.Y;
+                photoView.pushpinNode.moveable = false;
+
+                photoView.calloutNode = new GraphNode();
+                photoView.calloutNode.x = point.X;
+                photoView.calloutNode.y = point.Y;
+
+                GraphEdge connectorEdge = new GraphEdge(photoView.pushpinNode,
+                                                        photoView.calloutNode,
+                                                        10 + Math.Random() * 15);
+
+                _graph.AddNode(photoView.pushpinNode);
+                _graph.AddNode(photoView.calloutNode);
+                _graph.AddEdge(connectorEdge);
+            });
+
+            Window.SetTimeout(UpdateLayout, 30);
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/PageModel.cs b/samples/AroundMe/AroundMe/PageModel.cs
new file mode 100644
index 000000000..26ae519fc
--- /dev/null
+++ b/samples/AroundMe/AroundMe/PageModel.cs
@@ -0,0 +1,130 @@
+// PageModel.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Serialization;
+using AroundMe.Core;
+using AroundMe.DataModel;
+using AroundMe.Services;
+
+namespace AroundMe {
+
+    internal sealed class PageModel : Model {
+
+        private IFlickrService _flickr;
+        private IStorageService _storage;
+
+        private bool _searching;
+
+        private List<Photo> _photos;
+        private List<Photo> _favoritePhotos;
+        private Photo _selectedPhoto;
+
+        public PageModel(IFlickrService flickr, IStorageService storage) {
+            _flickr = flickr;
+            _storage = storage;
+
+            _photos = new List<Photo>();
+        }
+
+        public List<Photo> Photos {
+            get {
+                return _photos;
+            }
+            private set {
+                _photos = value;
+                RaisePropertyChanged("Photos");
+            }
+        }
+
+        public bool Searching {
+            get {
+                return _searching;
+            }
+            private set {
+                _searching = value;
+                RaisePropertyChanged("Searching");
+            }
+        }
+
+        public Photo SelectedPhoto {
+            get {
+                return _selectedPhoto;
+            }
+            set {
+                _selectedPhoto = value;
+            }
+        }
+
+        public void AddFavorite() {
+            if (_selectedPhoto == null) {
+                return;
+            }
+
+            LoadFavorites();
+
+            _favoritePhotos.Add(_selectedPhoto);
+            SaveFavorites();
+        }
+
+        private void LoadFavorites() {
+            if (_favoritePhotos == null) {
+                try {
+                    string favoriteData = _storage.GetValue("favorites");
+                    if (String.IsNullOrEmpty(favoriteData) == false) {
+                        _favoritePhotos = Json.ParseData<List<Photo>>(favoriteData);
+                    }
+                }
+                catch {
+                    Debug.Fail("Failed to load favorites");
+                }
+            }
+
+            if (_favoritePhotos == null) {
+                _favoritePhotos = new List<Photo>();
+            }
+        }
+
+        private void SaveFavorites() {
+            string favoritesData = Json.Stringify(_favoritePhotos);
+            _storage.SetValue("favorites", favoritesData);
+        }
+
+        public void ShowFavorites() {
+            LoadFavorites();
+            Photos = _favoritePhotos;
+        }
+
+        public void ResetSearch() {
+            Photos = new List<Photo>();
+        }
+
+        public void SearchLocation(string tags, double latitude, double longitude) {
+            Searching = true;
+            _flickr.SearchLocation(tags, latitude, longitude, SearchCompleted);
+        }
+
+        public void SearchRegion(string text, double latitude1, double longitude1, double latitude2, double longitude2) {
+            Searching = true;
+            _flickr.SearchRegion(text, latitude1, longitude1, latitude2, longitude2, SearchCompleted);
+        }
+
+        private void SearchCompleted(IEnumerable<PhotoResult> photoResults) {
+            List<Photo> photos = new List<Photo>();
+
+            foreach (PhotoResult photoResult in photoResults) {
+                Photo photo = new Photo(photoResult.ID, photoResult.Title, photoResult.tags,
+                                        photoResult.Url_p,
+                                        photoResult.Url_m, Int32.Parse(photoResult.Width_m), Int32.Parse(photoResult.Height_m),
+                                        photoResult.Url_sq,
+                                        photoResult.Latitude, photoResult.Longitude);
+                photos.Add(photo);
+            }
+
+            Searching = false;
+            Photos = photos;
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/PhotoView.cs b/samples/AroundMe/AroundMe/PhotoView.cs
new file mode 100644
index 000000000..0ef0a8680
--- /dev/null
+++ b/samples/AroundMe/AroundMe/PhotoView.cs
@@ -0,0 +1,20 @@
+// Photo.cs
+//
+
+using System;
+using System.Html;
+using Microsoft.Maps;
+using AroundMe.Graphs;
+
+namespace AroundMe.DataModel {
+
+    internal sealed class PhotoView : Record {
+
+        public GraphNode pushpinNode;
+        public GraphNode calloutNode;
+
+        public MapPushpin pushpin;
+        public MapInfobox callout;
+        public MapPolyline connector;
+    }
+}
diff --git a/samples/AroundMe/AroundMe/Properties/AssemblyInfo.cs b/samples/AroundMe/AroundMe/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..0840f80f9
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Properties/AssemblyInfo.cs
@@ -0,0 +1,23 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("AroundMe")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script# Samples")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("AroundMe")]
+[assembly: ScriptNamespace("app")]
diff --git a/samples/AroundMe/AroundMe/Properties/FxCop.ruleset b/samples/AroundMe/AroundMe/Properties/FxCop.ruleset
new file mode 100644
index 000000000..47c160f61
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Properties/FxCop.ruleset
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Script# Rules" Description="General Script Rules" ToolsVersion="10.0">
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1000" Action="Warning" />
+    <Rule Id="CA1001" Action="Warning" />
+    <Rule Id="CA1008" Action="Warning" />
+    <Rule Id="CA1009" Action="Warning" />
+    <Rule Id="CA1010" Action="Warning" />
+    <Rule Id="CA1011" Action="Warning" />
+    <Rule Id="CA1012" Action="Warning" />
+    <Rule Id="CA1013" Action="Warning" />
+    <Rule Id="CA1016" Action="Warning" />
+    <Rule Id="CA1018" Action="Warning" />
+    <Rule Id="CA1019" Action="Warning" />
+    <Rule Id="CA1020" Action="Warning" />
+    <Rule Id="CA1021" Action="Warning" />
+    <Rule Id="CA1023" Action="Warning" />
+    <Rule Id="CA1024" Action="Warning" />
+    <Rule Id="CA1026" Action="Warning" />
+    <Rule Id="CA1027" Action="Warning" />
+    <Rule Id="CA1028" Action="Warning" />
+    <Rule Id="CA1030" Action="Warning" />
+    <Rule Id="CA1032" Action="Warning" />
+    <Rule Id="CA1033" Action="Warning" />
+    <Rule Id="CA1034" Action="Warning" />
+    <Rule Id="CA1036" Action="Warning" />
+    <Rule Id="CA1040" Action="Warning" />
+    <Rule Id="CA1041" Action="Warning" />
+    <Rule Id="CA1043" Action="Warning" />
+    <Rule Id="CA1044" Action="Warning" />
+    <Rule Id="CA1045" Action="Warning" />
+    <Rule Id="CA1046" Action="Warning" />
+    <Rule Id="CA1047" Action="Warning" />
+    <Rule Id="CA1048" Action="Warning" />
+    <Rule Id="CA1052" Action="Warning" />
+    <Rule Id="CA1053" Action="Warning" />
+    <Rule Id="CA1058" Action="Warning" />
+    <Rule Id="CA1059" Action="Warning" />
+    <Rule Id="CA1061" Action="Warning" />
+    <Rule Id="CA1065" Action="Warning" />
+    <Rule Id="CA1500" Action="Warning" />
+    <Rule Id="CA1501" Action="Warning" />
+    <Rule Id="CA1502" Action="Warning" />
+    <Rule Id="CA1504" Action="Warning" />
+    <Rule Id="CA1505" Action="Warning" />
+    <Rule Id="CA1506" Action="Warning" />
+    <Rule Id="CA1700" Action="Warning" />
+    <Rule Id="CA1701" Action="Warning" />
+    <Rule Id="CA1702" Action="Warning" />
+    <Rule Id="CA1703" Action="Warning" />
+    <Rule Id="CA1704" Action="Warning" />
+    <Rule Id="CA1707" Action="Warning" />
+    <Rule Id="CA1708" Action="Warning" />
+    <Rule Id="CA1709" Action="Warning" />
+    <Rule Id="CA1710" Action="Warning" />
+    <Rule Id="CA1711" Action="Warning" />
+    <Rule Id="CA1712" Action="Warning" />
+    <Rule Id="CA1713" Action="Warning" />
+    <Rule Id="CA1714" Action="Warning" />
+    <Rule Id="CA1715" Action="Warning" />
+    <Rule Id="CA1716" Action="Warning" />
+    <Rule Id="CA1717" Action="Warning" />
+    <Rule Id="CA1719" Action="Warning" />
+    <Rule Id="CA1720" Action="Warning" />
+    <Rule Id="CA1721" Action="Warning" />
+    <Rule Id="CA1722" Action="Warning" />
+    <Rule Id="CA1724" Action="Warning" />
+    <Rule Id="CA1725" Action="Warning" />
+    <Rule Id="CA1726" Action="Warning" />
+    <Rule Id="CA1800" Action="Warning" />
+    <Rule Id="CA1801" Action="Warning" />
+    <Rule Id="CA1802" Action="Warning" />
+    <Rule Id="CA1804" Action="Warning" />
+    <Rule Id="CA1806" Action="Warning" />
+    <Rule Id="CA1809" Action="Warning" />
+    <Rule Id="CA1811" Action="Warning" />
+    <Rule Id="CA1812" Action="Warning" />
+    <Rule Id="CA1813" Action="Warning" />
+    <Rule Id="CA1814" Action="Warning" />
+    <Rule Id="CA1815" Action="Warning" />
+    <Rule Id="CA1819" Action="Warning" />
+    <Rule Id="CA1820" Action="Warning" />
+    <Rule Id="CA1821" Action="Warning" />
+    <Rule Id="CA2201" Action="Warning" />
+    <Rule Id="CA2202" Action="Warning" />
+    <Rule Id="CA2204" Action="Warning" />
+    <Rule Id="CA2207" Action="Warning" />
+    <Rule Id="CA2213" Action="Warning" />
+    <Rule Id="CA2214" Action="Warning" />
+    <Rule Id="CA2215" Action="Warning" />
+    <Rule Id="CA2217" Action="Warning" />
+    <Rule Id="CA2218" Action="Warning" />
+    <Rule Id="CA2219" Action="Warning" />
+    <Rule Id="CA2222" Action="Warning" />
+    <Rule Id="CA2223" Action="Warning" />
+    <Rule Id="CA2224" Action="Warning" />
+    <Rule Id="CA2226" Action="Warning" />
+    <Rule Id="CA2227" Action="Warning" />
+    <Rule Id="CA2233" Action="Warning" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/samples/AroundMe/AroundMe/Properties/Script.template b/samples/AroundMe/AroundMe/Properties/Script.template
new file mode 100644
index 000000000..d0fad56de
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Properties/Script.template
@@ -0,0 +1,8 @@
+//! #= ScriptFile ##
+//
+
+(function() {
+#include[as-is] "%code%"
+})();
+
+//! This script was generated using Script# v#= CompilerVersion ##
diff --git a/samples/AroundMe/AroundMe/Services/Base58.cs b/samples/AroundMe/AroundMe/Services/Base58.cs
new file mode 100644
index 000000000..60ddf6141
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Services/Base58.cs
@@ -0,0 +1,40 @@
+// Base58.cs
+//
+
+using System;
+
+namespace AroundMe.Services {
+
+    internal static class Base58 {
+
+        private static string Alphabet = "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ";
+
+        public static string Decode(string id) {
+            int converted = 0;
+            int multiplier = 1;
+
+            while (id.Length > 0) {
+                string currentChar = id.Substr(id.Length - 1);
+                converted += multiplier * Alphabet.IndexOf(currentChar);
+                multiplier = multiplier * Alphabet.Length;
+
+                id = id.Substr(0, id.Length - 1);
+            }
+
+            return converted.ToString();
+        }
+
+        public static string Encode(string id) {
+            int number = Int32.Parse(id);
+
+            string encoded = "";
+            while (number > 0) {
+                int remainder = number % Alphabet.Length;
+                number = (int)(number / Alphabet.Length);
+                encoded = Alphabet.CharAt(remainder) + encoded;
+            }
+
+            return encoded;
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/Services/FlickrService.cs b/samples/AroundMe/AroundMe/Services/FlickrService.cs
new file mode 100644
index 000000000..0c57adb1b
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Services/FlickrService.cs
@@ -0,0 +1,95 @@
+// FlickrService.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+namespace AroundMe.Services {
+
+    [Imported]
+    public sealed class SearchResponse {
+
+        [ScriptName("photos")]
+        public PhotosSearchResponse PhotoResponse;
+    }
+
+    [Imported]
+    public sealed class PhotosSearchResponse {
+
+        [ScriptName("photo")]
+        public List<PhotoResult> PhotoList;
+    }
+
+    [Imported]
+    public sealed class PhotoResult {
+
+        public string ID;
+        public string Owner;
+        public string Title;
+        public string Url_sq;
+        public string Url_m;
+        public string Height_m;
+        public string Width_m;
+        public double Latitude;
+        public double Longitude;
+        public string tags;
+
+        public string Url_p;
+    }
+
+    internal sealed class FlickrService : IFlickrService {
+
+        private static string RegionSearchUriFormat = "http://api.flickr.com/services/rest/?method=flickr.photos.search&api_key={0}&tags={1}&tag_mode=all&has_geo=1&sort=interestingness-desc&safe_search=1&extras=o_dims%2Curl_sq%2Curl_m%2Cgeo%2Ctags&bbox={2}%2C{3}%2C{4}%2C{5}&per_page=20&format=json";
+        private static string LocationSearchUriFormat = "http://api.flickr.com/services/rest/?method=flickr.photos.search&api_key={0}&tags={1}&has_geo=true&sort=interestingness-desc&safe_search=1&extras=o_dims%2Curl_sq%2Curl_m%2Cgeo%2Ctags&lat={2}&lon={3}&per_page=20&format=json";
+        private string _apiKey;
+
+        public FlickrService(string apiKey) {
+            _apiKey = apiKey;
+        }
+
+        public void SearchLocation(string tags, double latitude, double longitude, Action<IEnumerable<PhotoResult>> searchCallback) {
+            string url = String.Format(LocationSearchUriFormat,
+                                       _apiKey,
+                                       tags.EncodeUriComponent(), latitude, longitude);
+            Search(url, searchCallback);
+        }
+
+        public void SearchRegion(string text, double latitude1, double longitude1, double latitude2, double longitude2, Action<IEnumerable<PhotoResult>> searchCallback) {
+            string tags = text.Split(' ').Join(",").EncodeUriComponent();
+            string url = String.Format(RegionSearchUriFormat,
+                                       _apiKey,
+                                       tags, latitude1, longitude1, latitude2, longitude2);
+
+            Search(url, searchCallback);
+        }
+
+        private static void Search(string url, Action<IEnumerable<PhotoResult>> searchCallback) {
+            Action<SearchResponse> jsonCallback =
+                delegate(SearchResponse response) {
+                    List<PhotoResult> photos = response.PhotoResponse.PhotoList;
+
+                    photos.ForEach(delegate(PhotoResult photo) {
+                        string[] tagsArray = photo.tags.Split(' ');
+                        if (tagsArray.Length > 10) {
+                            tagsArray = (string[])tagsArray.Extract(0, 10);
+                        }
+
+                        photo.tags = tagsArray.Join(",");
+                        photo.Url_p = "http://flic.kr/p/" + Base58.Encode(photo.ID);
+                    });
+
+                    searchCallback(photos);
+                };
+
+            string jsonCallbackName = Delegate.CreateExport(jsonCallback);
+            string scriptSource = url + "&jsoncallback=" + jsonCallbackName;
+
+            ScriptElement scriptElement = Document.CreateElement("script").As<ScriptElement>();
+            scriptElement.Type = "text/javascript";
+            scriptElement.Src = scriptSource;
+            Document.GetElementsByTagName("head")[0].AppendChild(scriptElement);
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/Services/HtmlStorageService.cs b/samples/AroundMe/AroundMe/Services/HtmlStorageService.cs
new file mode 100644
index 000000000..072287647
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Services/HtmlStorageService.cs
@@ -0,0 +1,19 @@
+// HtmlStorageService.cs
+//
+
+using System;
+using System.Html;
+
+namespace AroundMe.Services {
+
+    internal sealed class HtmlStorageService : IStorageService {
+
+        public string GetValue(string key) {
+            return (string)Window.LocalStorage[key];
+        }
+
+        public void SetValue(string key, string value) {
+            Window.LocalStorage[key] = value;
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/Services/IFlickrService.cs b/samples/AroundMe/AroundMe/Services/IFlickrService.cs
new file mode 100644
index 000000000..af78aa4ff
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Services/IFlickrService.cs
@@ -0,0 +1,15 @@
+// IFlickrService.cs
+//
+
+using System;
+using System.Collections.Generic;
+
+namespace AroundMe.Services {
+
+    interface IFlickrService {
+    
+        void SearchLocation(string tags, double latitude, double longitude, Action<IEnumerable<PhotoResult>> searchCallback);
+
+        void SearchRegion(string text, double latitude1, double longitude1, double latitude2, double longitude2, Action<IEnumerable<PhotoResult>> searchCallback);
+    }
+}
diff --git a/samples/AroundMe/AroundMe/Services/IStorageService.cs b/samples/AroundMe/AroundMe/Services/IStorageService.cs
new file mode 100644
index 000000000..f7d53deb7
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Services/IStorageService.cs
@@ -0,0 +1,14 @@
+// IStorageService.cs
+//
+
+using System;
+
+namespace AroundMe.Services {
+
+    internal interface IStorageService {
+
+        string GetValue(string key);
+
+        void SetValue(string key, string value);
+    }
+}
diff --git a/samples/AroundMe/AroundMe/Tests/MockFlickrService.cs b/samples/AroundMe/AroundMe/Tests/MockFlickrService.cs
new file mode 100644
index 000000000..24a8c2307
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Tests/MockFlickrService.cs
@@ -0,0 +1,39 @@
+// MockFlickrService.cs
+//
+
+using System;
+using System.Collections.Generic;
+using AroundMe.Services;
+
+namespace AroundMe.Tests {
+
+    public class MockFlickrService : IFlickrService {
+
+        private Action<IEnumerable<PhotoResult>> _searchCallback;
+        private int _searchCount;
+
+        public MockFlickrService() {
+            _searchCount = 0;
+        }
+
+        public int SearchCount {
+            get {
+                return _searchCount;
+            }
+        }
+
+        public void InvokeCallback(IEnumerable<PhotoResult> results) {
+            _searchCallback(results);
+        }
+
+        public void SearchLocation(string tags, double latitude, double longitude, Action<IEnumerable<PhotoResult>> searchCallback) {
+            _searchCallback = searchCallback;
+            _searchCount++;
+        }
+
+        public void SearchRegion(string text, double latitude1, double longitude1, double latitude2, double longitude2, Action<IEnumerable<PhotoResult>> searchCallback) {
+            _searchCallback = searchCallback;
+            _searchCount++;
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/Tests/PageModelTests.cs b/samples/AroundMe/AroundMe/Tests/PageModelTests.cs
new file mode 100644
index 000000000..ab9035297
--- /dev/null
+++ b/samples/AroundMe/AroundMe/Tests/PageModelTests.cs
@@ -0,0 +1,37 @@
+// PageModelTests.cs
+//
+
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Html;
+using System.Testing;
+using AroundMe.Services;
+
+namespace AroundMe.Tests {
+
+    [SuppressMessage("Microsoft.Performance", "CA1812",
+                     Justification = "Tests don't have internal consumers. They're only compiled into .test.js scripts.")]
+    internal sealed class PageModelTests : TestClass {
+
+        public void TestSearchLocationTogglesSearchingStatus() {
+            Assert.ExpectAsserts(2);
+
+            MockFlickrService flickrService = new MockFlickrService();
+            PageModel pageModel = new PageModel(flickrService, null);
+
+            pageModel.SearchLocation("xyz", 0, 0);
+            Assert.IsTrue(pageModel.Searching, "Expected model to report true for Searching.");
+
+            Window.SetTimeout(delegate() {
+                PhotoResult[] dummyResults = new PhotoResult[0];
+
+                flickrService.InvokeCallback(dummyResults);
+                Assert.IsTrue(pageModel.Searching == false, "Expected model to report false for Searching.");
+
+                TestEngine.ResumeOnAsyncCompleted();
+            }, 2000);
+
+            TestEngine.WaitForAsyncCompletion();
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMe/packages.config b/samples/AroundMe/AroundMe/packages.config
new file mode 100644
index 000000000..a7a59cc42
--- /dev/null
+++ b/samples/AroundMe/AroundMe/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp" version="0.7.5.1" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.BingMaps" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.HTML" version="0.7.5.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/AroundMe/AroundMeTests.testsettings b/samples/AroundMe/AroundMeTests.testsettings
new file mode 100644
index 000000000..d78647c9b
--- /dev/null
+++ b/samples/AroundMe/AroundMeTests.testsettings
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestSettings name="AroundMeTests" id="5967c153-0913-4783-9c7f-b036c55bd667" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <Description>These are default test settings for a local test run.</Description>
+  <Execution>
+    <TestTypeSpecific>
+      <UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
+        <AssemblyResolution>
+          <TestDirectory useLoadContext="true" />
+        </AssemblyResolution>
+      </UnitTestRunConfig>
+      <WebTestRunConfiguration testTypeId="4e7599fa-5ecb-43e9-a887-cd63cf72d207">
+        <Browser name="Internet Explorer 9.0" MaxConnections="6">
+          <Headers>
+            <Header name="User-Agent" value="Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)" />
+            <Header name="Accept" value="*/*" />
+            <Header name="Accept-Language" value="{{$IEAcceptLanguage}}" />
+            <Header name="Accept-Encoding" value="GZIP" />
+          </Headers>
+        </Browser>
+      </WebTestRunConfiguration>
+    </TestTypeSpecific>
+    <AgentRule name="LocalMachineDefaultRole">
+    </AgentRule>
+  </Execution>
+</TestSettings>
\ No newline at end of file
diff --git a/samples/AroundMe/AroundMeTests/AroundMeTests.csproj b/samples/AroundMe/AroundMeTests/AroundMeTests.csproj
new file mode 100644
index 000000000..ea073b83b
--- /dev/null
+++ b/samples/AroundMe/AroundMeTests/AroundMeTests.csproj
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{E01AE039-4B10-4A3B-AB86-EBFC1E2F6B17}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>AroundMeTests</RootNamespace>
+    <AssemblyName>AroundMeTests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <RestoreNugetPackages>true</RestoreNugetPackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="ScriptSharp.Testing">
+      <HintPath>..\packages\ScriptSharp.Testing.0.7.5.0\lib\ScriptSharp.Testing.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Content Include="Web\QUnit.css" />
+    <Content Include="Web\QUnit.js" />
+    <Content Include="Web\QUnitExt.js" />
+    <Compile Include="DefaultTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\nuget.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/samples/AroundMe/AroundMeTests/DefaultTests.cs b/samples/AroundMe/AroundMeTests/DefaultTests.cs
new file mode 100644
index 000000000..d03768991
--- /dev/null
+++ b/samples/AroundMe/AroundMeTests/DefaultTests.cs
@@ -0,0 +1,55 @@
+// DefaultTests.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using ScriptSharp.Testing;
+
+namespace AroundMeTests {
+
+    [TestClass]
+    [DeploymentItem("AroundMeTests\\Web", "Web")]
+    [DeploymentItem("AroundMe\\bin\\Debug\\mscorlib.debug.js", "Web")]
+    [DeploymentItem("AroundMe\\bin\\Debug\\AroundMe.test.js", "Web")]
+    public class DefaultTests {
+
+        private static WebTest _webTest;
+
+        public TestContext TestContext {
+            get;
+            set;
+        }
+
+        [ClassInitialize()]
+        public static void OnInitialize(TestContext testContext) {
+            // This starts the web server rooted at the specified directory
+            // on http://localhost:<port>
+
+            string webRoot = Path.Combine(testContext.DeploymentDirectory, "Web");
+            int port = 3976;
+
+            _webTest = new WebTest();
+            _webTest.StartWebServer(webRoot, port);
+        }
+
+        [ClassCleanup()]
+        public static void OnCleanup() {
+            _webTest.StopWebServer();
+        }
+
+        [TestMethod]
+        public void TestMethod1() {
+            WebTestPageBuilder pageBuilder = new WebTestPageBuilder("DefaultTests");
+            string html =
+                pageBuilder.AddScripts("mscorlib.debug.js", "AroundMe.test.js")
+                           .ToHtml();
+
+            Uri pageUri = _webTest.CreateContent("/DefaultTests.htm", html, "text/html");
+
+            WebTestResult chromeResult = _webTest.RunTest(pageUri, WebBrowser.Chrome);
+            Assert.IsTrue(chromeResult.Succeeded, "Chrome:\r\n" + chromeResult.Log);
+        }
+    }
+}
diff --git a/samples/AroundMe/AroundMeTests/Properties/AssemblyInfo.cs b/samples/AroundMe/AroundMeTests/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..990c6505d
--- /dev/null
+++ b/samples/AroundMe/AroundMeTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("AroundMeTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("AroundMeTests")]
+[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/AroundMe/AroundMeTests/Web/QUnit.css b/samples/AroundMe/AroundMeTests/Web/QUnit.css
new file mode 100644
index 000000000..a9b4f5903
--- /dev/null
+++ b/samples/AroundMe/AroundMeTests/Web/QUnit.css
@@ -0,0 +1,112 @@
+ol#qunit-tests {
+	font-family:Calibri, Helvetica, Arial;
+	margin:0;
+	padding:0;
+	list-style-position:inside;
+	font-size: smaller;
+}
+ol#qunit-tests li{
+	padding:0.4em 0.5em 0.4em 2.5em;
+	border-bottom:1px solid #fff;
+	font-size:small;
+	list-style-position:inside;
+}
+ol#qunit-tests li ol{
+	box-shadow: inset 0px 2px 13px #999;
+	-moz-box-shadow: inset 0px 2px 13px #999;
+	-webkit-box-shadow: inset 0px 2px 13px #999;
+	margin-top:0.5em;
+	margin-left:0;
+	padding:0.5em;
+	background-color:#fff;
+}
+ol#qunit-tests li li{
+	border-bottom:none;
+	margin:0.5em;
+	background-color:#fff;
+	list-style-position: inside;
+	padding:0.4em 0.5em 0.4em 0.5em;
+}
+ol#qunit-tests li li.pass{
+	border-left:26px solid #C6E746;
+	background-color:#fff;
+	color:#5E740B;
+}
+ol#qunit-tests li li.fail{
+	border-left:26px solid #EE5757;
+	background-color:#fff;
+	color:#710909;
+}
+ol#qunit-tests li.pass{
+	background-color:#D2E0E6;
+	color:#528CE0;
+}
+ol#qunit-tests li.fail{
+	background-color:#EE5757;
+	color:#000;
+}
+ol#qunit-tests li strong {
+	cursor:pointer;
+}
+h1#qunit-header{
+	background-color:#0d3349;
+	margin:0;
+	padding:0.5em 0 0.5em 1em;
+	color:#fff;
+	font-family:Calibri, Helvetica, Arial;
+	border-top-right-radius:15px;
+	border-top-left-radius:15px;
+	-moz-border-radius-topright:15px;
+	-moz-border-radius-topleft:15px;
+	-webkit-border-top-right-radius:15px;
+	-webkit-border-top-left-radius:15px;
+	text-shadow: rgba(0, 0, 0, 0.5) 4px 4px 1px;
+}
+h2#qunit-banner{
+	font-family:Calibri, Helvetica, Arial;
+	height:5px;
+	margin:0;
+	padding:0;
+}
+h2#qunit-banner.qunit-pass{
+	background-color:#C6E746;
+}
+h2#qunit-banner.qunit-fail, #qunit-testrunner-toolbar {
+	background-color:#EE5757;
+}
+#qunit-testrunner-toolbar {
+	font-family:Calibri, Helvetica, Arial;
+	padding:0;
+	padding:0em 0 0.5em 2em;
+	font-size: small;
+}
+h2#qunit-userAgent {
+	font-family:Calibri, Helvetica, Arial;
+	background-color:#2b81af;
+	margin:0;
+	padding:0;
+	color:#fff;
+	font-size: small;
+	padding:0.5em 0 0.5em 2.5em;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+p#qunit-testresult{
+	font-family:Calibri, Helvetica, Arial;
+	margin:0;
+	font-size: small;
+	color:#2b81af;
+	border-bottom-right-radius:15px;
+	border-bottom-left-radius:15px;
+	-moz-border-radius-bottomright:15px;
+	-moz-border-radius-bottomleft:15px;
+	-webkit-border-bottom-right-radius:15px;
+	-webkit-border-bottom-left-radius:15px;
+	background-color:#D2E0E6;
+	padding:0.5em 0.5em 0.5em 2.5em;
+}
+strong b.fail{
+	color:#710909;
+}
+strong b.pass{
+	color:#5E740B;
+}
diff --git a/samples/AroundMe/AroundMeTests/Web/QUnit.js b/samples/AroundMe/AroundMeTests/Web/QUnit.js
new file mode 100644
index 000000000..f2704148e
--- /dev/null
+++ b/samples/AroundMe/AroundMeTests/Web/QUnit.js
@@ -0,0 +1,1043 @@
+/*
+ * QUnit - A JavaScript Unit Testing Framework
+ * 
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2009 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ */
+
+(function(window) {
+
+var QUnit = {
+
+	// Initialize the configuration options
+	init: function() {
+		config = {
+			stats: { all: 0, bad: 0 },
+			moduleStats: { all: 0, bad: 0 },
+			started: +new Date,
+			blocking: false,
+			autorun: false,
+			assertions: [],
+			filters: [],
+			queue: []
+		};
+
+		var tests = id("qunit-tests"),
+			banner = id("qunit-banner"),
+			result = id("qunit-testresult");
+
+		if ( tests ) {
+			tests.innerHTML = "";
+		}
+
+		if ( banner ) {
+			banner.className = "";
+		}
+
+		if ( result ) {
+			result.parentNode.removeChild( result );
+		}
+	},
+	
+	// call on start of module test to prepend name to all tests
+	module: function(name, testEnvironment) {
+		config.currentModule = name;
+
+		synchronize(function() {
+			if ( config.currentModule ) {
+				QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all );
+			}
+
+			config.currentModule = name;
+			config.moduleTestEnvironment = testEnvironment;
+			config.moduleStats = { all: 0, bad: 0 };
+
+			QUnit.moduleStart( name, testEnvironment );
+		});
+	},
+
+	asyncTest: function(testName, expected, callback) {
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = 0;
+		}
+
+		QUnit.test(testName, expected, callback, true);
+	},
+	
+	test: function(testName, expected, callback, async) {
+		var name = testName, testEnvironment, testEnvironmentArg;
+
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = null;
+		}
+		// is 2nd argument a testEnvironment?
+		if ( expected && typeof expected === 'object') {
+			testEnvironmentArg =  expected;
+			expected = null;
+		}
+
+		if ( config.currentModule ) {
+			name = config.currentModule + " module: " + name;
+		}
+
+		if ( !validTest(name) ) {
+			return;
+		}
+
+		synchronize(function() {
+			QUnit.testStart( testName );
+
+			testEnvironment = extend({
+				setup: function() {},
+				teardown: function() {}
+			}, config.moduleTestEnvironment);
+			if (testEnvironmentArg) {
+				extend(testEnvironment,testEnvironmentArg);
+			}
+
+			// allow utility functions to access the current test environment
+			QUnit.current_testEnvironment = testEnvironment;
+			
+			config.assertions = [];
+			config.expected = expected;
+
+			try {
+				if ( !config.pollution ) {
+					saveGlobal();
+				}
+
+				testEnvironment.setup.call(testEnvironment);
+			} catch(e) {
+				QUnit.ok( false, "Setup failed on " + name + ": " + e.message );
+			}
+
+			if ( async ) {
+				QUnit.stop();
+			}
+
+			try {
+				callback.call(testEnvironment);
+			} catch(e) {
+				fail("Test " + name + " died, exception and test follows", e, callback);
+				QUnit.ok( false, "Died on test #" + (config.assertions.length + 1) + ": " + e.message );
+				// else next test will carry the responsibility
+				saveGlobal();
+
+				// Restart the tests if they're blocking
+				if ( config.blocking ) {
+					start();
+				}
+			}
+		});
+
+		synchronize(function() {
+			try {
+				checkPollution();
+				testEnvironment.teardown.call(testEnvironment);
+			} catch(e) {
+				QUnit.ok( false, "Teardown failed on " + name + ": " + e.message );
+			}
+
+			try {
+				QUnit.reset();
+			} catch(e) {
+				fail("reset() failed, following Test " + name + ", exception and reset fn follows", e, reset);
+			}
+
+			if ( config.expected && config.expected != config.assertions.length ) {
+				QUnit.ok( false, "Expected " + config.expected + " assertions, but " + config.assertions.length + " were run" );
+			}
+
+			var good = 0, bad = 0,
+				tests = id("qunit-tests");
+
+			config.stats.all += config.assertions.length;
+			config.moduleStats.all += config.assertions.length;
+
+			if ( tests ) {
+				var ol  = document.createElement("ol");
+				ol.style.display = "none";
+
+				for ( var i = 0; i < config.assertions.length; i++ ) {
+					var assertion = config.assertions[i];
+
+					var li = document.createElement("li");
+					li.className = assertion.result ? "pass" : "fail";
+					li.appendChild(document.createTextNode(assertion.message || "(no message)"));
+					ol.appendChild( li );
+
+					if ( assertion.result ) {
+						good++;
+					} else {
+						bad++;
+						config.stats.bad++;
+						config.moduleStats.bad++;
+					}
+				}
+
+				var b = document.createElement("strong");
+				b.innerHTML = name + " <b style='color:black;'>(<b class='fail'>" + bad + "</b>, <b class='pass'>" + good + "</b>, " + config.assertions.length + ")</b>";
+				
+				addEvent(b, "click", function() {
+					var next = b.nextSibling, display = next.style.display;
+					next.style.display = display === "none" ? "block" : "none";
+				});
+				
+				addEvent(b, "dblclick", function(e) {
+					var target = e && e.target ? e.target : window.event.srcElement;
+					if ( target.nodeName.toLowerCase() === "strong" ) {
+						var text = "", node = target.firstChild;
+
+						while ( node.nodeType === 3 ) {
+							text += node.nodeValue;
+							node = node.nextSibling;
+						}
+
+						text = text.replace(/(^\s*|\s*$)/g, "");
+
+						if ( window.location ) {
+							window.location.href = window.location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent(text);
+						}
+					}
+				});
+
+				var li = document.createElement("li");
+				li.className = bad ? "fail" : "pass";
+				li.appendChild( b );
+				li.appendChild( ol );
+				tests.appendChild( li );
+
+				if ( bad ) {
+					var toolbar = id("qunit-testrunner-toolbar");
+					if ( toolbar ) {
+						toolbar.style.display = "block";
+						id("qunit-filter-pass").disabled = null;
+						id("qunit-filter-missing").disabled = null;
+					}
+				}
+
+			} else {
+				for ( var i = 0; i < config.assertions.length; i++ ) {
+					if ( !config.assertions[i].result ) {
+						bad++;
+						config.stats.bad++;
+						config.moduleStats.bad++;
+					}
+				}
+			}
+
+			QUnit.testDone( testName, bad, config.assertions.length );
+
+			if ( !window.setTimeout && !config.queue.length ) {
+				done();
+			}
+		});
+
+		if ( window.setTimeout && !config.doneTimer ) {
+			config.doneTimer = window.setTimeout(function(){
+				if ( !config.queue.length ) {
+					done();
+				} else {
+					synchronize( done );
+				}
+			}, 13);
+		}
+	},
+	
+	/**
+	 * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+	 */
+	expect: function(asserts) {
+		config.expected = asserts;
+	},
+
+	/**
+	 * Asserts true.
+	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
+	 */
+	ok: function(a, msg) {
+		QUnit.log(a, msg);
+
+		config.assertions.push({
+			result: !!a,
+			message: msg
+		});
+	},
+
+	/**
+	 * Checks that the first two arguments are equal, with an optional message.
+	 * Prints out both actual and expected values.
+	 *
+	 * Prefered to ok( actual == expected, message )
+	 *
+	 * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." );
+	 *
+	 * @param Object actual
+	 * @param Object expected
+	 * @param String message (optional)
+	 */
+	equal: function(actual, expected, message) {
+		push(expected == actual, actual, expected, message);
+	},
+
+	notEqual: function(actual, expected, message) {
+		push(expected != actual, actual, expected, message);
+	},
+	
+	deepEqual: function(a, b, message) {
+		push(QUnit.equiv(a, b), a, b, message);
+	},
+
+	notDeepEqual: function(a, b, message) {
+		push(!QUnit.equiv(a, b), a, b, message);
+	},
+
+	strictEqual: function(actual, expected, message) {
+		push(expected === actual, actual, expected, message);
+	},
+
+	notStrictEqual: function(actual, expected, message) {
+		push(expected !== actual, actual, expected, message);
+	},
+	
+	start: function() {
+		// A slight delay, to avoid any current callbacks
+		if ( window.setTimeout ) {
+			window.setTimeout(function() {
+				if ( config.timeout ) {
+					clearTimeout(config.timeout);
+				}
+
+				config.blocking = false;
+				process();
+			}, 13);
+		} else {
+			config.blocking = false;
+			process();
+		}
+	},
+	
+	stop: function(timeout) {
+		config.blocking = true;
+
+		if ( timeout && window.setTimeout ) {
+			config.timeout = window.setTimeout(function() {
+				QUnit.ok( false, "Test timed out" );
+				QUnit.start();
+			}, timeout);
+		}
+	},
+	
+	/**
+	 * Resets the test setup. Useful for tests that modify the DOM.
+	 */
+	reset: function() {
+		if ( window.jQuery ) {
+			jQuery("#main").html( config.fixture );
+			jQuery.event.global = {};
+			jQuery.ajaxSettings = extend({}, config.ajaxSettings);
+		}
+	},
+	
+	/**
+	 * Trigger an event on an element.
+	 *
+	 * @example triggerEvent( document.body, "click" );
+	 *
+	 * @param DOMElement elem
+	 * @param String type
+	 */
+	triggerEvent: function( elem, type, event ) {
+		if ( document.createEvent ) {
+			event = document.createEvent("MouseEvents");
+			event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
+				0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			elem.dispatchEvent( event );
+
+		} else if ( elem.fireEvent ) {
+			elem.fireEvent("on"+type);
+		}
+	},
+	
+	// Safe object type checking
+	is: function( type, obj ) {
+		return Object.prototype.toString.call( obj ) === "[object "+ type +"]";
+	},
+	
+	// Logging callbacks
+	done: function(failures, total) {},
+	log: function(result, message) {},
+	testStart: function(name) {},
+	testDone: function(name, failures, total) {},
+	moduleStart: function(name, testEnvironment) {},
+	moduleDone: function(name, failures, total) {}
+};
+
+// Backwards compatibility, deprecated
+QUnit.equals = QUnit.equal;
+QUnit.same = QUnit.deepEqual;
+
+// Maintain internal state
+var config = {
+	// The queue of tests to run
+	queue: [],
+
+	// block until document ready
+	blocking: true
+};
+
+// Load paramaters
+(function() {
+	var location = window.location || { search: "", protocol: "file:" },
+		GETParams = location.search.slice(1).split('&');
+
+	for ( var i = 0; i < GETParams.length; i++ ) {
+		GETParams[i] = decodeURIComponent( GETParams[i] );
+		if ( GETParams[i] === "noglobals" ) {
+			GETParams.splice( i, 1 );
+			i--;
+			config.noglobals = true;
+		} else if ( GETParams[i].search('=') > -1 ) {
+			GETParams.splice( i, 1 );
+			i--;
+		}
+	}
+	
+	// restrict modules/tests by get parameters
+	config.filters = GETParams;
+	
+	// Figure out if we're running the tests from a server or not
+	QUnit.isLocal = !!(location.protocol === 'file:');
+})();
+
+// Expose the API as global variables, unless an 'exports'
+// object exists, in that case we assume we're in CommonJS
+if ( typeof exports === "undefined" || typeof require === "undefined" ) {
+	extend(window, QUnit);
+	window.QUnit = QUnit;
+} else {
+	extend(exports, QUnit);
+	exports.QUnit = QUnit;
+}
+
+if ( typeof document === "undefined" || document.readyState === "complete" ) {
+	config.autorun = true;
+}
+
+addEvent(window, "load", function() {
+	// Initialize the config, saving the execution queue
+	var oldconfig = extend({}, config);
+	QUnit.init();
+	extend(config, oldconfig);
+
+	config.blocking = false;
+
+	var userAgent = id("qunit-userAgent");
+	if ( userAgent ) {
+		userAgent.innerHTML = navigator.userAgent;
+	}
+	
+	var toolbar = id("qunit-testrunner-toolbar");
+	if ( toolbar ) {
+		toolbar.style.display = "none";
+		
+		var filter = document.createElement("input");
+		filter.type = "checkbox";
+		filter.id = "qunit-filter-pass";
+		filter.disabled = true;
+		addEvent( filter, "click", function() {
+			var li = document.getElementsByTagName("li");
+			for ( var i = 0; i < li.length; i++ ) {
+				if ( li[i].className.indexOf("pass") > -1 ) {
+					li[i].style.display = filter.checked ? "none" : "";
+				}
+			}
+		});
+		toolbar.appendChild( filter );
+
+		var label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-pass");
+		label.innerHTML = "Hide passed tests";
+		toolbar.appendChild( label );
+
+		var missing = document.createElement("input");
+		missing.type = "checkbox";
+		missing.id = "qunit-filter-missing";
+		missing.disabled = true;
+		addEvent( missing, "click", function() {
+			var li = document.getElementsByTagName("li");
+			for ( var i = 0; i < li.length; i++ ) {
+				if ( li[i].className.indexOf("fail") > -1 && li[i].innerHTML.indexOf('missing test - untested code is broken code') > - 1 ) {
+					li[i].parentNode.parentNode.style.display = missing.checked ? "none" : "block";
+				}
+			}
+		});
+		toolbar.appendChild( missing );
+
+		label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-missing");
+		label.innerHTML = "Hide missing tests (untested code is broken code)";
+		toolbar.appendChild( label );
+	}
+
+	var main = id('main');
+	if ( main ) {
+		config.fixture = main.innerHTML;
+	}
+
+	if ( window.jQuery ) {
+		config.ajaxSettings = window.jQuery.ajaxSettings;
+	}
+
+	QUnit.start();
+});
+
+function done() {
+	if ( config.doneTimer && window.clearTimeout ) {
+		window.clearTimeout( config.doneTimer );
+		config.doneTimer = null;
+	}
+
+	if ( config.queue.length ) {
+		config.doneTimer = window.setTimeout(function(){
+			if ( !config.queue.length ) {
+				done();
+			} else {
+				synchronize( done );
+			}
+		}, 13);
+
+		return;
+	}
+
+	config.autorun = true;
+
+	// Log the last module results
+	if ( config.currentModule ) {
+		QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all );
+	}
+
+	var banner = id("qunit-banner"),
+		tests = id("qunit-tests"),
+		html = ['Tests completed in ',
+		+new Date - config.started, ' milliseconds.<br/>',
+		'<span class="passed">', config.stats.all - config.stats.bad, '</span> tests of <span class="total">', config.stats.all, '</span> passed, <span class="failed">', config.stats.bad,'</span> failed.'].join('');
+
+	if ( banner ) {
+		banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass");
+	}
+
+	if ( tests ) {	
+		var result = id("qunit-testresult");
+
+		if ( !result ) {
+			result = document.createElement("p");
+			result.id = "qunit-testresult";
+			result.className = "result";
+			tests.parentNode.insertBefore( result, tests.nextSibling );
+		}
+
+		result.innerHTML = html;
+	}
+
+	QUnit.done( config.stats.bad, config.stats.all );
+}
+
+function validTest( name ) {
+	var i = config.filters.length,
+		run = false;
+
+	if ( !i ) {
+		return true;
+	}
+	
+	while ( i-- ) {
+		var filter = config.filters[i],
+			not = filter.charAt(0) == '!';
+
+		if ( not ) {
+			filter = filter.slice(1);
+		}
+
+		if ( name.indexOf(filter) !== -1 ) {
+			return !not;
+		}
+
+		if ( not ) {
+			run = true;
+		}
+	}
+
+	return run;
+}
+
+function push(result, actual, expected, message) {
+	message = message || (result ? "okay" : "failed");
+	QUnit.ok( result, result ? message + ": " + expected : message + ", expected: " + QUnit.jsDump.parse(expected) + " result: " + QUnit.jsDump.parse(actual) );
+}
+
+function synchronize( callback ) {
+	config.queue.push( callback );
+
+	if ( config.autorun && !config.blocking ) {
+		process();
+	}
+}
+
+function process() {
+	while ( config.queue.length && !config.blocking ) {
+		config.queue.shift()();
+	}
+}
+
+function saveGlobal() {
+	config.pollution = [];
+	
+	if ( config.noglobals ) {
+		for ( var key in window ) {
+			config.pollution.push( key );
+		}
+	}
+}
+
+function checkPollution( name ) {
+	var old = config.pollution;
+	saveGlobal();
+	
+	var newGlobals = diff( old, config.pollution );
+	if ( newGlobals.length > 0 ) {
+		ok( false, "Introduced global variable(s): " + newGlobals.join(", ") );
+		config.expected++;
+	}
+
+	var deletedGlobals = diff( config.pollution, old );
+	if ( deletedGlobals.length > 0 ) {
+		ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") );
+		config.expected++;
+	}
+}
+
+// returns a new Array with the elements that are in a but not in b
+function diff( a, b ) {
+	var result = a.slice();
+	for ( var i = 0; i < result.length; i++ ) {
+		for ( var j = 0; j < b.length; j++ ) {
+			if ( result[i] === b[j] ) {
+				result.splice(i, 1);
+				i--;
+				break;
+			}
+		}
+	}
+	return result;
+}
+
+function fail(message, exception, callback) {
+	if ( typeof console !== "undefined" && console.error && console.warn ) {
+		console.error(message);
+		console.error(exception);
+		console.warn(callback.toString());
+
+	} else if ( window.opera && opera.postError ) {
+		opera.postError(message, exception, callback.toString);
+	}
+}
+
+function extend(a, b) {
+	for ( var prop in b ) {
+		a[prop] = b[prop];
+	}
+
+	return a;
+}
+
+function addEvent(elem, type, fn) {
+	if ( elem.addEventListener ) {
+		elem.addEventListener( type, fn, false );
+	} else if ( elem.attachEvent ) {
+		elem.attachEvent( "on" + type, fn );
+	} else {
+		fn();
+	}
+}
+
+function id(name) {
+	return !!(typeof document !== "undefined" && document && document.getElementById) &&
+		document.getElementById( name );
+}
+
+// Test for equality any JavaScript type.
+// Discussions and reference: http://philrathe.com/articles/equiv
+// Test suites: http://philrathe.com/tests/equiv
+// Author: Philippe Rathé <prathe@gmail.com>
+QUnit.equiv = function () {
+
+    var innerEquiv; // the real equiv function
+    var callers = []; // stack to decide between skip/abort functions
+
+
+    // Determine what is o.
+    function hoozit(o) {
+        if (QUnit.is("String", o)) {
+            return "string";
+            
+        } else if (QUnit.is("Boolean", o)) {
+            return "boolean";
+
+        } else if (QUnit.is("Number", o)) {
+
+            if (isNaN(o)) {
+                return "nan";
+            } else {
+                return "number";
+            }
+
+        } else if (typeof o === "undefined") {
+            return "undefined";
+
+        // consider: typeof null === object
+        } else if (o === null) {
+            return "null";
+
+        // consider: typeof [] === object
+        } else if (QUnit.is( "Array", o)) {
+            return "array";
+        
+        // consider: typeof new Date() === object
+        } else if (QUnit.is( "Date", o)) {
+            return "date";
+
+        // consider: /./ instanceof Object;
+        //           /./ instanceof RegExp;
+        //          typeof /./ === "function"; // => false in IE and Opera,
+        //                                          true in FF and Safari
+        } else if (QUnit.is( "RegExp", o)) {
+            return "regexp";
+
+        } else if (typeof o === "object") {
+            return "object";
+
+        } else if (QUnit.is( "Function", o)) {
+            return "function";
+        } else {
+            return undefined;
+        }
+    }
+
+    // Call the o related callback with the given arguments.
+    function bindCallbacks(o, callbacks, args) {
+        var prop = hoozit(o);
+        if (prop) {
+            if (hoozit(callbacks[prop]) === "function") {
+                return callbacks[prop].apply(callbacks, args);
+            } else {
+                return callbacks[prop]; // or undefined
+            }
+        }
+    }
+    
+    var callbacks = function () {
+
+        // for string, boolean, number and null
+        function useStrictEquality(b, a) {
+            if (b instanceof a.constructor || a instanceof b.constructor) {
+                // to catch short annotaion VS 'new' annotation of a declaration
+                // e.g. var i = 1;
+                //      var j = new Number(1);
+                return a == b;
+            } else {
+                return a === b;
+            }
+        }
+
+        return {
+            "string": useStrictEquality,
+            "boolean": useStrictEquality,
+            "number": useStrictEquality,
+            "null": useStrictEquality,
+            "undefined": useStrictEquality,
+
+            "nan": function (b) {
+                return isNaN(b);
+            },
+
+            "date": function (b, a) {
+                return hoozit(b) === "date" && a.valueOf() === b.valueOf();
+            },
+
+            "regexp": function (b, a) {
+                return hoozit(b) === "regexp" &&
+                    a.source === b.source && // the regex itself
+                    a.global === b.global && // and its modifers (gmi) ...
+                    a.ignoreCase === b.ignoreCase &&
+                    a.multiline === b.multiline;
+            },
+
+            // - skip when the property is a method of an instance (OOP)
+            // - abort otherwise,
+            //   initial === would have catch identical references anyway
+            "function": function () {
+                var caller = callers[callers.length - 1];
+                return caller !== Object &&
+                        typeof caller !== "undefined";
+            },
+
+            "array": function (b, a) {
+                var i;
+                var len;
+
+                // b could be an object literal here
+                if ( ! (hoozit(b) === "array")) {
+                    return false;
+                }
+
+                len = a.length;
+                if (len !== b.length) { // safe and faster
+                    return false;
+                }
+                for (i = 0; i < len; i++) {
+                    if ( ! innerEquiv(a[i], b[i])) {
+                        return false;
+                    }
+                }
+                return true;
+            },
+
+            "object": function (b, a) {
+                var i;
+                var eq = true; // unless we can proove it
+                var aProperties = [], bProperties = []; // collection of strings
+
+                // comparing constructors is more strict than using instanceof
+                if ( a.constructor !== b.constructor) {
+                    return false;
+                }
+
+                // stack constructor before traversing properties
+                callers.push(a.constructor);
+
+                for (i in a) { // be strict: don't ensures hasOwnProperty and go deep
+
+                    aProperties.push(i); // collect a's properties
+
+                    if ( ! innerEquiv(a[i], b[i])) {
+                        eq = false;
+                        break;
+                    }
+                }
+
+                callers.pop(); // unstack, we are done
+
+                for (i in b) {
+                    bProperties.push(i); // collect b's properties
+                }
+
+                // Ensures identical properties name
+                return eq && innerEquiv(aProperties.sort(), bProperties.sort());
+            }
+        };
+    }();
+
+    innerEquiv = function () { // can take multiple arguments
+        var args = Array.prototype.slice.apply(arguments);
+        if (args.length < 2) {
+            return true; // end transition
+        }
+
+        return (function (a, b) {
+            if (a === b) {
+                return true; // catch the most you can
+            } else if (a === null || b === null || typeof a === "undefined" || typeof b === "undefined" || hoozit(a) !== hoozit(b)) {
+                return false; // don't lose time with error prone cases
+            } else {
+                return bindCallbacks(a, callbacks, [b, a]);
+            }
+
+        // apply transition with (1..n) arguments
+        })(args[0], args[1]) && arguments.callee.apply(this, args.splice(1, args.length -1));
+    };
+
+    return innerEquiv;
+
+}();
+
+/**
+ * jsDump
+ * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
+ * Date: 5/15/2008
+ * @projectDescription Advanced and extensible data dumping for Javascript.
+ * @version 1.0.0
+ * @author Ariel Flesler
+ * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
+ */
+QUnit.jsDump = (function() {
+	function quote( str ) {
+		return '"' + str.toString().replace(/"/g, '\\"') + '"';
+	};
+	function literal( o ) {
+		return o + '';	
+	};
+	function join( pre, arr, post ) {
+		var s = jsDump.separator(),
+			base = jsDump.indent(),
+			inner = jsDump.indent(1);
+		if ( arr.join )
+			arr = arr.join( ',' + s + inner );
+		if ( !arr )
+			return pre + post;
+		return [ pre, inner + arr, base + post ].join(s);
+	};
+	function array( arr ) {
+		var i = arr.length,	ret = Array(i);					
+		this.up();
+		while ( i-- )
+			ret[i] = this.parse( arr[i] );				
+		this.down();
+		return join( '[', ret, ']' );
+	};
+	
+	var reName = /^function (\w+)/;
+	
+	var jsDump = {
+		parse:function( obj, type ) { //type is used mostly internally, you can fix a (custom)type in advance
+			var	parser = this.parsers[ type || this.typeOf(obj) ];
+			type = typeof parser;			
+			
+			return type == 'function' ? parser.call( this, obj ) :
+				   type == 'string' ? parser :
+				   this.parsers.error;
+		},
+		typeOf:function( obj ) {
+			var type;
+			if ( obj === null ) {
+				type = "null";
+			} else if (typeof obj === "undefined") {
+				type = "undefined";
+			} else if (QUnit.is("RegExp", obj)) {
+				type = "regexp";
+			} else if (QUnit.is("Date", obj)) {
+				type = "date";
+			} else if (QUnit.is("Function", obj)) {
+				type = "function";
+			} else if (QUnit.is("Array", obj)) {
+				type = "array";
+			} else if (QUnit.is("Window", obj) || QUnit.is("global", obj)) {
+				type = "window";
+			} else if (QUnit.is("HTMLDocument", obj)) {
+				type = "document";
+			} else if (QUnit.is("HTMLCollection", obj) || QUnit.is("NodeList", obj)) {
+				type = "nodelist";
+			} else if (/^\[object HTML/.test(Object.prototype.toString.call( obj ))) {
+				type = "node";
+			} else {
+				type = typeof obj;
+			}
+			return type;
+		},
+		separator:function() {
+			return this.multiline ?	this.HTML ? '<br />' : '\n' : this.HTML ? '&nbsp;' : ' ';
+		},
+		indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing
+			if ( !this.multiline )
+				return '';
+			var chr = this.indentChar;
+			if ( this.HTML )
+				chr = chr.replace(/\t/g,'   ').replace(/ /g,'&nbsp;');
+			return Array( this._depth_ + (extra||0) ).join(chr);
+		},
+		up:function( a ) {
+			this._depth_ += a || 1;
+		},
+		down:function( a ) {
+			this._depth_ -= a || 1;
+		},
+		setParser:function( name, parser ) {
+			this.parsers[name] = parser;
+		},
+		// The next 3 are exposed so you can use them
+		quote:quote, 
+		literal:literal,
+		join:join,
+		//
+		_depth_: 1,
+		// This is the list of parsers, to modify them, use jsDump.setParser
+		parsers:{
+			window: '[Window]',
+			document: '[Document]',
+			error:'[ERROR]', //when no parser is found, shouldn't happen
+			unknown: '[Unknown]',
+			'null':'null',
+			undefined:'undefined',
+			'function':function( fn ) {
+				var ret = 'function',
+					name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE
+				if ( name )
+					ret += ' ' + name;
+				ret += '(';
+				
+				ret = [ ret, this.parse( fn, 'functionArgs' ), '){'].join('');
+				return join( ret, this.parse(fn,'functionCode'), '}' );
+			},
+			array: array,
+			nodelist: array,
+			arguments: array,
+			object:function( map ) {
+				var ret = [ ];
+				this.up();
+				for ( var key in map )
+					ret.push( this.parse(key,'key') + ': ' + this.parse(map[key]) );
+				this.down();
+				return join( '{', ret, '}' );
+			},
+			node:function( node ) {
+				var open = this.HTML ? '&lt;' : '<',
+					close = this.HTML ? '&gt;' : '>';
+					
+				var tag = node.nodeName.toLowerCase(),
+					ret = open + tag;
+					
+				for ( var a in this.DOMAttrs ) {
+					var val = node[this.DOMAttrs[a]];
+					if ( val )
+						ret += ' ' + a + '=' + this.parse( val, 'attribute' );
+				}
+				return ret + close + open + '/' + tag + close;
+			},
+			functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function
+				var l = fn.length;
+				if ( !l ) return '';				
+				
+				var args = Array(l);
+				while ( l-- )
+					args[l] = String.fromCharCode(97+l);//97 is 'a'
+				return ' ' + args.join(', ') + ' ';
+			},
+			key:quote, //object calls it internally, the key part of an item in a map
+			functionCode:'[code]', //function calls it internally, it's the content of the function
+			attribute:quote, //node calls it internally, it's an html attribute value
+			string:quote,
+			date:quote,
+			regexp:literal, //regex
+			number:literal,
+			'boolean':literal
+		},
+		DOMAttrs:{//attributes to dump from nodes, name=>realName
+			id:'id',
+			name:'name',
+			'class':'className'
+		},
+		HTML:true,//if true, entities are escaped ( <, >, \t, space and \n )
+		indentChar:'   ',//indentation unit
+		multiline:true //if true, items in a collection, are separated by a \n, else just a space.
+	};
+
+	return jsDump;
+})();
+
+})(this);
diff --git a/samples/AroundMe/AroundMeTests/Web/QUnitExt.js b/samples/AroundMe/AroundMeTests/Web/QUnitExt.js
new file mode 100644
index 000000000..2e268d688
--- /dev/null
+++ b/samples/AroundMe/AroundMeTests/Web/QUnitExt.js
@@ -0,0 +1,59 @@
+(function() {
+  var currentModule = null;
+  var logData = '';
+  
+  function appendLog(logText) {
+    logData = logData + logText + '\r\n';
+
+    var logHolder = document.getElementById('qunit-log');
+    if (logHolder) {
+      logHolder.value = logData;
+    }
+  }
+  
+  QUnit.log = function(result, message) {
+    if (arguments.length === 1) {
+      message = arguments[0];
+    }
+    appendLog('    ' + message);
+  }
+
+  QUnit.done = function(failures, total) {
+      appendLog('\r\nCompleted; ' + 'failures = ' + failures + '; total = ' + total);
+
+      var logUrl = '/log/' + ((failures === 0) ? 'success' : 'failure');
+      var xhr = new XMLHttpRequest();
+      xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+          window.open('', '_self', '');
+          window.close();
+        }
+      };
+      xhr.open('POST', logUrl, /* async */ false);
+      xhr.setRequestHeader('Content-Type', 'text/plain');
+      xhr.send(logData);
+  }
+
+  QUnit.testStart = function(name) {
+    appendLog('  Test Started: ' + name);
+  }
+  
+  QUnit.testDone = function(name, failures, total) {
+    appendLog('  Test Done: ' + name + '; failures = ' + failures + '; total = ' + total);
+    appendLog('');
+  }
+
+  QUnit.moduleStart = function(name, testEnv) {
+    currentModule = name;
+    appendLog('Module Started: ' + name);
+  }
+
+  QUnit.moduleDone = function(name, failures, total) {
+    if (name === currentModule) {
+      appendLog('Module Done: ' + name + '; failures = ' + failures + '; total = ' + total + '\r\n');
+      appendLog('');
+      appendLog('');
+    }
+    currentModule = null;
+  }
+})();
diff --git a/samples/AroundMe/AroundMeTests/packages.config b/samples/AroundMe/AroundMeTests/packages.config
new file mode 100644
index 000000000..753b9e2a5
--- /dev/null
+++ b/samples/AroundMe/AroundMeTests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp.Testing" version="0.7.5.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/AroundMe/MapDemo/Map.htm b/samples/AroundMe/MapDemo/Map.htm
new file mode 100644
index 000000000..bb66498bb
--- /dev/null
+++ b/samples/AroundMe/MapDemo/Map.htm
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Bing Maps Demo</title>
+</head>
+<body>
+  <div style="display: block; padding: 4px; border: solid 1px silver">
+    <div id="map" style="width: 640px; height: 480px" data-credentials="AvROonkHlY0PHW8zAWDFW5JX8tMeSxzUlkR23_uGzUpeGzrJxf-8tSxAvQmO_5PX"></div>
+  </div>
+
+  <br />
+
+  <button type="button" id="locateMeButton" style="font-family: 'Segoe UI', Tahoma; font-size: 10pt">Locate Me</button>
+
+  <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0"></script>
+  <script type="text/javascript" src="mscorlib.debug.js"></script>
+  <script type="text/javascript" src="MapDemo.debug.js"></script>
+</body>
+</html>
diff --git a/samples/AroundMe/MapDemo/MapApplication.cs b/samples/AroundMe/MapDemo/MapApplication.cs
new file mode 100644
index 000000000..278df9f46
--- /dev/null
+++ b/samples/AroundMe/MapDemo/MapApplication.cs
@@ -0,0 +1,18 @@
+// MapApplication.cs
+//
+
+using System;
+using System.Html;
+
+namespace MapDemo {
+
+    internal static class MapApplication {
+
+        static MapApplication() {
+            Window.AddEventListener("load", delegate(ElementEvent e) {
+                MapPage page = new MapPage();
+                page.Run();
+            }, /* useCapture */ false);
+        }
+    }
+}
diff --git a/samples/AroundMe/MapDemo/MapDemo.csproj b/samples/AroundMe/MapDemo/MapDemo.csproj
new file mode 100644
index 000000000..8e7e73c4a
--- /dev/null
+++ b/samples/AroundMe/MapDemo/MapDemo.csproj
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2176DBB5-D8FD-493C-B896-59E7283E7127}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>MapDemo</RootNamespace>
+    <AssemblyName>MapDemo</AssemblyName>
+    <ScriptTemplate>Properties\Script.template</ScriptTemplate>
+    <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateScript>True</GenerateScript>
+    <GenerateResources>True</GenerateResources>
+    <RestoreNugetPackages>true</RestoreNugetPackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Debug\MapDemo.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Release\MapDemo.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Properties\FxCop.ruleset" />
+    <None Include="Properties\Script.template" />
+    <Compile Include="MapApplication.cs" />
+    <Compile Include="MapPage.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Script.Microsoft.BingMaps">
+      <HintPath>..\packages\ScriptSharp.Lib.BingMaps.0.7.5.0\lib\Script.Microsoft.BingMaps.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.Web">
+      <HintPath>..\packages\ScriptSharp.Lib.HTML.0.7.5.0\lib\Script.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Map.htm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets" Condition="Exists('..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets')" />
+  <Import Project="..\packages\nuget.targets" />
+</Project>
\ No newline at end of file
diff --git a/samples/AroundMe/MapDemo/MapPage.cs b/samples/AroundMe/MapDemo/MapPage.cs
new file mode 100644
index 000000000..843dac4e9
--- /dev/null
+++ b/samples/AroundMe/MapDemo/MapPage.cs
@@ -0,0 +1,118 @@
+// MapPage.cs
+//
+
+using System;
+using System.Collections;
+using System.Html;
+using Microsoft.Maps;
+using Microsoft.Maps.Location;
+using Microsoft.Maps.Traffic;
+using Microsoft.Maps.VenueMaps;
+
+namespace MapDemo {
+
+    internal sealed class MapPage {
+
+        private Map _map;
+        private MapPushpin _pushpin;
+        private MapInfobox _infobox;
+
+        public void Run() {
+            Element rootElement = Document.GetElementById("map");
+            
+            MapOptions mapOptions = new MapOptions();
+            mapOptions.Credentials = (string)rootElement.GetAttribute("data-credentials");
+            mapOptions.Width = 640;
+            mapOptions.Height = 480;
+            mapOptions.ShowCopyright = false;
+            mapOptions.ShowMapTypeSelector = false;
+            mapOptions.ShowLogo = false;
+            mapOptions.ShowScalebar = false;
+            mapOptions.ShowNavControl = false;
+            mapOptions.ShowDashboard = false;
+            mapOptions.Center = new MapLocation(47.610377, -122.2006786);
+            mapOptions.Zoom = 10;
+            mapOptions.MapType = MapType.Road;
+
+            MapPushpinOptions pushpinOptions = new MapPushpinOptions();
+            _pushpin = new MapPushpin(mapOptions.Center, pushpinOptions);
+
+            MapInfoboxOptions infoboxOptions = new MapInfoboxOptions();
+            infoboxOptions.Title = "Bellevue";
+            infoboxOptions.Visible = false;
+            infoboxOptions.Offset = new MapPoint(0, 20);
+            infoboxOptions.Height = 48;
+            infoboxOptions.Width = 80;
+            infoboxOptions.ShowCloseButton = false;
+            _infobox = new MapInfobox(mapOptions.Center, infoboxOptions);
+
+            _map = new Map(rootElement, mapOptions);
+            _map.Entities.Push(_pushpin);
+            _map.Entities.Push(_infobox);
+
+            MapEvents.AddHandler(_pushpin, "click", OnPushpinClick);
+            MapEvents.AddHandler(_map, "viewchange", OnViewChanged);
+
+            MapModuleOptions trafficOptions = new MapModuleOptions();
+            trafficOptions.Callback = delegate() {
+                TrafficLayer trafficLayer = new TrafficLayer(_map);
+                trafficLayer.Show();
+            };
+            Map.LoadModule(MapModule.Traffic, trafficOptions);
+
+            MapModuleOptions venueMapOptions = new MapModuleOptions();
+            venueMapOptions.Callback = delegate() {
+                VenueMapFactory venueMapFactory = new VenueMapFactory(_map);
+
+                VenueMapSearchOptions searchOptions = new VenueMapSearchOptions();
+                searchOptions.Map = _map;
+                searchOptions.Location = mapOptions.Center;
+                searchOptions.Radius = 1000;
+                searchOptions.Callback = delegate(Venue[] venues) {
+                    if (venues.Length != 0) {
+                        VenueMapOptions venueOptions = new VenueMapOptions();
+                        venueOptions.VenueMapID = venues[0].Metadata.ID;
+                        venueOptions.SuccessCallback = delegate(VenueMap venueMap, VenueMapOptions options) {
+
+                            venueMap.Show();
+                            if (Script.Confirm("Zoom to " + venueMap.Name + "?")) {
+                                _map.SetView(venueMap.BestMapView);
+                            }
+                        };
+
+                        venueMapFactory.Create(venueOptions);
+                    }
+                };
+
+                venueMapFactory.Search(searchOptions);
+            };
+            Map.LoadModule(MapModule.VenueMaps, venueMapOptions);
+
+            Element locateMeButton = Document.GetElementById("locateMeButton");
+            locateMeButton.AddEventListener("click", OnLocateMeClick, false);
+        }
+
+        private void OnLocateMeClick(ElementEvent e) {
+            GeoLocationProvider geoLocationProvider = new GeoLocationProvider(_map);
+
+            GeoLocationOptions options = new GeoLocationOptions();
+            options.UpdateMapView = true;
+
+            geoLocationProvider.GetCurrentPosition(options);
+        }
+
+        private void OnPushpinClick(EventArgs e) {
+            MapInfoboxOptions options = new MapInfoboxOptions();
+            options.Visible = true;
+
+            _infobox.SetOptions(options);
+        }
+
+        private void OnViewChanged(EventArgs e) {
+            MapInfoboxOptions options = new MapInfoboxOptions();
+            options.Visible = false;
+
+            _infobox.SetOptions(options);
+        }
+    }
+}
diff --git a/samples/AroundMe/MapDemo/Properties/AssemblyInfo.cs b/samples/AroundMe/MapDemo/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..cd6b0d34b
--- /dev/null
+++ b/samples/AroundMe/MapDemo/Properties/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("MapDemo")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script# Samples")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("MapDemo")]
diff --git a/samples/AroundMe/MapDemo/Properties/FxCop.ruleset b/samples/AroundMe/MapDemo/Properties/FxCop.ruleset
new file mode 100644
index 000000000..47c160f61
--- /dev/null
+++ b/samples/AroundMe/MapDemo/Properties/FxCop.ruleset
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Script# Rules" Description="General Script Rules" ToolsVersion="10.0">
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1000" Action="Warning" />
+    <Rule Id="CA1001" Action="Warning" />
+    <Rule Id="CA1008" Action="Warning" />
+    <Rule Id="CA1009" Action="Warning" />
+    <Rule Id="CA1010" Action="Warning" />
+    <Rule Id="CA1011" Action="Warning" />
+    <Rule Id="CA1012" Action="Warning" />
+    <Rule Id="CA1013" Action="Warning" />
+    <Rule Id="CA1016" Action="Warning" />
+    <Rule Id="CA1018" Action="Warning" />
+    <Rule Id="CA1019" Action="Warning" />
+    <Rule Id="CA1020" Action="Warning" />
+    <Rule Id="CA1021" Action="Warning" />
+    <Rule Id="CA1023" Action="Warning" />
+    <Rule Id="CA1024" Action="Warning" />
+    <Rule Id="CA1026" Action="Warning" />
+    <Rule Id="CA1027" Action="Warning" />
+    <Rule Id="CA1028" Action="Warning" />
+    <Rule Id="CA1030" Action="Warning" />
+    <Rule Id="CA1032" Action="Warning" />
+    <Rule Id="CA1033" Action="Warning" />
+    <Rule Id="CA1034" Action="Warning" />
+    <Rule Id="CA1036" Action="Warning" />
+    <Rule Id="CA1040" Action="Warning" />
+    <Rule Id="CA1041" Action="Warning" />
+    <Rule Id="CA1043" Action="Warning" />
+    <Rule Id="CA1044" Action="Warning" />
+    <Rule Id="CA1045" Action="Warning" />
+    <Rule Id="CA1046" Action="Warning" />
+    <Rule Id="CA1047" Action="Warning" />
+    <Rule Id="CA1048" Action="Warning" />
+    <Rule Id="CA1052" Action="Warning" />
+    <Rule Id="CA1053" Action="Warning" />
+    <Rule Id="CA1058" Action="Warning" />
+    <Rule Id="CA1059" Action="Warning" />
+    <Rule Id="CA1061" Action="Warning" />
+    <Rule Id="CA1065" Action="Warning" />
+    <Rule Id="CA1500" Action="Warning" />
+    <Rule Id="CA1501" Action="Warning" />
+    <Rule Id="CA1502" Action="Warning" />
+    <Rule Id="CA1504" Action="Warning" />
+    <Rule Id="CA1505" Action="Warning" />
+    <Rule Id="CA1506" Action="Warning" />
+    <Rule Id="CA1700" Action="Warning" />
+    <Rule Id="CA1701" Action="Warning" />
+    <Rule Id="CA1702" Action="Warning" />
+    <Rule Id="CA1703" Action="Warning" />
+    <Rule Id="CA1704" Action="Warning" />
+    <Rule Id="CA1707" Action="Warning" />
+    <Rule Id="CA1708" Action="Warning" />
+    <Rule Id="CA1709" Action="Warning" />
+    <Rule Id="CA1710" Action="Warning" />
+    <Rule Id="CA1711" Action="Warning" />
+    <Rule Id="CA1712" Action="Warning" />
+    <Rule Id="CA1713" Action="Warning" />
+    <Rule Id="CA1714" Action="Warning" />
+    <Rule Id="CA1715" Action="Warning" />
+    <Rule Id="CA1716" Action="Warning" />
+    <Rule Id="CA1717" Action="Warning" />
+    <Rule Id="CA1719" Action="Warning" />
+    <Rule Id="CA1720" Action="Warning" />
+    <Rule Id="CA1721" Action="Warning" />
+    <Rule Id="CA1722" Action="Warning" />
+    <Rule Id="CA1724" Action="Warning" />
+    <Rule Id="CA1725" Action="Warning" />
+    <Rule Id="CA1726" Action="Warning" />
+    <Rule Id="CA1800" Action="Warning" />
+    <Rule Id="CA1801" Action="Warning" />
+    <Rule Id="CA1802" Action="Warning" />
+    <Rule Id="CA1804" Action="Warning" />
+    <Rule Id="CA1806" Action="Warning" />
+    <Rule Id="CA1809" Action="Warning" />
+    <Rule Id="CA1811" Action="Warning" />
+    <Rule Id="CA1812" Action="Warning" />
+    <Rule Id="CA1813" Action="Warning" />
+    <Rule Id="CA1814" Action="Warning" />
+    <Rule Id="CA1815" Action="Warning" />
+    <Rule Id="CA1819" Action="Warning" />
+    <Rule Id="CA1820" Action="Warning" />
+    <Rule Id="CA1821" Action="Warning" />
+    <Rule Id="CA2201" Action="Warning" />
+    <Rule Id="CA2202" Action="Warning" />
+    <Rule Id="CA2204" Action="Warning" />
+    <Rule Id="CA2207" Action="Warning" />
+    <Rule Id="CA2213" Action="Warning" />
+    <Rule Id="CA2214" Action="Warning" />
+    <Rule Id="CA2215" Action="Warning" />
+    <Rule Id="CA2217" Action="Warning" />
+    <Rule Id="CA2218" Action="Warning" />
+    <Rule Id="CA2219" Action="Warning" />
+    <Rule Id="CA2222" Action="Warning" />
+    <Rule Id="CA2223" Action="Warning" />
+    <Rule Id="CA2224" Action="Warning" />
+    <Rule Id="CA2226" Action="Warning" />
+    <Rule Id="CA2227" Action="Warning" />
+    <Rule Id="CA2233" Action="Warning" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/samples/AroundMe/MapDemo/Properties/Script.template b/samples/AroundMe/MapDemo/Properties/Script.template
new file mode 100644
index 000000000..d0fad56de
--- /dev/null
+++ b/samples/AroundMe/MapDemo/Properties/Script.template
@@ -0,0 +1,8 @@
+//! #= ScriptFile ##
+//
+
+(function() {
+#include[as-is] "%code%"
+})();
+
+//! This script was generated using Script# v#= CompilerVersion ##
diff --git a/samples/AroundMe/MapDemo/packages.config b/samples/AroundMe/MapDemo/packages.config
new file mode 100644
index 000000000..a7a59cc42
--- /dev/null
+++ b/samples/AroundMe/MapDemo/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp" version="0.7.5.1" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.BingMaps" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.HTML" version="0.7.5.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/AroundMe/Twitter/Properties/AssemblyInfo.cs b/samples/AroundMe/Twitter/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..80fc9acb6
--- /dev/null
+++ b/samples/AroundMe/Twitter/Properties/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Twitter")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script# Samples")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("Twitter")]
diff --git a/samples/AroundMe/Twitter/Properties/ScriptInfo.txt b/samples/AroundMe/Twitter/Properties/ScriptInfo.txt
new file mode 100644
index 000000000..802afb692
--- /dev/null
+++ b/samples/AroundMe/Twitter/Properties/ScriptInfo.txt
@@ -0,0 +1,12 @@
+Script Information
+===============================================================================
+
+This assembly provides access to script APIs. This is only meant for use at
+development time, so you can reference and compile your c# code against the
+script APIs. You must include the appropriate scripts in your page for
+runtime functionality.
+
+# TODO: You can use this file to describe which version of the script
+#       your import library is based on, the URLs of associated scripts
+#       or any particular usage information for including those scripts
+#       into the application.
diff --git a/samples/AroundMe/Twitter/Twitter.cs b/samples/AroundMe/Twitter/Twitter.cs
new file mode 100644
index 000000000..291e1b475
--- /dev/null
+++ b/samples/AroundMe/Twitter/Twitter.cs
@@ -0,0 +1,124 @@
+// Twitter.cs
+//
+
+// https://dev.twitter.com/anywhere/begin
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace TwitterApi {
+
+    public delegate void TwitterCallback(TwitterObject twitterObject);
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("twttr")]
+    public static class Twitter {
+
+        public static void Anywhere(TwitterCallback callback) {
+        }
+    }
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class TweetBoxOptions {
+
+        public TweetBoxOptions() {
+        }
+
+        public TweetBoxOptions(params object[] nameValuePairs) {
+        }
+
+        [IntrinsicProperty]
+        public bool Counter {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        public TweetBoxData Data {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        public string DefaultContent {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        public int Height {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        public string Label {
+            get;
+            set;
+        }
+
+        [ScriptName("onTweet")]
+        [IntrinsicProperty]
+        public TweetCallback Callback {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        public int Width {
+            get;
+            set;
+        }
+    }
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class TweetBoxData {
+
+        public TweetBoxData() {
+        }
+
+        public TweetBoxData(params object[] nameValuePairs) {
+        }
+
+        [ScriptName("lat")]
+        [IntrinsicProperty]
+        public double Latitude {
+            get;
+            set;
+        }
+
+        [ScriptName("lon")]
+        [IntrinsicProperty]
+        public double Longitude {
+            get;
+            set;
+        }
+    }
+
+
+    public delegate void TweetCallback(string text, string htmlText);
+
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class TwitterObject {
+
+        private TwitterObject() {
+        }
+
+        public void TweetBox() {
+        }
+
+        public void TweetBox(TweetBoxOptions options) {
+        }
+
+        [ScriptName("")]
+        public TwitterObject Select(string selector) {
+            return null;
+        }
+    }
+}
diff --git a/samples/AroundMe/Twitter/Twitter.csproj b/samples/AroundMe/Twitter/Twitter.csproj
new file mode 100644
index 000000000..171fb0894
--- /dev/null
+++ b/samples/AroundMe/Twitter/Twitter.csproj
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{476312F9-5403-4C3A-848A-0F31213FC72E}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <FileAlignment>512</FileAlignment>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TwitterApi</RootNamespace>
+    <AssemblyName>Twitter</AssemblyName>
+    <RestoreNugetPackages>true</RestoreNugetPackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <DocumentationFile>bin\Debug\Twitter.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>
+    </DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <DocumentationFile>bin\Release\Twitter.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Twitter.cs" />
+    <ScriptInfo Include="Properties\ScriptInfo.txt" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Script.Web">
+      <HintPath>..\packages\ScriptSharp.Lib.HTML.0.7.5.0\lib\Script.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(ScriptInfo)" DestinationFiles="$(OutputPath)$(AssemblyName).txt" />
+  </Target>
+  <Import Project="..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets" Condition="Exists('..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets')" />
+  <Import Project="..\packages\nuget.targets" />
+</Project>
\ No newline at end of file
diff --git a/samples/AroundMe/Twitter/packages.config b/samples/AroundMe/Twitter/packages.config
new file mode 100644
index 000000000..794c9675d
--- /dev/null
+++ b/samples/AroundMe/Twitter/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp" version="0.7.5.1" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.HTML" version="0.7.5.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/AroundMe/packages/nuget.exe b/samples/AroundMe/packages/nuget.exe
new file mode 100644
index 000000000..e313ff958
Binary files /dev/null and b/samples/AroundMe/packages/nuget.exe differ
diff --git a/samples/AroundMe/packages/nuget.targets b/samples/AroundMe/packages/nuget.targets
new file mode 100644
index 000000000..51fc72bd2
--- /dev/null
+++ b/samples/AroundMe/packages/nuget.targets
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <RestoreNugetPackages Condition="'$(RestoreNugetPackages)' == ''">false</RestoreNugetPackages>
+    <PackagesDir>$([System.IO.Directory]::GetParent($(MSBuildThisFileDirectory)))</PackagesDir>
+    <RestoreCommand>$(MSBuildThisFileDirectory)nuget.exe install "$(MSBuildProjectDirectory)\packages.config" -o "$(PackagesDir)"</RestoreCommand>
+    <BuildDependsOn Condition="$(RestoreNugetPackages) == 'true'">
+      RestorePackages;
+      $(BuildDependsOn);
+    </BuildDependsOn>
+  </PropertyGroup>
+
+  <Target Name="RestorePackages">
+    <Exec Command="$(RestoreCommand)" LogStandardErrorAsError="true" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/samples/AroundMe/packages/repositories.config b/samples/AroundMe/packages/repositories.config
new file mode 100644
index 000000000..e003ad5ea
--- /dev/null
+++ b/samples/AroundMe/packages/repositories.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+  <repository path="..\AroundMe\packages.config" />
+  <repository path="..\AroundMeTests\packages.config" />
+  <repository path="..\MapDemo\packages.config" />
+  <repository path="..\Twitter\packages.config" />
+</repositories>
\ No newline at end of file
diff --git a/samples/FishTank/Fish.cs b/samples/FishTank/Fish.cs
new file mode 100644
index 000000000..cf2e66b7a
--- /dev/null
+++ b/samples/FishTank/Fish.cs
@@ -0,0 +1,197 @@
+// Fish.cs
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Html;
+using System.Html.Media.Graphics;
+
+namespace FishTankApp {
+
+    internal sealed class Fish {
+
+        private FishTank _tank;
+
+        private double _angle;
+        private double _xAngle;
+        private double _yAngle;
+        private double _zAngle;
+        private double _scale;
+        private double _velocity;
+        private int _flip;
+        private int _cellReverse;
+
+        private int _cellIndex;
+        private int _species;
+
+        private double _x;
+        private double _y;
+        private double _z;
+        private double _zFactor;
+
+        private ImageElement _fishStrip;
+        private CanvasContext2D _context;
+
+        public Fish(FishTank tank, double x, double y, double z, ImageElement fishStrip, CanvasContext2D context) {
+            _tank = tank;
+
+            _x = x;
+            _y = y;
+            _z = z;
+            _zFactor = 1;
+            _species = Math.Floor(Math.Random() * FishTank.FishSpecies);
+            _cellIndex = Math.Floor(Math.Random() * (FishTank.CellsInFishStrip - 1));
+            _cellReverse = -1;
+
+            _angle = 2 * Math.PI * Math.Random();
+            _xAngle = Math.Cos(_angle);
+            _yAngle = Math.Sin(_angle);
+            _zAngle = 1 - 2 * Math.Round(Math.Random());
+            _scale = 0.1;
+            _flip = 1;
+            _velocity = 100;
+
+            // Stop fish from swimming straight up or down
+            if ((_angle > Math.PI * 4 / 3) && (_angle < Math.PI * 5 / 3) ||
+                (_angle > Math.PI * 1 / 3) && (_angle < Math.PI * 2 / 3)) {
+                _angle = Math.PI * 1 / 3 * Math.Random();
+                _xAngle = Math.Cos(_angle);
+                _yAngle = Math.Sin(_angle);
+            }
+
+            // Face the fish the right way if angle is between 6 o'clock and 12 o'clock
+            if ((_angle > Math.PI / 2) && (_angle < Math.PI / 2 * 3)) {
+                _flip = -1;
+            }
+
+            _fishStrip = fishStrip;
+            _context = context;
+        }
+
+        public void Update() {
+            // Calculate next position of fish
+            double fps = FishTank.FramesPerSecond;
+            _velocity = Math.Max(Math.Floor(fps * fps * .5 / 3), 1);
+
+            double nextX = _x + _xAngle * _velocity * FishTank.TimeDelta;
+            double nextY = _y + _yAngle * _velocity * FishTank.TimeDelta;
+            double nextZ = _z + _zAngle * .1 * _velocity * FishTank.TimeDelta;
+            double nextScale = Math.Abs(nextZ) / (FishTank.ZFar - FishTank.ZNear);
+
+            // If fish is going to move off right side of screen
+            if (nextX + FishTank.FishWidth / 2 * _scale > _tank.Width) {
+                // If angle is between 3 o'clock and 6 o'clock
+                if ((_angle >= 0 && _angle < Math.PI / 2)) {
+                    _angle = Math.PI - _angle;
+                    _xAngle = Math.Cos(_angle);
+                    _yAngle = Math.Sin(_angle) * Math.Random();
+                    _flip = -_flip;
+                }
+                else if (_angle > Math.PI / 2 * 3) {
+                    // If angle is between 12 o'clock and 3 o'clock
+                    _angle = _angle - (_angle - Math.PI / 2 * 3) * 2;
+                    _xAngle = Math.Cos(_angle);
+                    _yAngle = Math.Sin(_angle) * Math.Random();
+                    _flip = -_flip;
+                }
+            }
+
+            // If fish is going to move off left side of screen
+            if (nextX - FishTank.FishWidth / 2 * _scale < 0) {
+                if ((_angle > Math.PI / 2 && _angle < Math.PI)) {
+                    // If angle is between 6 o'clock and 9 o'clock
+                    _angle = Math.PI - _angle;
+                    _xAngle = Math.Cos(_angle);
+                    _yAngle = Math.Sin(_angle) * Math.Random();
+                    _flip = -_flip;
+                }
+                else if (_angle > Math.PI && _angle < Math.PI / 2 * 3) {
+                    // If angle is between 9 o'clock and 12 o'clock
+                    _angle = _angle + (Math.PI / 2 * 3 - _angle) * 2;
+                    _xAngle = Math.Cos(_angle);
+                    _yAngle = Math.Sin(_angle) * Math.Random();
+                    _flip = -_flip;
+                }
+            }
+
+            // If fish is going to move off bottom side of screen
+            if (nextY + FishTank.FishHeight / 2 * _scale > _tank.Height) {
+                // If angle is between 3 o'clock and 9 o'clock
+                if ((_angle > 0 && _angle < Math.PI)) {
+                    _angle = Math.PI * 2 - _angle;
+                    _xAngle = Math.Cos(_angle);
+                    _yAngle = Math.Sin(_angle) * Math.Random();
+                }
+            }
+
+            // If fish is going to move off top side of screen
+            if (nextY - FishTank.FishHeight / 2 * _scale < 0) {
+                // If angle is between 9 o'clock and 3 o'clock
+                if ((_angle > Math.PI && _angle < Math.PI * 2)) {
+                    _angle = _angle - (_angle - Math.PI) * 2;
+                    _xAngle = Math.Cos(_angle);
+                    _yAngle = Math.Sin(_angle);
+                }
+            }
+
+            // If fish is going too far (getting too small)
+            if (nextZ <= FishTank.ZNear && _zAngle < 0) {
+                _zAngle = -_zAngle;
+            }
+
+            // If fish is getting to close (getting too large)
+            if (((_tank.Width / FishTank.FishWidth) * 10) < ((FishTank.FishWidth * FishTank.FishCount) / _tank.Width)) {
+                _zFactor = .3;
+            }
+            else if (((_tank.Width / FishTank.FishWidth) * 2) < ((FishTank.FishWidth * FishTank.FishCount) / _tank.Width)) {
+                _zFactor = .5;
+            }
+            else {
+                _zFactor = 1;
+            }
+
+            if (nextZ >= FishTank.ZFar * _zFactor && _zAngle > 0) {
+                _zAngle = -_zAngle;
+            }
+
+            if (_scale < .1) {
+                // Don't let fish get too tiny
+                _scale = .1;
+            }
+
+            // Draw the fish
+            _context.Save();
+
+            // Move the fish to where it is within the fish tank
+            _context.Translate(_x, _y);
+
+            // Make the fish bigger or smaller depending on how far away it is.
+            _context.Scale(_scale, _scale);
+
+            // Make the fish face the way it is swimming.
+            _context.Transform(_flip, 0, 0, 1, 0, 0);
+
+            _context.DrawImage(_fishStrip,
+                               FishTank.FishWidth * _cellIndex, FishTank.FishHeight * _species,
+                               FishTank.FishWidth, FishTank.FishHeight,
+                               -FishTank.FishWidth / 2, -FishTank.FishHeight / 2,
+                               FishTank.FishWidth, FishTank.FishHeight);
+            _context.Restore();
+
+            // Increment to next state
+            _x = nextX;
+            _y = nextY;
+            _z = nextZ;
+            _scale = nextScale;
+
+            if ((_cellIndex >= FishTank.CellsInFishStrip - 1) || (_cellIndex <= 0)) {
+                // Go through each cell in the animation
+                _cellReverse = -_cellReverse;
+            }
+
+            // Go back down once we hit the end of the animation
+            _cellIndex = _cellIndex + _cellReverse;
+        }
+    }
+}
diff --git a/samples/FishTank/FishSprites.png b/samples/FishTank/FishSprites.png
new file mode 100644
index 000000000..490ddb428
Binary files /dev/null and b/samples/FishTank/FishSprites.png differ
diff --git a/samples/FishTank/FishTank.cs b/samples/FishTank/FishTank.cs
new file mode 100644
index 000000000..e2af6a170
--- /dev/null
+++ b/samples/FishTank/FishTank.cs
@@ -0,0 +1,138 @@
+// FishTank.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Html;
+using System.Html.Media.Graphics;
+
+namespace FishTankApp {
+
+    internal sealed class FishTank {
+
+        public const int RefreshInterval = 60;
+        public const int BackgroundImageWidth = 981;
+        public const int BackgroundImageHeight = 767;
+        public const int FishWidth = 307;
+        public const int FishHeight = 313;
+        public const int FishCount = 20;
+        public const int FishSpecies = 3;
+        public const int CellsInFishStrip = 16;
+
+        public const int FramesPerSecond = 60;
+        public const double TimeDelta = 1.0 / FramesPerSecond;
+        public const double ZFar = 100;
+        public const double ZNear = 1;
+        public const double ZClose = 1;
+
+
+        private ImageElement _backgroundImageElement;
+        private ImageElement _imageStripElement;
+
+        private CanvasElement _tankCanvas;
+        private CanvasElement _fishesCanvas;
+
+        private CanvasContext2D _tankCanvasContext;
+        private CanvasContext2D _fishesCanvasContext;
+
+        private List<Fish> _fishes;
+
+        private int _width;
+        private int _height;
+
+        private Action _tickHandler;
+
+        public int Height {
+            get {
+                return _height;
+            }
+        }
+
+        public int Width {
+            get {
+                return _width;
+            }
+        }
+
+        public void Run() {
+            _backgroundImageElement = Document.GetElementById("backgroundImage").As<ImageElement>();
+            _imageStripElement = Document.GetElementById("imageStrip").As<ImageElement>();
+            _tankCanvas = Document.GetElementById("fishTankCanvas").As<CanvasElement>();
+            _fishesCanvas = Document.GetElementById("fishesCanvas").As<CanvasElement>();
+
+            Debug.Assert(_backgroundImageElement != null);
+            Debug.Assert(_imageStripElement != null);
+            Debug.Assert(_tankCanvas != null);
+            Debug.Assert(_fishesCanvas != null);
+
+            _tankCanvasContext = (CanvasContext2D)_tankCanvas.GetContext(Rendering.Render2D);
+            _fishesCanvasContext = (CanvasContext2D)_fishesCanvas.GetContext(Rendering.Render2D);
+
+            _fishes = new List<Fish>();
+            for (int i = 0; i < FishTank.FishCount; i++) {
+                double x = Math.Floor(Math.Random() * (_width - FishTank.FishWidth) + FishTank.FishWidth / 2);
+                double y = Math.Floor(Math.Random() * (_height - FishTank.FishHeight) + FishTank.FishHeight / 2);
+                double z = Math.Floor(Math.Random() * (FishTank.ZFar - FishTank.ZNear));
+
+                _fishes.Add(new Fish(this, x, y, z, _imageStripElement, _fishesCanvasContext));
+            }
+
+            OnWindowResize(null);
+            Window.AddEventListener("resize", OnWindowResize, false);
+
+            _tickHandler = OnTick;
+            QueueUpdate();
+        }
+
+        private void Draw() {
+            if (_width < FishTank.BackgroundImageWidth) {
+                // Show just a portion of the background image, since the window is
+                // smaller than the background
+                _tankCanvasContext.DrawImage(_backgroundImageElement, 0, 0, FishTank.BackgroundImageWidth, _height);
+            }
+            else {
+                // Tile the background image horizontally if the window is wider than
+                // the background
+
+                int tileCount = (int)(_width / FishTank.BackgroundImageWidth);
+                double flip = 1;
+
+                for (int i = 0; i <= tileCount; i++) {
+                    _tankCanvasContext.Save();
+                    _tankCanvasContext.Transform(flip, 0, 0, 1, 0, 0);
+                    _tankCanvasContext.DrawImage(_backgroundImageElement,
+                                                 (flip - 1) * FishTank.BackgroundImageWidth / 2 + flip * FishTank.BackgroundImageWidth * i,
+                                                 0, FishTank.BackgroundImageWidth, _height);
+                    _tankCanvasContext.Restore();
+                    flip = -flip;
+                }
+            }
+        }
+
+        private void OnTick() {
+            _fishesCanvasContext.ClearRect(0, 0, _width, _height);
+            foreach (Fish fish in _fishes) {
+                fish.Update();
+            }
+
+            QueueUpdate();
+        }
+
+        private void OnWindowResize(ElementEvent e) {
+            _width = Document.Body.OffsetWidth;
+            _height = Document.Body.OffsetHeight;
+
+            _tankCanvas.Width = _width;
+            _tankCanvas.Height = _height;
+            _fishesCanvas.Width = _width;
+            _fishesCanvas.Height = _height;
+
+            Draw();
+        }
+
+        private void QueueUpdate() {
+            Window.SetTimeout(_tickHandler, (int)(1000 / FramesPerSecond));
+        }
+    }
+}
diff --git a/samples/FishTank/FishTank.csproj b/samples/FishTank/FishTank.csproj
new file mode 100644
index 000000000..93e669f10
--- /dev/null
+++ b/samples/FishTank/FishTank.csproj
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A506F058-5DDB-4A1C-8DAE-ECFB59F78C4C}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>FishTank</RootNamespace>
+    <AssemblyName>FishTank</AssemblyName>
+    <ScriptTemplate>Properties\Script.template</ScriptTemplate>
+    <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateScript>True</GenerateScript>
+    <GenerateResources>True</GenerateResources>
+    <RestoreNugetPackages>True</RestoreNugetPackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Debug\FishTank.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Release\FishTank.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Properties\FxCop.ruleset">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Properties\Script.template" />
+    <Compile Include="Fish.cs" />
+    <Compile Include="FishTank.cs" />
+    <Compile Include="FishTankApplication.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Script.Web">
+      <HintPath>packages\ScriptSharp.Lib.HTML.0.7.5.0\lib\Script.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="FishSprites.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="FishTank.htm">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="FishTank.jpg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets" Condition="Exists('packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets')" />
+  <Import Project="packages\nuget.targets" />
+</Project>
\ No newline at end of file
diff --git a/samples/FishTank/FishTank.htm b/samples/FishTank/FishTank.htm
new file mode 100644
index 000000000..9256870a2
--- /dev/null
+++ b/samples/FishTank/FishTank.htm
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Fish Tank</title>
+  <style type="text/css">
+    html {
+      height: 100%;
+    }
+    body {
+      width: 100%; height: 100%;
+      overflow: hidden; margin: 0; padding: 0;
+    }
+    canvas {
+      position: absolute; top: 0px; left: 0px;
+    }
+  </style>
+</head>
+<body>
+  <canvas id="fishTankCanvas"></canvas>
+  <canvas id="fishesCanvas"></canvas>
+
+  <img id="imageStrip" src="FishSprites.png" style="display: none" />
+  <img id="backgroundImage" src="FishTank.jpg" style="display: none" />
+
+  <script type="text/javascript" src="mscorlib.debug.js"></script>
+  <script type="text/javascript" src="FishTank.debug.js"></script>
+</body>
+</html>
diff --git a/samples/FishTank/FishTank.jpg b/samples/FishTank/FishTank.jpg
new file mode 100644
index 000000000..aa4af53cc
Binary files /dev/null and b/samples/FishTank/FishTank.jpg differ
diff --git a/samples/FishTank/FishTank.sln b/samples/FishTank/FishTank.sln
new file mode 100644
index 000000000..76ecdfa32
--- /dev/null
+++ b/samples/FishTank/FishTank.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FishTank", "FishTank.csproj", "{A506F058-5DDB-4A1C-8DAE-ECFB59F78C4C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A506F058-5DDB-4A1C-8DAE-ECFB59F78C4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A506F058-5DDB-4A1C-8DAE-ECFB59F78C4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A506F058-5DDB-4A1C-8DAE-ECFB59F78C4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A506F058-5DDB-4A1C-8DAE-ECFB59F78C4C}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/samples/FishTank/FishTankApplication.cs b/samples/FishTank/FishTankApplication.cs
new file mode 100644
index 000000000..28d97accb
--- /dev/null
+++ b/samples/FishTank/FishTankApplication.cs
@@ -0,0 +1,21 @@
+// FishTankApplication.cs
+//
+
+using System;
+using System.Collections;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+namespace FishTankApp {
+
+    [GlobalMethods]
+    internal static class FishTankApplication {
+
+        static FishTankApplication() {
+            Window.AddEventListener("load", delegate(ElementEvent e) {
+                FishTank fishtank = new FishTank();
+                fishtank.Run();
+            }, /* useCapture */ false);
+        }
+    }
+}
diff --git a/samples/FishTank/Properties/AssemblyInfo.cs b/samples/FishTank/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..3da5e17cf
--- /dev/null
+++ b/samples/FishTank/Properties/AssemblyInfo.cs
@@ -0,0 +1,23 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("FishTank")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script# Samples")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("FishTank")]
+[assembly: ScriptNamespace("ft")]
diff --git a/samples/FishTank/Properties/FxCop.ruleset b/samples/FishTank/Properties/FxCop.ruleset
new file mode 100644
index 000000000..eedb32ead
--- /dev/null
+++ b/samples/FishTank/Properties/FxCop.ruleset
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Script# Rules" Description="General Script Rules" ToolsVersion="10.0">
+  <RuleHintPaths>
+    <Path>..\packages\ScriptSharp.FxCop.0.7.5.0\tools</Path>
+  </RuleHintPaths>
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1000" Action="Warning" />
+    <Rule Id="CA1001" Action="Warning" />
+    <Rule Id="CA1008" Action="Warning" />
+    <Rule Id="CA1009" Action="Warning" />
+    <Rule Id="CA1010" Action="Warning" />
+    <Rule Id="CA1011" Action="Warning" />
+    <Rule Id="CA1012" Action="Warning" />
+    <Rule Id="CA1013" Action="Warning" />
+    <Rule Id="CA1016" Action="Warning" />
+    <Rule Id="CA1018" Action="Warning" />
+    <Rule Id="CA1019" Action="Warning" />
+    <Rule Id="CA1020" Action="Warning" />
+    <Rule Id="CA1021" Action="Warning" />
+    <Rule Id="CA1023" Action="Warning" />
+    <Rule Id="CA1024" Action="Warning" />
+    <Rule Id="CA1026" Action="Warning" />
+    <Rule Id="CA1027" Action="Warning" />
+    <Rule Id="CA1028" Action="Warning" />
+    <Rule Id="CA1030" Action="Warning" />
+    <Rule Id="CA1032" Action="Warning" />
+    <Rule Id="CA1033" Action="Warning" />
+    <Rule Id="CA1034" Action="Warning" />
+    <Rule Id="CA1036" Action="Warning" />
+    <Rule Id="CA1040" Action="Warning" />
+    <Rule Id="CA1041" Action="Warning" />
+    <Rule Id="CA1043" Action="Warning" />
+    <Rule Id="CA1044" Action="Warning" />
+    <Rule Id="CA1045" Action="Warning" />
+    <Rule Id="CA1046" Action="Warning" />
+    <Rule Id="CA1047" Action="Warning" />
+    <Rule Id="CA1048" Action="Warning" />
+    <Rule Id="CA1052" Action="Warning" />
+    <Rule Id="CA1053" Action="Warning" />
+    <Rule Id="CA1058" Action="Warning" />
+    <Rule Id="CA1059" Action="Warning" />
+    <Rule Id="CA1061" Action="Warning" />
+    <Rule Id="CA1065" Action="Warning" />
+    <Rule Id="CA1500" Action="Warning" />
+    <Rule Id="CA1501" Action="Warning" />
+    <Rule Id="CA1502" Action="Warning" />
+    <Rule Id="CA1504" Action="Warning" />
+    <Rule Id="CA1505" Action="Warning" />
+    <Rule Id="CA1506" Action="Warning" />
+    <Rule Id="CA1700" Action="Warning" />
+    <Rule Id="CA1701" Action="Warning" />
+    <Rule Id="CA1702" Action="Warning" />
+    <Rule Id="CA1703" Action="Warning" />
+    <Rule Id="CA1704" Action="Warning" />
+    <Rule Id="CA1707" Action="Warning" />
+    <Rule Id="CA1708" Action="Warning" />
+    <Rule Id="CA1709" Action="Warning" />
+    <Rule Id="CA1710" Action="Warning" />
+    <Rule Id="CA1711" Action="Warning" />
+    <Rule Id="CA1712" Action="Warning" />
+    <Rule Id="CA1713" Action="Warning" />
+    <Rule Id="CA1714" Action="Warning" />
+    <Rule Id="CA1715" Action="Warning" />
+    <Rule Id="CA1716" Action="Warning" />
+    <Rule Id="CA1717" Action="Warning" />
+    <Rule Id="CA1719" Action="Warning" />
+    <Rule Id="CA1720" Action="Warning" />
+    <Rule Id="CA1721" Action="Warning" />
+    <Rule Id="CA1722" Action="Warning" />
+    <Rule Id="CA1724" Action="Warning" />
+    <Rule Id="CA1725" Action="Warning" />
+    <Rule Id="CA1726" Action="Warning" />
+    <Rule Id="CA1800" Action="Warning" />
+    <Rule Id="CA1801" Action="Warning" />
+    <Rule Id="CA1802" Action="Warning" />
+    <Rule Id="CA1804" Action="Warning" />
+    <Rule Id="CA1806" Action="Warning" />
+    <Rule Id="CA1809" Action="Warning" />
+    <Rule Id="CA1811" Action="Warning" />
+    <Rule Id="CA1812" Action="Warning" />
+    <Rule Id="CA1813" Action="Warning" />
+    <Rule Id="CA1814" Action="Warning" />
+    <Rule Id="CA1815" Action="Warning" />
+    <Rule Id="CA1819" Action="Warning" />
+    <Rule Id="CA1820" Action="Warning" />
+    <Rule Id="CA1821" Action="Warning" />
+    <Rule Id="CA2201" Action="Warning" />
+    <Rule Id="CA2202" Action="Warning" />
+    <Rule Id="CA2204" Action="Warning" />
+    <Rule Id="CA2207" Action="Warning" />
+    <Rule Id="CA2213" Action="Warning" />
+    <Rule Id="CA2214" Action="Warning" />
+    <Rule Id="CA2215" Action="Warning" />
+    <Rule Id="CA2217" Action="Warning" />
+    <Rule Id="CA2218" Action="Warning" />
+    <Rule Id="CA2219" Action="Warning" />
+    <Rule Id="CA2222" Action="Warning" />
+    <Rule Id="CA2223" Action="Warning" />
+    <Rule Id="CA2224" Action="Warning" />
+    <Rule Id="CA2226" Action="Warning" />
+    <Rule Id="CA2227" Action="Warning" />
+    <Rule Id="CA2233" Action="Warning" />
+    <Rule Id="SS0001" Action="Warning" />
+    <Rule Id="SS0002" Action="Warning" />
+    <Rule Id="SS0003" Action="Warning" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/samples/FishTank/Properties/Script.template b/samples/FishTank/Properties/Script.template
new file mode 100644
index 000000000..d0fad56de
--- /dev/null
+++ b/samples/FishTank/Properties/Script.template
@@ -0,0 +1,8 @@
+//! #= ScriptFile ##
+//
+
+(function() {
+#include[as-is] "%code%"
+})();
+
+//! This script was generated using Script# v#= CompilerVersion ##
diff --git a/samples/FishTank/packages.config b/samples/FishTank/packages.config
new file mode 100644
index 000000000..7025b00f8
--- /dev/null
+++ b/samples/FishTank/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.FxCop" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.HTML" version="0.7.5.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/FishTank/packages/nuget.exe b/samples/FishTank/packages/nuget.exe
new file mode 100644
index 000000000..e313ff958
Binary files /dev/null and b/samples/FishTank/packages/nuget.exe differ
diff --git a/samples/FishTank/packages/nuget.targets b/samples/FishTank/packages/nuget.targets
new file mode 100644
index 000000000..51fc72bd2
--- /dev/null
+++ b/samples/FishTank/packages/nuget.targets
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <RestoreNugetPackages Condition="'$(RestoreNugetPackages)' == ''">false</RestoreNugetPackages>
+    <PackagesDir>$([System.IO.Directory]::GetParent($(MSBuildThisFileDirectory)))</PackagesDir>
+    <RestoreCommand>$(MSBuildThisFileDirectory)nuget.exe install "$(MSBuildProjectDirectory)\packages.config" -o "$(PackagesDir)"</RestoreCommand>
+    <BuildDependsOn Condition="$(RestoreNugetPackages) == 'true'">
+      RestorePackages;
+      $(BuildDependsOn);
+    </BuildDependsOn>
+  </PropertyGroup>
+
+  <Target Name="RestorePackages">
+    <Exec Command="$(RestoreCommand)" LogStandardErrorAsError="true" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/samples/FishTank/packages/repositories.config b/samples/FishTank/packages/repositories.config
new file mode 100644
index 000000000..0dec135fc
--- /dev/null
+++ b/samples/FishTank/packages/repositories.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+  <repository path="..\packages.config" />
+</repositories>
\ No newline at end of file
diff --git a/samples/Photos/PhotoGrid/PhotoGrid.csproj b/samples/Photos/PhotoGrid/PhotoGrid.csproj
new file mode 100644
index 000000000..0e4c98d22
--- /dev/null
+++ b/samples/Photos/PhotoGrid/PhotoGrid.csproj
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2F542546-7B1D-4C43-AF1F-092AEE556FC2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PhotoGrid</RootNamespace>
+    <AssemblyName>PhotoGrid</AssemblyName>
+    <ScriptTemplate>Properties\Script.template</ScriptTemplate>
+    <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateScript>True</GenerateScript>
+    <GenerateResources>True</GenerateResources>
+    <DeploymentPath>..\PhotosWeb\Scripts</DeploymentPath>
+    <RestoreNugetPackages>true</RestoreNugetPackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Debug\PhotoGrid.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Release\PhotoGrid.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Properties\FxCop.ruleset" />
+    <None Include="Properties\Script.template" />
+    <Compile Include="PhotoGridPage.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Script.jQuery">
+      <HintPath>..\packages\ScriptSharp.Lib.jQuery.0.7.5.0\lib\Script.jQuery.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.jQuery.Templating">
+      <HintPath>..\packages\ScriptSharp.Lib.jQuery.Templating.0.7.5.0\lib\Script.jQuery.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.Web">
+      <HintPath>..\packages\ScriptSharp.Lib.HTML.0.7.5.0\lib\Script.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Photos\Photos.csproj">
+      <Project>{336cc726-e62d-484b-a15e-3e70a676d989}</Project>
+      <Name>Photos</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Plugins\Plugins.csproj">
+      <Project>{a441a116-8f91-4fbc-8420-d21c98283bd3}</Project>
+      <Name>Plugins</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets" Condition="Exists('..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets')" />
+  <Import Project="..\packages\nuget.targets" />
+</Project>
\ No newline at end of file
diff --git a/samples/Photos/PhotoGrid/PhotoGridPage.cs b/samples/Photos/PhotoGrid/PhotoGridPage.cs
new file mode 100644
index 000000000..8396ec038
--- /dev/null
+++ b/samples/Photos/PhotoGrid/PhotoGridPage.cs
@@ -0,0 +1,60 @@
+// PhotoGridPage.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Html;
+using System.Runtime.CompilerServices;
+using jQueryApi;
+using jQueryApi.Templating;
+using jQueryApi.Isotope;
+using jQueryApi.LightBox;
+using Photos;
+
+namespace PhotoGrid {
+
+    [GlobalMethods]
+    internal static class PhotoGridPage {
+    
+        static PhotoGridPage() {
+            jQuery.OnDocumentReady(delegate() {
+                string apiKey = (string)jQuery.FromElement(Document.Body).GetDataValue("flickrKey");
+                IPhotoService flickrService = new FlickrPhotoService();
+
+                jQuery.Select("#searchButton").Click(delegate(jQueryEvent e) {
+                    string tags = jQuery.Select("#tagsTextBox").GetValue();
+
+                    flickrService.SearchPhotos(tags, 20).Done(
+                        delegate(IEnumerable<Photo> photos) {
+                            jQueryObject thumbnailList = jQuery.Select("#thumbsList");
+                            thumbnailList.Empty();
+
+                            if (photos == null) {
+                                return;
+                            }
+
+                            jQuery.Select("#thumbnailTemplate").Plugin<jQueryTemplateObject>().
+                                RenderTemplate(photos).
+                                AppendTo(thumbnailList);
+
+                            thumbnailList.
+                                Plugin<jQueryIsotopeObject>().Isotope(new IsotopeOptions("layoutMode", IsotopeLayout.Masonry)).
+                                Find("a").
+                                Plugin<jQueryLightBoxObject>().LightBox();
+
+                            thumbnailList.Find("li").
+                                MouseOver(delegate(jQueryEvent e2) {
+                                    jQuery.This.CSS("box-shadow", "0 0 15px #888");
+                                }).
+                                MouseOut(delegate(jQueryEvent e2) {
+                                    jQuery.This.CSS("box-shadow", "");
+                                });
+                        });
+
+                    jQuery.FromElement(Document.Body).Focus();
+                    e.PreventDefault();
+                });
+            });
+        }
+    }
+}
diff --git a/samples/Photos/PhotoGrid/Properties/AssemblyInfo.cs b/samples/Photos/PhotoGrid/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..9ce779606
--- /dev/null
+++ b/samples/Photos/PhotoGrid/Properties/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PhotoGrid")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script# Samples")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("PhotoGrid")]
diff --git a/samples/Photos/PhotoGrid/Properties/FxCop.ruleset b/samples/Photos/PhotoGrid/Properties/FxCop.ruleset
new file mode 100644
index 000000000..47c160f61
--- /dev/null
+++ b/samples/Photos/PhotoGrid/Properties/FxCop.ruleset
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Script# Rules" Description="General Script Rules" ToolsVersion="10.0">
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1000" Action="Warning" />
+    <Rule Id="CA1001" Action="Warning" />
+    <Rule Id="CA1008" Action="Warning" />
+    <Rule Id="CA1009" Action="Warning" />
+    <Rule Id="CA1010" Action="Warning" />
+    <Rule Id="CA1011" Action="Warning" />
+    <Rule Id="CA1012" Action="Warning" />
+    <Rule Id="CA1013" Action="Warning" />
+    <Rule Id="CA1016" Action="Warning" />
+    <Rule Id="CA1018" Action="Warning" />
+    <Rule Id="CA1019" Action="Warning" />
+    <Rule Id="CA1020" Action="Warning" />
+    <Rule Id="CA1021" Action="Warning" />
+    <Rule Id="CA1023" Action="Warning" />
+    <Rule Id="CA1024" Action="Warning" />
+    <Rule Id="CA1026" Action="Warning" />
+    <Rule Id="CA1027" Action="Warning" />
+    <Rule Id="CA1028" Action="Warning" />
+    <Rule Id="CA1030" Action="Warning" />
+    <Rule Id="CA1032" Action="Warning" />
+    <Rule Id="CA1033" Action="Warning" />
+    <Rule Id="CA1034" Action="Warning" />
+    <Rule Id="CA1036" Action="Warning" />
+    <Rule Id="CA1040" Action="Warning" />
+    <Rule Id="CA1041" Action="Warning" />
+    <Rule Id="CA1043" Action="Warning" />
+    <Rule Id="CA1044" Action="Warning" />
+    <Rule Id="CA1045" Action="Warning" />
+    <Rule Id="CA1046" Action="Warning" />
+    <Rule Id="CA1047" Action="Warning" />
+    <Rule Id="CA1048" Action="Warning" />
+    <Rule Id="CA1052" Action="Warning" />
+    <Rule Id="CA1053" Action="Warning" />
+    <Rule Id="CA1058" Action="Warning" />
+    <Rule Id="CA1059" Action="Warning" />
+    <Rule Id="CA1061" Action="Warning" />
+    <Rule Id="CA1065" Action="Warning" />
+    <Rule Id="CA1500" Action="Warning" />
+    <Rule Id="CA1501" Action="Warning" />
+    <Rule Id="CA1502" Action="Warning" />
+    <Rule Id="CA1504" Action="Warning" />
+    <Rule Id="CA1505" Action="Warning" />
+    <Rule Id="CA1506" Action="Warning" />
+    <Rule Id="CA1700" Action="Warning" />
+    <Rule Id="CA1701" Action="Warning" />
+    <Rule Id="CA1702" Action="Warning" />
+    <Rule Id="CA1703" Action="Warning" />
+    <Rule Id="CA1704" Action="Warning" />
+    <Rule Id="CA1707" Action="Warning" />
+    <Rule Id="CA1708" Action="Warning" />
+    <Rule Id="CA1709" Action="Warning" />
+    <Rule Id="CA1710" Action="Warning" />
+    <Rule Id="CA1711" Action="Warning" />
+    <Rule Id="CA1712" Action="Warning" />
+    <Rule Id="CA1713" Action="Warning" />
+    <Rule Id="CA1714" Action="Warning" />
+    <Rule Id="CA1715" Action="Warning" />
+    <Rule Id="CA1716" Action="Warning" />
+    <Rule Id="CA1717" Action="Warning" />
+    <Rule Id="CA1719" Action="Warning" />
+    <Rule Id="CA1720" Action="Warning" />
+    <Rule Id="CA1721" Action="Warning" />
+    <Rule Id="CA1722" Action="Warning" />
+    <Rule Id="CA1724" Action="Warning" />
+    <Rule Id="CA1725" Action="Warning" />
+    <Rule Id="CA1726" Action="Warning" />
+    <Rule Id="CA1800" Action="Warning" />
+    <Rule Id="CA1801" Action="Warning" />
+    <Rule Id="CA1802" Action="Warning" />
+    <Rule Id="CA1804" Action="Warning" />
+    <Rule Id="CA1806" Action="Warning" />
+    <Rule Id="CA1809" Action="Warning" />
+    <Rule Id="CA1811" Action="Warning" />
+    <Rule Id="CA1812" Action="Warning" />
+    <Rule Id="CA1813" Action="Warning" />
+    <Rule Id="CA1814" Action="Warning" />
+    <Rule Id="CA1815" Action="Warning" />
+    <Rule Id="CA1819" Action="Warning" />
+    <Rule Id="CA1820" Action="Warning" />
+    <Rule Id="CA1821" Action="Warning" />
+    <Rule Id="CA2201" Action="Warning" />
+    <Rule Id="CA2202" Action="Warning" />
+    <Rule Id="CA2204" Action="Warning" />
+    <Rule Id="CA2207" Action="Warning" />
+    <Rule Id="CA2213" Action="Warning" />
+    <Rule Id="CA2214" Action="Warning" />
+    <Rule Id="CA2215" Action="Warning" />
+    <Rule Id="CA2217" Action="Warning" />
+    <Rule Id="CA2218" Action="Warning" />
+    <Rule Id="CA2219" Action="Warning" />
+    <Rule Id="CA2222" Action="Warning" />
+    <Rule Id="CA2223" Action="Warning" />
+    <Rule Id="CA2224" Action="Warning" />
+    <Rule Id="CA2226" Action="Warning" />
+    <Rule Id="CA2227" Action="Warning" />
+    <Rule Id="CA2233" Action="Warning" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/samples/Photos/PhotoGrid/Properties/Script.template b/samples/Photos/PhotoGrid/Properties/Script.template
new file mode 100644
index 000000000..8fcd90176
--- /dev/null
+++ b/samples/Photos/PhotoGrid/Properties/Script.template
@@ -0,0 +1,8 @@
+//! #= ScriptFile ##
+//
+
+(function($) {
+#include[as-is] "%code%"
+})(jQuery);
+
+//! This script was generated using Script# v#= CompilerVersion ##
diff --git a/samples/Photos/PhotoGrid/packages.config b/samples/Photos/PhotoGrid/packages.config
new file mode 100644
index 000000000..6f6f76839
--- /dev/null
+++ b/samples/Photos/PhotoGrid/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.HTML" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.jQuery" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.jQuery.Templating" version="0.7.5.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/Photos/PhotoList/GalleryPlugin.cs b/samples/Photos/PhotoList/GalleryPlugin.cs
new file mode 100644
index 000000000..1f27586cb
--- /dev/null
+++ b/samples/Photos/PhotoList/GalleryPlugin.cs
@@ -0,0 +1,92 @@
+// GalleryPlugin.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Html;
+using System.Runtime.CompilerServices;
+using jQueryApi;
+using jQueryApi.Templating;
+using Photos.FlickrClient;
+
+[Mixin("$.fn")]
+public static class GalleryPlugin {
+
+    public static jQueryObject Gallery(GalleryPluginOptions customOptions) {
+        GalleryPluginOptions defaultOptions =
+            new GalleryPluginOptions("count", 10,
+                                     "photoService", new FlickrService());
+        GalleryPluginOptions options =
+            (GalleryPluginOptions)jQuery.Extend(new Dictionary<string, object>(), defaultOptions, customOptions);
+
+        return jQuery.Current.Each(delegate(int i, Element element) {
+            jQueryObject thumbnailList = jQuery.Select("#" + options.thumbsListID);
+            jQueryObject photoPanel = jQuery.Select("#" + options.photoPanelID);
+
+            options.photoService.SearchPhotos(options.tags, options.count, delegate(List<PhotoResult> photos) {
+                if ((photos == null) || (photos.Count == 0)) {
+                    return;
+                }
+
+                thumbnailList.Empty();
+                jQuery.Select("#" + options.thumbnailTemplateID).Plugin<jQueryTemplateObject>().
+                       RenderTemplate(photos).
+                       CSS("opacity", "0.5").
+                       AppendTo(thumbnailList).
+                       MouseEnter(delegate(jQueryEvent e) {
+                           jQuery.FromElement(e.CurrentTarget).FadeTo(250, 1.0f, delegate() {
+                               jQuery.This.CSS("opacity", "1");
+                           });
+                       })
+                       .MouseLeave(delegate(jQueryEvent e) {
+                           jQuery.FromElement(e.CurrentTarget).FadeTo(250, 0.5f, delegate() {
+                               jQuery.This.CSS("opacity", "0.5");
+                           });
+                       })
+                       .Click(delegate(jQueryEvent e) {
+                           PhotoResult photo = (PhotoResult)jQueryTemplating.GetTemplateInstance(e.CurrentTarget).Data;
+
+                           jQueryTemplate photoTemplate = jQueryTemplating.CreateTemplate(jQuery.Select("#" + options.photoTemplateID));
+                           photoPanel.FadeOut(EffectDuration.Slow, delegate() {
+                               jQuery.This.Empty().CSS("display", "").
+                                           Append(jQueryTemplating.RenderTemplate(photoTemplate, photo)).
+                                           FadeIn(EffectDuration.Slow);
+                           });
+                       }).
+                       Eq(0).Click();
+            });
+
+            return false;
+        });
+    }
+}
+
+[Imported]
+[ScriptName("Object")]
+public sealed class GalleryPluginOptions {
+    public string tags;
+    public int count;
+    public string thumbsListID;
+    public string photoPanelID;
+    public string thumbnailTemplateID;
+    public string photoTemplateID;
+    public IFlickrService photoService;
+
+    public GalleryPluginOptions() {
+    }
+
+    public GalleryPluginOptions(params object[] nameValuePairs) {
+    }
+}
+
+[Imported]
+public sealed class GalleryObject : jQueryObject {
+
+    public jQueryObject Gallery() {
+        return null;
+    }
+
+    public jQueryObject Gallery(GalleryPluginOptions options) {
+        return null;
+    }
+}
diff --git a/samples/Photos/PhotoList/ListPage.cs b/samples/Photos/PhotoList/ListPage.cs
new file mode 100644
index 000000000..46364bb14
--- /dev/null
+++ b/samples/Photos/PhotoList/ListPage.cs
@@ -0,0 +1,46 @@
+// ListPage.cs
+//
+
+using System;
+using System.Collections;
+using jQueryApi;
+using jQueryApi.History;
+
+namespace PhotoList {
+
+    public sealed class ListPage {
+
+        private static string _currentTags;
+
+        public static void Main(Dictionary args) {
+            jQuery.Window.Bind("hashchange", delegate(jQueryEvent e) {
+                string tags = (string)jQueryHistory.GetState("tags");
+                if (tags != _currentTags) {
+                    ShowPhotos(tags);
+                }
+            });
+
+            jQuery.Select("#searchButton").Bind("click", delegate(jQueryEvent e) {
+                string tags = jQuery.Select("#tagsTextBox").GetValue();
+                ShowPhotos(tags);
+            });
+        }
+
+        private static void ShowPhotos(string tags) {
+            if (String.IsNullOrEmpty(tags)) {
+                return;
+            }
+
+            _currentTags = tags;
+            GalleryPluginOptions options =
+                new GalleryPluginOptions("tags", tags,
+                                         "thumbsListID", "thumbsList",
+                                         "photoPanelID", "photoPanel",
+                                         "thumbnailTemplateID", "thumbnailTemplate",
+                                         "photoTemplateID", "photoTemplate");
+
+            jQuery.Select("#gallery").Plugin<GalleryObject>().Gallery(options);
+            jQueryHistory.PushState(new Dictionary("tags", tags));
+        }
+    }
+}
diff --git a/samples/Photos/PhotoList/PhotoList.csproj b/samples/Photos/PhotoList/PhotoList.csproj
new file mode 100644
index 000000000..542433705
--- /dev/null
+++ b/samples/Photos/PhotoList/PhotoList.csproj
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D4DF1CC1-C044-4C90-AB09-9744E9ACFCC9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PhotoList</RootNamespace>
+    <AssemblyName>PhotoList</AssemblyName>
+    <ScriptTemplate>Properties\Script.template</ScriptTemplate>
+    <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateScript>True</GenerateScript>
+    <GenerateResources>True</GenerateResources>
+    <DeploymentPath>..\PhotosWeb\Scripts</DeploymentPath>
+    <RestoreNugetPackages>true</RestoreNugetPackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Debug\PhotoList.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Release\PhotoList.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="GalleryPlugin.cs" />
+    <Compile Include="ListPage.cs" />
+    <Compile Include="Tests\GalleryPluginTests.cs" />
+    <Compile Include="Tests\MockFlickrService.cs" />
+    <None Include="packages.config" />
+    <None Include="Properties\FxCop.ruleset" />
+    <None Include="Properties\Script.template" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Script.jQuery">
+      <HintPath>..\packages\ScriptSharp.Lib.jQuery.0.7.5.0\lib\Script.jQuery.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.jQuery.History">
+      <HintPath>..\packages\ScriptSharp.Lib.jQuery.History.0.7.5.0\lib\Script.jQuery.History.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.jQuery.Templating">
+      <HintPath>..\packages\ScriptSharp.Lib.jQuery.Templating.0.7.5.0\lib\Script.jQuery.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.Web">
+      <HintPath>..\packages\ScriptSharp.Lib.HTML.0.7.5.0\lib\Script.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Photos\Photos.csproj">
+      <Project>{336cc726-e62d-484b-a15e-3e70a676d989}</Project>
+      <Name>Flickr</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets" Condition="Exists('..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets')" />
+  <Import Project="..\packages\nuget.targets" />
+</Project>
\ No newline at end of file
diff --git a/samples/Photos/PhotoList/Properties/AssemblyInfo.cs b/samples/Photos/PhotoList/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..bc8ed6482
--- /dev/null
+++ b/samples/Photos/PhotoList/Properties/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PhotoList")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script# Samples")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("Gallery")]
diff --git a/samples/Photos/PhotoList/Properties/FxCop.ruleset b/samples/Photos/PhotoList/Properties/FxCop.ruleset
new file mode 100644
index 000000000..47c160f61
--- /dev/null
+++ b/samples/Photos/PhotoList/Properties/FxCop.ruleset
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Script# Rules" Description="General Script Rules" ToolsVersion="10.0">
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1000" Action="Warning" />
+    <Rule Id="CA1001" Action="Warning" />
+    <Rule Id="CA1008" Action="Warning" />
+    <Rule Id="CA1009" Action="Warning" />
+    <Rule Id="CA1010" Action="Warning" />
+    <Rule Id="CA1011" Action="Warning" />
+    <Rule Id="CA1012" Action="Warning" />
+    <Rule Id="CA1013" Action="Warning" />
+    <Rule Id="CA1016" Action="Warning" />
+    <Rule Id="CA1018" Action="Warning" />
+    <Rule Id="CA1019" Action="Warning" />
+    <Rule Id="CA1020" Action="Warning" />
+    <Rule Id="CA1021" Action="Warning" />
+    <Rule Id="CA1023" Action="Warning" />
+    <Rule Id="CA1024" Action="Warning" />
+    <Rule Id="CA1026" Action="Warning" />
+    <Rule Id="CA1027" Action="Warning" />
+    <Rule Id="CA1028" Action="Warning" />
+    <Rule Id="CA1030" Action="Warning" />
+    <Rule Id="CA1032" Action="Warning" />
+    <Rule Id="CA1033" Action="Warning" />
+    <Rule Id="CA1034" Action="Warning" />
+    <Rule Id="CA1036" Action="Warning" />
+    <Rule Id="CA1040" Action="Warning" />
+    <Rule Id="CA1041" Action="Warning" />
+    <Rule Id="CA1043" Action="Warning" />
+    <Rule Id="CA1044" Action="Warning" />
+    <Rule Id="CA1045" Action="Warning" />
+    <Rule Id="CA1046" Action="Warning" />
+    <Rule Id="CA1047" Action="Warning" />
+    <Rule Id="CA1048" Action="Warning" />
+    <Rule Id="CA1052" Action="Warning" />
+    <Rule Id="CA1053" Action="Warning" />
+    <Rule Id="CA1058" Action="Warning" />
+    <Rule Id="CA1059" Action="Warning" />
+    <Rule Id="CA1061" Action="Warning" />
+    <Rule Id="CA1065" Action="Warning" />
+    <Rule Id="CA1500" Action="Warning" />
+    <Rule Id="CA1501" Action="Warning" />
+    <Rule Id="CA1502" Action="Warning" />
+    <Rule Id="CA1504" Action="Warning" />
+    <Rule Id="CA1505" Action="Warning" />
+    <Rule Id="CA1506" Action="Warning" />
+    <Rule Id="CA1700" Action="Warning" />
+    <Rule Id="CA1701" Action="Warning" />
+    <Rule Id="CA1702" Action="Warning" />
+    <Rule Id="CA1703" Action="Warning" />
+    <Rule Id="CA1704" Action="Warning" />
+    <Rule Id="CA1707" Action="Warning" />
+    <Rule Id="CA1708" Action="Warning" />
+    <Rule Id="CA1709" Action="Warning" />
+    <Rule Id="CA1710" Action="Warning" />
+    <Rule Id="CA1711" Action="Warning" />
+    <Rule Id="CA1712" Action="Warning" />
+    <Rule Id="CA1713" Action="Warning" />
+    <Rule Id="CA1714" Action="Warning" />
+    <Rule Id="CA1715" Action="Warning" />
+    <Rule Id="CA1716" Action="Warning" />
+    <Rule Id="CA1717" Action="Warning" />
+    <Rule Id="CA1719" Action="Warning" />
+    <Rule Id="CA1720" Action="Warning" />
+    <Rule Id="CA1721" Action="Warning" />
+    <Rule Id="CA1722" Action="Warning" />
+    <Rule Id="CA1724" Action="Warning" />
+    <Rule Id="CA1725" Action="Warning" />
+    <Rule Id="CA1726" Action="Warning" />
+    <Rule Id="CA1800" Action="Warning" />
+    <Rule Id="CA1801" Action="Warning" />
+    <Rule Id="CA1802" Action="Warning" />
+    <Rule Id="CA1804" Action="Warning" />
+    <Rule Id="CA1806" Action="Warning" />
+    <Rule Id="CA1809" Action="Warning" />
+    <Rule Id="CA1811" Action="Warning" />
+    <Rule Id="CA1812" Action="Warning" />
+    <Rule Id="CA1813" Action="Warning" />
+    <Rule Id="CA1814" Action="Warning" />
+    <Rule Id="CA1815" Action="Warning" />
+    <Rule Id="CA1819" Action="Warning" />
+    <Rule Id="CA1820" Action="Warning" />
+    <Rule Id="CA1821" Action="Warning" />
+    <Rule Id="CA2201" Action="Warning" />
+    <Rule Id="CA2202" Action="Warning" />
+    <Rule Id="CA2204" Action="Warning" />
+    <Rule Id="CA2207" Action="Warning" />
+    <Rule Id="CA2213" Action="Warning" />
+    <Rule Id="CA2214" Action="Warning" />
+    <Rule Id="CA2215" Action="Warning" />
+    <Rule Id="CA2217" Action="Warning" />
+    <Rule Id="CA2218" Action="Warning" />
+    <Rule Id="CA2219" Action="Warning" />
+    <Rule Id="CA2222" Action="Warning" />
+    <Rule Id="CA2223" Action="Warning" />
+    <Rule Id="CA2224" Action="Warning" />
+    <Rule Id="CA2226" Action="Warning" />
+    <Rule Id="CA2227" Action="Warning" />
+    <Rule Id="CA2233" Action="Warning" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/samples/Photos/PhotoList/Properties/Script.template b/samples/Photos/PhotoList/Properties/Script.template
new file mode 100644
index 000000000..8fcd90176
--- /dev/null
+++ b/samples/Photos/PhotoList/Properties/Script.template
@@ -0,0 +1,8 @@
+//! #= ScriptFile ##
+//
+
+(function($) {
+#include[as-is] "%code%"
+})(jQuery);
+
+//! This script was generated using Script# v#= CompilerVersion ##
diff --git a/samples/Photos/PhotoList/Tests/GalleryPluginTests.cs b/samples/Photos/PhotoList/Tests/GalleryPluginTests.cs
new file mode 100644
index 000000000..0f34bf4c8
--- /dev/null
+++ b/samples/Photos/PhotoList/Tests/GalleryPluginTests.cs
@@ -0,0 +1,46 @@
+// ListBuilderTests.cs
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics.CodeAnalysis;
+using System.Html;
+using System.Testing;
+using jQueryApi;
+using Photos.FlickrClient;
+using Gallery;
+
+namespace Gallery.Tests {
+
+    [SuppressMessage("Microsoft.Performance", "CA1812",
+                     Justification = "Tests don't have internal consumers. They're only compiled into .test.js scripts.")]
+    internal sealed class GalleryPluginTests : TestClass {
+
+        private jQueryObject _thumbsList;
+
+        public override void Setup() {
+            _thumbsList = jQuery.FromHtml("<ul id='thumbsList'></ul>");
+            _thumbsList.AppendTo(Document.Body);
+        }
+
+        public override void Cleanup() {
+            _thumbsList.Remove();
+            _thumbsList = null;
+        }
+
+        public void TestEmptyCollection() {
+            Assert.ExpectAsserts(1);
+
+            GalleryPluginOptions options = new GalleryPluginOptions("thumbsListID", "thumbsList");
+            options.photoService = new MockFlickrService(null);
+
+            TestEngine.WaitForAsyncCompletion();
+
+            jQuery.FromElement(Document.Body).Plugin<GalleryObject>().Gallery(options);
+
+            Assert.AreEqual(_thumbsList.GetHtml().Trim().Length, 0, "Expected html to be empty for null photos array.");
+
+            TestEngine.ResumeOnAsyncCompleted();
+        }
+    }
+}
diff --git a/samples/Photos/PhotoList/Tests/MockFlickrService.cs b/samples/Photos/PhotoList/Tests/MockFlickrService.cs
new file mode 100644
index 000000000..d4512f671
--- /dev/null
+++ b/samples/Photos/PhotoList/Tests/MockFlickrService.cs
@@ -0,0 +1,27 @@
+// MockFlickrService.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Html;
+using System.Testing;
+using Photos.FlickrClient;
+
+namespace Gallery.Tests {
+
+    public sealed class MockFlickrService : IFlickrService {
+
+        private List<PhotoResult> _photos;
+
+        public MockFlickrService(List<PhotoResult> photos) {
+            _photos = photos;
+        }
+
+        public void SearchPhotos(string tags, int count, FlickrSearchCallback callback) {
+            Window.SetTimeout(delegate() {
+                callback(_photos);
+            }, 0);
+        }
+    }
+}
diff --git a/samples/Photos/PhotoList/packages.config b/samples/Photos/PhotoList/packages.config
new file mode 100644
index 000000000..a887b8310
--- /dev/null
+++ b/samples/Photos/PhotoList/packages.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.HTML" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.jQuery" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.jQuery.History" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.jQuery.Templating" version="0.7.5.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/Photos/PhotoListTests.testsettings b/samples/Photos/PhotoListTests.testsettings
new file mode 100644
index 000000000..6047fa016
--- /dev/null
+++ b/samples/Photos/PhotoListTests.testsettings
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestSettings name="PhotoListTests" id="50dd381a-d0c5-4c9e-a29c-303b26be79a0" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <Description>These are default test settings for a local test run.</Description>
+  <Execution>
+    <TestTypeSpecific>
+      <UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
+        <AssemblyResolution>
+          <TestDirectory useLoadContext="true" />
+        </AssemblyResolution>
+      </UnitTestRunConfig>
+      <WebTestRunConfiguration testTypeId="4e7599fa-5ecb-43e9-a887-cd63cf72d207">
+        <Browser name="Internet Explorer 9.0" MaxConnections="6">
+          <Headers>
+            <Header name="User-Agent" value="Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)" />
+            <Header name="Accept" value="*/*" />
+            <Header name="Accept-Language" value="{{$IEAcceptLanguage}}" />
+            <Header name="Accept-Encoding" value="GZIP" />
+          </Headers>
+        </Browser>
+      </WebTestRunConfiguration>
+    </TestTypeSpecific>
+    <AgentRule name="LocalMachineDefaultRole">
+    </AgentRule>
+  </Execution>
+</TestSettings>
\ No newline at end of file
diff --git a/samples/Photos/PhotoListTests/GalleryPluginTests.cs b/samples/Photos/PhotoListTests/GalleryPluginTests.cs
new file mode 100644
index 000000000..5d3013404
--- /dev/null
+++ b/samples/Photos/PhotoListTests/GalleryPluginTests.cs
@@ -0,0 +1,51 @@
+// GalleryPluginTests.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using ScriptSharp.Testing;
+
+namespace PhotoListTests {
+
+    [TestClass]
+    [DeploymentItem("PhotoListTests\\Web", "Web")]
+    [DeploymentItem("PhotoList\\bin\\debug\\mscorlib.js", "Web")]
+    [DeploymentItem("PhotoList\\bin\\debug\\Photos.debug.js", "Web")]
+    [DeploymentItem("PhotoList\\bin\\debug\\PhotoList.test.js", "Web")]
+    public class GalleryPluginTests {
+
+        private static WebTest _webTest;
+
+        public TestContext TestContext {
+            get;
+            set;
+        }
+
+        [ClassInitialize()]
+        public static void OnInitialize(TestContext testContext) {
+            // This starts the web server rooted at the specified directory
+            // on http://localhost:<port>
+
+            string webRoot = Path.Combine(testContext.DeploymentDirectory, "Web");
+            int port = 3976;
+
+            _webTest = new WebTest();
+            _webTest.StartWebServer(webRoot, port);
+        }
+
+        [ClassCleanup()]
+        public static void OnCleanup() {
+            _webTest.StopWebServer();
+        }
+
+        [TestMethod]
+        public void TestGallery() {
+            Uri testUri = _webTest.GetTestUri("/GalleryPluginTests.htm");
+
+            WebTestResult chromeResult = _webTest.RunTest(testUri, WebBrowser.Chrome);
+            Assert.IsTrue(chromeResult.Succeeded, "Chrome:\r\n" + chromeResult.Log);
+        }
+    }
+}
diff --git a/samples/Photos/PhotoListTests/PhotoListTests.csproj b/samples/Photos/PhotoListTests/PhotoListTests.csproj
new file mode 100644
index 000000000..6c1972bb6
--- /dev/null
+++ b/samples/Photos/PhotoListTests/PhotoListTests.csproj
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{99344CB4-B164-4635-8795-D44E53357EE8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PhotoListTests</RootNamespace>
+    <AssemblyName>PhotoListTests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="ScriptSharp.Testing">
+      <HintPath>..\packages\ScriptSharp.Testing.0.7.5.0\lib\ScriptSharp.Testing.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Content Include="Web\GalleryPluginTests.htm" />
+    <Content Include="Web\QUnit.css" />
+    <Content Include="Web\QUnit.js" />
+    <Content Include="Web\QUnitExt.js" />
+    <Compile Include="GalleryPluginTests.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/samples/Photos/PhotoListTests/Properties/AssemblyInfo.cs b/samples/Photos/PhotoListTests/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..0de6e67a8
--- /dev/null
+++ b/samples/Photos/PhotoListTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PhotoListTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script# Samples")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Photos/PhotoListTests/Web/GalleryPluginTests.htm b/samples/Photos/PhotoListTests/Web/GalleryPluginTests.htm
new file mode 100644
index 000000000..6edce1c10
--- /dev/null
+++ b/samples/Photos/PhotoListTests/Web/GalleryPluginTests.htm
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>PhotoListTests - GalleryPluginTests</title>
+  <link rel="stylesheet" href="/QUnit.css" type="text/css"/>
+  <script type="text/javascript" src="/QUnit.js"></script>
+  <script type="text/javascript" src="/QUnitExt.js"></script>
+</head>
+<body>
+  <div>
+    <h1 id="qunit-header">PhotoListTests - GalleryPluginTests Results</h1>
+    <h2 id="qunit-banner"></h2>
+    <h2 id="qunit-userAgent"></h2>
+    <ol id="qunit-tests"></ol>
+    <br />
+    <textarea id="qunit-log" rows="10" cols="100"></textarea>
+  </div>
+  <script type="text/javascript" src="mscorlib.js"></script>
+  <script type="text/javascript" src="http://code.jquery.com/jquery-1.4.2.min.js"></script>
+  <script type="text/javascript" src="Photos.debug.js"></script>
+  <script type="text/javascript" src="PhotoList.test.js"></script>
+</body>
+</html>
diff --git a/samples/Photos/PhotoListTests/Web/QUnit.css b/samples/Photos/PhotoListTests/Web/QUnit.css
new file mode 100644
index 000000000..a9b4f5903
--- /dev/null
+++ b/samples/Photos/PhotoListTests/Web/QUnit.css
@@ -0,0 +1,112 @@
+ol#qunit-tests {
+	font-family:Calibri, Helvetica, Arial;
+	margin:0;
+	padding:0;
+	list-style-position:inside;
+	font-size: smaller;
+}
+ol#qunit-tests li{
+	padding:0.4em 0.5em 0.4em 2.5em;
+	border-bottom:1px solid #fff;
+	font-size:small;
+	list-style-position:inside;
+}
+ol#qunit-tests li ol{
+	box-shadow: inset 0px 2px 13px #999;
+	-moz-box-shadow: inset 0px 2px 13px #999;
+	-webkit-box-shadow: inset 0px 2px 13px #999;
+	margin-top:0.5em;
+	margin-left:0;
+	padding:0.5em;
+	background-color:#fff;
+}
+ol#qunit-tests li li{
+	border-bottom:none;
+	margin:0.5em;
+	background-color:#fff;
+	list-style-position: inside;
+	padding:0.4em 0.5em 0.4em 0.5em;
+}
+ol#qunit-tests li li.pass{
+	border-left:26px solid #C6E746;
+	background-color:#fff;
+	color:#5E740B;
+}
+ol#qunit-tests li li.fail{
+	border-left:26px solid #EE5757;
+	background-color:#fff;
+	color:#710909;
+}
+ol#qunit-tests li.pass{
+	background-color:#D2E0E6;
+	color:#528CE0;
+}
+ol#qunit-tests li.fail{
+	background-color:#EE5757;
+	color:#000;
+}
+ol#qunit-tests li strong {
+	cursor:pointer;
+}
+h1#qunit-header{
+	background-color:#0d3349;
+	margin:0;
+	padding:0.5em 0 0.5em 1em;
+	color:#fff;
+	font-family:Calibri, Helvetica, Arial;
+	border-top-right-radius:15px;
+	border-top-left-radius:15px;
+	-moz-border-radius-topright:15px;
+	-moz-border-radius-topleft:15px;
+	-webkit-border-top-right-radius:15px;
+	-webkit-border-top-left-radius:15px;
+	text-shadow: rgba(0, 0, 0, 0.5) 4px 4px 1px;
+}
+h2#qunit-banner{
+	font-family:Calibri, Helvetica, Arial;
+	height:5px;
+	margin:0;
+	padding:0;
+}
+h2#qunit-banner.qunit-pass{
+	background-color:#C6E746;
+}
+h2#qunit-banner.qunit-fail, #qunit-testrunner-toolbar {
+	background-color:#EE5757;
+}
+#qunit-testrunner-toolbar {
+	font-family:Calibri, Helvetica, Arial;
+	padding:0;
+	padding:0em 0 0.5em 2em;
+	font-size: small;
+}
+h2#qunit-userAgent {
+	font-family:Calibri, Helvetica, Arial;
+	background-color:#2b81af;
+	margin:0;
+	padding:0;
+	color:#fff;
+	font-size: small;
+	padding:0.5em 0 0.5em 2.5em;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+p#qunit-testresult{
+	font-family:Calibri, Helvetica, Arial;
+	margin:0;
+	font-size: small;
+	color:#2b81af;
+	border-bottom-right-radius:15px;
+	border-bottom-left-radius:15px;
+	-moz-border-radius-bottomright:15px;
+	-moz-border-radius-bottomleft:15px;
+	-webkit-border-bottom-right-radius:15px;
+	-webkit-border-bottom-left-radius:15px;
+	background-color:#D2E0E6;
+	padding:0.5em 0.5em 0.5em 2.5em;
+}
+strong b.fail{
+	color:#710909;
+}
+strong b.pass{
+	color:#5E740B;
+}
diff --git a/samples/Photos/PhotoListTests/Web/QUnit.js b/samples/Photos/PhotoListTests/Web/QUnit.js
new file mode 100644
index 000000000..f2704148e
--- /dev/null
+++ b/samples/Photos/PhotoListTests/Web/QUnit.js
@@ -0,0 +1,1043 @@
+/*
+ * QUnit - A JavaScript Unit Testing Framework
+ * 
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2009 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ */
+
+(function(window) {
+
+var QUnit = {
+
+	// Initialize the configuration options
+	init: function() {
+		config = {
+			stats: { all: 0, bad: 0 },
+			moduleStats: { all: 0, bad: 0 },
+			started: +new Date,
+			blocking: false,
+			autorun: false,
+			assertions: [],
+			filters: [],
+			queue: []
+		};
+
+		var tests = id("qunit-tests"),
+			banner = id("qunit-banner"),
+			result = id("qunit-testresult");
+
+		if ( tests ) {
+			tests.innerHTML = "";
+		}
+
+		if ( banner ) {
+			banner.className = "";
+		}
+
+		if ( result ) {
+			result.parentNode.removeChild( result );
+		}
+	},
+	
+	// call on start of module test to prepend name to all tests
+	module: function(name, testEnvironment) {
+		config.currentModule = name;
+
+		synchronize(function() {
+			if ( config.currentModule ) {
+				QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all );
+			}
+
+			config.currentModule = name;
+			config.moduleTestEnvironment = testEnvironment;
+			config.moduleStats = { all: 0, bad: 0 };
+
+			QUnit.moduleStart( name, testEnvironment );
+		});
+	},
+
+	asyncTest: function(testName, expected, callback) {
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = 0;
+		}
+
+		QUnit.test(testName, expected, callback, true);
+	},
+	
+	test: function(testName, expected, callback, async) {
+		var name = testName, testEnvironment, testEnvironmentArg;
+
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = null;
+		}
+		// is 2nd argument a testEnvironment?
+		if ( expected && typeof expected === 'object') {
+			testEnvironmentArg =  expected;
+			expected = null;
+		}
+
+		if ( config.currentModule ) {
+			name = config.currentModule + " module: " + name;
+		}
+
+		if ( !validTest(name) ) {
+			return;
+		}
+
+		synchronize(function() {
+			QUnit.testStart( testName );
+
+			testEnvironment = extend({
+				setup: function() {},
+				teardown: function() {}
+			}, config.moduleTestEnvironment);
+			if (testEnvironmentArg) {
+				extend(testEnvironment,testEnvironmentArg);
+			}
+
+			// allow utility functions to access the current test environment
+			QUnit.current_testEnvironment = testEnvironment;
+			
+			config.assertions = [];
+			config.expected = expected;
+
+			try {
+				if ( !config.pollution ) {
+					saveGlobal();
+				}
+
+				testEnvironment.setup.call(testEnvironment);
+			} catch(e) {
+				QUnit.ok( false, "Setup failed on " + name + ": " + e.message );
+			}
+
+			if ( async ) {
+				QUnit.stop();
+			}
+
+			try {
+				callback.call(testEnvironment);
+			} catch(e) {
+				fail("Test " + name + " died, exception and test follows", e, callback);
+				QUnit.ok( false, "Died on test #" + (config.assertions.length + 1) + ": " + e.message );
+				// else next test will carry the responsibility
+				saveGlobal();
+
+				// Restart the tests if they're blocking
+				if ( config.blocking ) {
+					start();
+				}
+			}
+		});
+
+		synchronize(function() {
+			try {
+				checkPollution();
+				testEnvironment.teardown.call(testEnvironment);
+			} catch(e) {
+				QUnit.ok( false, "Teardown failed on " + name + ": " + e.message );
+			}
+
+			try {
+				QUnit.reset();
+			} catch(e) {
+				fail("reset() failed, following Test " + name + ", exception and reset fn follows", e, reset);
+			}
+
+			if ( config.expected && config.expected != config.assertions.length ) {
+				QUnit.ok( false, "Expected " + config.expected + " assertions, but " + config.assertions.length + " were run" );
+			}
+
+			var good = 0, bad = 0,
+				tests = id("qunit-tests");
+
+			config.stats.all += config.assertions.length;
+			config.moduleStats.all += config.assertions.length;
+
+			if ( tests ) {
+				var ol  = document.createElement("ol");
+				ol.style.display = "none";
+
+				for ( var i = 0; i < config.assertions.length; i++ ) {
+					var assertion = config.assertions[i];
+
+					var li = document.createElement("li");
+					li.className = assertion.result ? "pass" : "fail";
+					li.appendChild(document.createTextNode(assertion.message || "(no message)"));
+					ol.appendChild( li );
+
+					if ( assertion.result ) {
+						good++;
+					} else {
+						bad++;
+						config.stats.bad++;
+						config.moduleStats.bad++;
+					}
+				}
+
+				var b = document.createElement("strong");
+				b.innerHTML = name + " <b style='color:black;'>(<b class='fail'>" + bad + "</b>, <b class='pass'>" + good + "</b>, " + config.assertions.length + ")</b>";
+				
+				addEvent(b, "click", function() {
+					var next = b.nextSibling, display = next.style.display;
+					next.style.display = display === "none" ? "block" : "none";
+				});
+				
+				addEvent(b, "dblclick", function(e) {
+					var target = e && e.target ? e.target : window.event.srcElement;
+					if ( target.nodeName.toLowerCase() === "strong" ) {
+						var text = "", node = target.firstChild;
+
+						while ( node.nodeType === 3 ) {
+							text += node.nodeValue;
+							node = node.nextSibling;
+						}
+
+						text = text.replace(/(^\s*|\s*$)/g, "");
+
+						if ( window.location ) {
+							window.location.href = window.location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent(text);
+						}
+					}
+				});
+
+				var li = document.createElement("li");
+				li.className = bad ? "fail" : "pass";
+				li.appendChild( b );
+				li.appendChild( ol );
+				tests.appendChild( li );
+
+				if ( bad ) {
+					var toolbar = id("qunit-testrunner-toolbar");
+					if ( toolbar ) {
+						toolbar.style.display = "block";
+						id("qunit-filter-pass").disabled = null;
+						id("qunit-filter-missing").disabled = null;
+					}
+				}
+
+			} else {
+				for ( var i = 0; i < config.assertions.length; i++ ) {
+					if ( !config.assertions[i].result ) {
+						bad++;
+						config.stats.bad++;
+						config.moduleStats.bad++;
+					}
+				}
+			}
+
+			QUnit.testDone( testName, bad, config.assertions.length );
+
+			if ( !window.setTimeout && !config.queue.length ) {
+				done();
+			}
+		});
+
+		if ( window.setTimeout && !config.doneTimer ) {
+			config.doneTimer = window.setTimeout(function(){
+				if ( !config.queue.length ) {
+					done();
+				} else {
+					synchronize( done );
+				}
+			}, 13);
+		}
+	},
+	
+	/**
+	 * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+	 */
+	expect: function(asserts) {
+		config.expected = asserts;
+	},
+
+	/**
+	 * Asserts true.
+	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
+	 */
+	ok: function(a, msg) {
+		QUnit.log(a, msg);
+
+		config.assertions.push({
+			result: !!a,
+			message: msg
+		});
+	},
+
+	/**
+	 * Checks that the first two arguments are equal, with an optional message.
+	 * Prints out both actual and expected values.
+	 *
+	 * Prefered to ok( actual == expected, message )
+	 *
+	 * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." );
+	 *
+	 * @param Object actual
+	 * @param Object expected
+	 * @param String message (optional)
+	 */
+	equal: function(actual, expected, message) {
+		push(expected == actual, actual, expected, message);
+	},
+
+	notEqual: function(actual, expected, message) {
+		push(expected != actual, actual, expected, message);
+	},
+	
+	deepEqual: function(a, b, message) {
+		push(QUnit.equiv(a, b), a, b, message);
+	},
+
+	notDeepEqual: function(a, b, message) {
+		push(!QUnit.equiv(a, b), a, b, message);
+	},
+
+	strictEqual: function(actual, expected, message) {
+		push(expected === actual, actual, expected, message);
+	},
+
+	notStrictEqual: function(actual, expected, message) {
+		push(expected !== actual, actual, expected, message);
+	},
+	
+	start: function() {
+		// A slight delay, to avoid any current callbacks
+		if ( window.setTimeout ) {
+			window.setTimeout(function() {
+				if ( config.timeout ) {
+					clearTimeout(config.timeout);
+				}
+
+				config.blocking = false;
+				process();
+			}, 13);
+		} else {
+			config.blocking = false;
+			process();
+		}
+	},
+	
+	stop: function(timeout) {
+		config.blocking = true;
+
+		if ( timeout && window.setTimeout ) {
+			config.timeout = window.setTimeout(function() {
+				QUnit.ok( false, "Test timed out" );
+				QUnit.start();
+			}, timeout);
+		}
+	},
+	
+	/**
+	 * Resets the test setup. Useful for tests that modify the DOM.
+	 */
+	reset: function() {
+		if ( window.jQuery ) {
+			jQuery("#main").html( config.fixture );
+			jQuery.event.global = {};
+			jQuery.ajaxSettings = extend({}, config.ajaxSettings);
+		}
+	},
+	
+	/**
+	 * Trigger an event on an element.
+	 *
+	 * @example triggerEvent( document.body, "click" );
+	 *
+	 * @param DOMElement elem
+	 * @param String type
+	 */
+	triggerEvent: function( elem, type, event ) {
+		if ( document.createEvent ) {
+			event = document.createEvent("MouseEvents");
+			event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
+				0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			elem.dispatchEvent( event );
+
+		} else if ( elem.fireEvent ) {
+			elem.fireEvent("on"+type);
+		}
+	},
+	
+	// Safe object type checking
+	is: function( type, obj ) {
+		return Object.prototype.toString.call( obj ) === "[object "+ type +"]";
+	},
+	
+	// Logging callbacks
+	done: function(failures, total) {},
+	log: function(result, message) {},
+	testStart: function(name) {},
+	testDone: function(name, failures, total) {},
+	moduleStart: function(name, testEnvironment) {},
+	moduleDone: function(name, failures, total) {}
+};
+
+// Backwards compatibility, deprecated
+QUnit.equals = QUnit.equal;
+QUnit.same = QUnit.deepEqual;
+
+// Maintain internal state
+var config = {
+	// The queue of tests to run
+	queue: [],
+
+	// block until document ready
+	blocking: true
+};
+
+// Load paramaters
+(function() {
+	var location = window.location || { search: "", protocol: "file:" },
+		GETParams = location.search.slice(1).split('&');
+
+	for ( var i = 0; i < GETParams.length; i++ ) {
+		GETParams[i] = decodeURIComponent( GETParams[i] );
+		if ( GETParams[i] === "noglobals" ) {
+			GETParams.splice( i, 1 );
+			i--;
+			config.noglobals = true;
+		} else if ( GETParams[i].search('=') > -1 ) {
+			GETParams.splice( i, 1 );
+			i--;
+		}
+	}
+	
+	// restrict modules/tests by get parameters
+	config.filters = GETParams;
+	
+	// Figure out if we're running the tests from a server or not
+	QUnit.isLocal = !!(location.protocol === 'file:');
+})();
+
+// Expose the API as global variables, unless an 'exports'
+// object exists, in that case we assume we're in CommonJS
+if ( typeof exports === "undefined" || typeof require === "undefined" ) {
+	extend(window, QUnit);
+	window.QUnit = QUnit;
+} else {
+	extend(exports, QUnit);
+	exports.QUnit = QUnit;
+}
+
+if ( typeof document === "undefined" || document.readyState === "complete" ) {
+	config.autorun = true;
+}
+
+addEvent(window, "load", function() {
+	// Initialize the config, saving the execution queue
+	var oldconfig = extend({}, config);
+	QUnit.init();
+	extend(config, oldconfig);
+
+	config.blocking = false;
+
+	var userAgent = id("qunit-userAgent");
+	if ( userAgent ) {
+		userAgent.innerHTML = navigator.userAgent;
+	}
+	
+	var toolbar = id("qunit-testrunner-toolbar");
+	if ( toolbar ) {
+		toolbar.style.display = "none";
+		
+		var filter = document.createElement("input");
+		filter.type = "checkbox";
+		filter.id = "qunit-filter-pass";
+		filter.disabled = true;
+		addEvent( filter, "click", function() {
+			var li = document.getElementsByTagName("li");
+			for ( var i = 0; i < li.length; i++ ) {
+				if ( li[i].className.indexOf("pass") > -1 ) {
+					li[i].style.display = filter.checked ? "none" : "";
+				}
+			}
+		});
+		toolbar.appendChild( filter );
+
+		var label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-pass");
+		label.innerHTML = "Hide passed tests";
+		toolbar.appendChild( label );
+
+		var missing = document.createElement("input");
+		missing.type = "checkbox";
+		missing.id = "qunit-filter-missing";
+		missing.disabled = true;
+		addEvent( missing, "click", function() {
+			var li = document.getElementsByTagName("li");
+			for ( var i = 0; i < li.length; i++ ) {
+				if ( li[i].className.indexOf("fail") > -1 && li[i].innerHTML.indexOf('missing test - untested code is broken code') > - 1 ) {
+					li[i].parentNode.parentNode.style.display = missing.checked ? "none" : "block";
+				}
+			}
+		});
+		toolbar.appendChild( missing );
+
+		label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-missing");
+		label.innerHTML = "Hide missing tests (untested code is broken code)";
+		toolbar.appendChild( label );
+	}
+
+	var main = id('main');
+	if ( main ) {
+		config.fixture = main.innerHTML;
+	}
+
+	if ( window.jQuery ) {
+		config.ajaxSettings = window.jQuery.ajaxSettings;
+	}
+
+	QUnit.start();
+});
+
+function done() {
+	if ( config.doneTimer && window.clearTimeout ) {
+		window.clearTimeout( config.doneTimer );
+		config.doneTimer = null;
+	}
+
+	if ( config.queue.length ) {
+		config.doneTimer = window.setTimeout(function(){
+			if ( !config.queue.length ) {
+				done();
+			} else {
+				synchronize( done );
+			}
+		}, 13);
+
+		return;
+	}
+
+	config.autorun = true;
+
+	// Log the last module results
+	if ( config.currentModule ) {
+		QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all );
+	}
+
+	var banner = id("qunit-banner"),
+		tests = id("qunit-tests"),
+		html = ['Tests completed in ',
+		+new Date - config.started, ' milliseconds.<br/>',
+		'<span class="passed">', config.stats.all - config.stats.bad, '</span> tests of <span class="total">', config.stats.all, '</span> passed, <span class="failed">', config.stats.bad,'</span> failed.'].join('');
+
+	if ( banner ) {
+		banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass");
+	}
+
+	if ( tests ) {	
+		var result = id("qunit-testresult");
+
+		if ( !result ) {
+			result = document.createElement("p");
+			result.id = "qunit-testresult";
+			result.className = "result";
+			tests.parentNode.insertBefore( result, tests.nextSibling );
+		}
+
+		result.innerHTML = html;
+	}
+
+	QUnit.done( config.stats.bad, config.stats.all );
+}
+
+function validTest( name ) {
+	var i = config.filters.length,
+		run = false;
+
+	if ( !i ) {
+		return true;
+	}
+	
+	while ( i-- ) {
+		var filter = config.filters[i],
+			not = filter.charAt(0) == '!';
+
+		if ( not ) {
+			filter = filter.slice(1);
+		}
+
+		if ( name.indexOf(filter) !== -1 ) {
+			return !not;
+		}
+
+		if ( not ) {
+			run = true;
+		}
+	}
+
+	return run;
+}
+
+function push(result, actual, expected, message) {
+	message = message || (result ? "okay" : "failed");
+	QUnit.ok( result, result ? message + ": " + expected : message + ", expected: " + QUnit.jsDump.parse(expected) + " result: " + QUnit.jsDump.parse(actual) );
+}
+
+function synchronize( callback ) {
+	config.queue.push( callback );
+
+	if ( config.autorun && !config.blocking ) {
+		process();
+	}
+}
+
+function process() {
+	while ( config.queue.length && !config.blocking ) {
+		config.queue.shift()();
+	}
+}
+
+function saveGlobal() {
+	config.pollution = [];
+	
+	if ( config.noglobals ) {
+		for ( var key in window ) {
+			config.pollution.push( key );
+		}
+	}
+}
+
+function checkPollution( name ) {
+	var old = config.pollution;
+	saveGlobal();
+	
+	var newGlobals = diff( old, config.pollution );
+	if ( newGlobals.length > 0 ) {
+		ok( false, "Introduced global variable(s): " + newGlobals.join(", ") );
+		config.expected++;
+	}
+
+	var deletedGlobals = diff( config.pollution, old );
+	if ( deletedGlobals.length > 0 ) {
+		ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") );
+		config.expected++;
+	}
+}
+
+// returns a new Array with the elements that are in a but not in b
+function diff( a, b ) {
+	var result = a.slice();
+	for ( var i = 0; i < result.length; i++ ) {
+		for ( var j = 0; j < b.length; j++ ) {
+			if ( result[i] === b[j] ) {
+				result.splice(i, 1);
+				i--;
+				break;
+			}
+		}
+	}
+	return result;
+}
+
+function fail(message, exception, callback) {
+	if ( typeof console !== "undefined" && console.error && console.warn ) {
+		console.error(message);
+		console.error(exception);
+		console.warn(callback.toString());
+
+	} else if ( window.opera && opera.postError ) {
+		opera.postError(message, exception, callback.toString);
+	}
+}
+
+function extend(a, b) {
+	for ( var prop in b ) {
+		a[prop] = b[prop];
+	}
+
+	return a;
+}
+
+function addEvent(elem, type, fn) {
+	if ( elem.addEventListener ) {
+		elem.addEventListener( type, fn, false );
+	} else if ( elem.attachEvent ) {
+		elem.attachEvent( "on" + type, fn );
+	} else {
+		fn();
+	}
+}
+
+function id(name) {
+	return !!(typeof document !== "undefined" && document && document.getElementById) &&
+		document.getElementById( name );
+}
+
+// Test for equality any JavaScript type.
+// Discussions and reference: http://philrathe.com/articles/equiv
+// Test suites: http://philrathe.com/tests/equiv
+// Author: Philippe Rathé <prathe@gmail.com>
+QUnit.equiv = function () {
+
+    var innerEquiv; // the real equiv function
+    var callers = []; // stack to decide between skip/abort functions
+
+
+    // Determine what is o.
+    function hoozit(o) {
+        if (QUnit.is("String", o)) {
+            return "string";
+            
+        } else if (QUnit.is("Boolean", o)) {
+            return "boolean";
+
+        } else if (QUnit.is("Number", o)) {
+
+            if (isNaN(o)) {
+                return "nan";
+            } else {
+                return "number";
+            }
+
+        } else if (typeof o === "undefined") {
+            return "undefined";
+
+        // consider: typeof null === object
+        } else if (o === null) {
+            return "null";
+
+        // consider: typeof [] === object
+        } else if (QUnit.is( "Array", o)) {
+            return "array";
+        
+        // consider: typeof new Date() === object
+        } else if (QUnit.is( "Date", o)) {
+            return "date";
+
+        // consider: /./ instanceof Object;
+        //           /./ instanceof RegExp;
+        //          typeof /./ === "function"; // => false in IE and Opera,
+        //                                          true in FF and Safari
+        } else if (QUnit.is( "RegExp", o)) {
+            return "regexp";
+
+        } else if (typeof o === "object") {
+            return "object";
+
+        } else if (QUnit.is( "Function", o)) {
+            return "function";
+        } else {
+            return undefined;
+        }
+    }
+
+    // Call the o related callback with the given arguments.
+    function bindCallbacks(o, callbacks, args) {
+        var prop = hoozit(o);
+        if (prop) {
+            if (hoozit(callbacks[prop]) === "function") {
+                return callbacks[prop].apply(callbacks, args);
+            } else {
+                return callbacks[prop]; // or undefined
+            }
+        }
+    }
+    
+    var callbacks = function () {
+
+        // for string, boolean, number and null
+        function useStrictEquality(b, a) {
+            if (b instanceof a.constructor || a instanceof b.constructor) {
+                // to catch short annotaion VS 'new' annotation of a declaration
+                // e.g. var i = 1;
+                //      var j = new Number(1);
+                return a == b;
+            } else {
+                return a === b;
+            }
+        }
+
+        return {
+            "string": useStrictEquality,
+            "boolean": useStrictEquality,
+            "number": useStrictEquality,
+            "null": useStrictEquality,
+            "undefined": useStrictEquality,
+
+            "nan": function (b) {
+                return isNaN(b);
+            },
+
+            "date": function (b, a) {
+                return hoozit(b) === "date" && a.valueOf() === b.valueOf();
+            },
+
+            "regexp": function (b, a) {
+                return hoozit(b) === "regexp" &&
+                    a.source === b.source && // the regex itself
+                    a.global === b.global && // and its modifers (gmi) ...
+                    a.ignoreCase === b.ignoreCase &&
+                    a.multiline === b.multiline;
+            },
+
+            // - skip when the property is a method of an instance (OOP)
+            // - abort otherwise,
+            //   initial === would have catch identical references anyway
+            "function": function () {
+                var caller = callers[callers.length - 1];
+                return caller !== Object &&
+                        typeof caller !== "undefined";
+            },
+
+            "array": function (b, a) {
+                var i;
+                var len;
+
+                // b could be an object literal here
+                if ( ! (hoozit(b) === "array")) {
+                    return false;
+                }
+
+                len = a.length;
+                if (len !== b.length) { // safe and faster
+                    return false;
+                }
+                for (i = 0; i < len; i++) {
+                    if ( ! innerEquiv(a[i], b[i])) {
+                        return false;
+                    }
+                }
+                return true;
+            },
+
+            "object": function (b, a) {
+                var i;
+                var eq = true; // unless we can proove it
+                var aProperties = [], bProperties = []; // collection of strings
+
+                // comparing constructors is more strict than using instanceof
+                if ( a.constructor !== b.constructor) {
+                    return false;
+                }
+
+                // stack constructor before traversing properties
+                callers.push(a.constructor);
+
+                for (i in a) { // be strict: don't ensures hasOwnProperty and go deep
+
+                    aProperties.push(i); // collect a's properties
+
+                    if ( ! innerEquiv(a[i], b[i])) {
+                        eq = false;
+                        break;
+                    }
+                }
+
+                callers.pop(); // unstack, we are done
+
+                for (i in b) {
+                    bProperties.push(i); // collect b's properties
+                }
+
+                // Ensures identical properties name
+                return eq && innerEquiv(aProperties.sort(), bProperties.sort());
+            }
+        };
+    }();
+
+    innerEquiv = function () { // can take multiple arguments
+        var args = Array.prototype.slice.apply(arguments);
+        if (args.length < 2) {
+            return true; // end transition
+        }
+
+        return (function (a, b) {
+            if (a === b) {
+                return true; // catch the most you can
+            } else if (a === null || b === null || typeof a === "undefined" || typeof b === "undefined" || hoozit(a) !== hoozit(b)) {
+                return false; // don't lose time with error prone cases
+            } else {
+                return bindCallbacks(a, callbacks, [b, a]);
+            }
+
+        // apply transition with (1..n) arguments
+        })(args[0], args[1]) && arguments.callee.apply(this, args.splice(1, args.length -1));
+    };
+
+    return innerEquiv;
+
+}();
+
+/**
+ * jsDump
+ * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
+ * Date: 5/15/2008
+ * @projectDescription Advanced and extensible data dumping for Javascript.
+ * @version 1.0.0
+ * @author Ariel Flesler
+ * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
+ */
+QUnit.jsDump = (function() {
+	function quote( str ) {
+		return '"' + str.toString().replace(/"/g, '\\"') + '"';
+	};
+	function literal( o ) {
+		return o + '';	
+	};
+	function join( pre, arr, post ) {
+		var s = jsDump.separator(),
+			base = jsDump.indent(),
+			inner = jsDump.indent(1);
+		if ( arr.join )
+			arr = arr.join( ',' + s + inner );
+		if ( !arr )
+			return pre + post;
+		return [ pre, inner + arr, base + post ].join(s);
+	};
+	function array( arr ) {
+		var i = arr.length,	ret = Array(i);					
+		this.up();
+		while ( i-- )
+			ret[i] = this.parse( arr[i] );				
+		this.down();
+		return join( '[', ret, ']' );
+	};
+	
+	var reName = /^function (\w+)/;
+	
+	var jsDump = {
+		parse:function( obj, type ) { //type is used mostly internally, you can fix a (custom)type in advance
+			var	parser = this.parsers[ type || this.typeOf(obj) ];
+			type = typeof parser;			
+			
+			return type == 'function' ? parser.call( this, obj ) :
+				   type == 'string' ? parser :
+				   this.parsers.error;
+		},
+		typeOf:function( obj ) {
+			var type;
+			if ( obj === null ) {
+				type = "null";
+			} else if (typeof obj === "undefined") {
+				type = "undefined";
+			} else if (QUnit.is("RegExp", obj)) {
+				type = "regexp";
+			} else if (QUnit.is("Date", obj)) {
+				type = "date";
+			} else if (QUnit.is("Function", obj)) {
+				type = "function";
+			} else if (QUnit.is("Array", obj)) {
+				type = "array";
+			} else if (QUnit.is("Window", obj) || QUnit.is("global", obj)) {
+				type = "window";
+			} else if (QUnit.is("HTMLDocument", obj)) {
+				type = "document";
+			} else if (QUnit.is("HTMLCollection", obj) || QUnit.is("NodeList", obj)) {
+				type = "nodelist";
+			} else if (/^\[object HTML/.test(Object.prototype.toString.call( obj ))) {
+				type = "node";
+			} else {
+				type = typeof obj;
+			}
+			return type;
+		},
+		separator:function() {
+			return this.multiline ?	this.HTML ? '<br />' : '\n' : this.HTML ? '&nbsp;' : ' ';
+		},
+		indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing
+			if ( !this.multiline )
+				return '';
+			var chr = this.indentChar;
+			if ( this.HTML )
+				chr = chr.replace(/\t/g,'   ').replace(/ /g,'&nbsp;');
+			return Array( this._depth_ + (extra||0) ).join(chr);
+		},
+		up:function( a ) {
+			this._depth_ += a || 1;
+		},
+		down:function( a ) {
+			this._depth_ -= a || 1;
+		},
+		setParser:function( name, parser ) {
+			this.parsers[name] = parser;
+		},
+		// The next 3 are exposed so you can use them
+		quote:quote, 
+		literal:literal,
+		join:join,
+		//
+		_depth_: 1,
+		// This is the list of parsers, to modify them, use jsDump.setParser
+		parsers:{
+			window: '[Window]',
+			document: '[Document]',
+			error:'[ERROR]', //when no parser is found, shouldn't happen
+			unknown: '[Unknown]',
+			'null':'null',
+			undefined:'undefined',
+			'function':function( fn ) {
+				var ret = 'function',
+					name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE
+				if ( name )
+					ret += ' ' + name;
+				ret += '(';
+				
+				ret = [ ret, this.parse( fn, 'functionArgs' ), '){'].join('');
+				return join( ret, this.parse(fn,'functionCode'), '}' );
+			},
+			array: array,
+			nodelist: array,
+			arguments: array,
+			object:function( map ) {
+				var ret = [ ];
+				this.up();
+				for ( var key in map )
+					ret.push( this.parse(key,'key') + ': ' + this.parse(map[key]) );
+				this.down();
+				return join( '{', ret, '}' );
+			},
+			node:function( node ) {
+				var open = this.HTML ? '&lt;' : '<',
+					close = this.HTML ? '&gt;' : '>';
+					
+				var tag = node.nodeName.toLowerCase(),
+					ret = open + tag;
+					
+				for ( var a in this.DOMAttrs ) {
+					var val = node[this.DOMAttrs[a]];
+					if ( val )
+						ret += ' ' + a + '=' + this.parse( val, 'attribute' );
+				}
+				return ret + close + open + '/' + tag + close;
+			},
+			functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function
+				var l = fn.length;
+				if ( !l ) return '';				
+				
+				var args = Array(l);
+				while ( l-- )
+					args[l] = String.fromCharCode(97+l);//97 is 'a'
+				return ' ' + args.join(', ') + ' ';
+			},
+			key:quote, //object calls it internally, the key part of an item in a map
+			functionCode:'[code]', //function calls it internally, it's the content of the function
+			attribute:quote, //node calls it internally, it's an html attribute value
+			string:quote,
+			date:quote,
+			regexp:literal, //regex
+			number:literal,
+			'boolean':literal
+		},
+		DOMAttrs:{//attributes to dump from nodes, name=>realName
+			id:'id',
+			name:'name',
+			'class':'className'
+		},
+		HTML:true,//if true, entities are escaped ( <, >, \t, space and \n )
+		indentChar:'   ',//indentation unit
+		multiline:true //if true, items in a collection, are separated by a \n, else just a space.
+	};
+
+	return jsDump;
+})();
+
+})(this);
diff --git a/samples/Photos/PhotoListTests/Web/QUnitExt.js b/samples/Photos/PhotoListTests/Web/QUnitExt.js
new file mode 100644
index 000000000..2e268d688
--- /dev/null
+++ b/samples/Photos/PhotoListTests/Web/QUnitExt.js
@@ -0,0 +1,59 @@
+(function() {
+  var currentModule = null;
+  var logData = '';
+  
+  function appendLog(logText) {
+    logData = logData + logText + '\r\n';
+
+    var logHolder = document.getElementById('qunit-log');
+    if (logHolder) {
+      logHolder.value = logData;
+    }
+  }
+  
+  QUnit.log = function(result, message) {
+    if (arguments.length === 1) {
+      message = arguments[0];
+    }
+    appendLog('    ' + message);
+  }
+
+  QUnit.done = function(failures, total) {
+      appendLog('\r\nCompleted; ' + 'failures = ' + failures + '; total = ' + total);
+
+      var logUrl = '/log/' + ((failures === 0) ? 'success' : 'failure');
+      var xhr = new XMLHttpRequest();
+      xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+          window.open('', '_self', '');
+          window.close();
+        }
+      };
+      xhr.open('POST', logUrl, /* async */ false);
+      xhr.setRequestHeader('Content-Type', 'text/plain');
+      xhr.send(logData);
+  }
+
+  QUnit.testStart = function(name) {
+    appendLog('  Test Started: ' + name);
+  }
+  
+  QUnit.testDone = function(name, failures, total) {
+    appendLog('  Test Done: ' + name + '; failures = ' + failures + '; total = ' + total);
+    appendLog('');
+  }
+
+  QUnit.moduleStart = function(name, testEnv) {
+    currentModule = name;
+    appendLog('Module Started: ' + name);
+  }
+
+  QUnit.moduleDone = function(name, failures, total) {
+    if (name === currentModule) {
+      appendLog('Module Done: ' + name + '; failures = ' + failures + '; total = ' + total + '\r\n');
+      appendLog('');
+      appendLog('');
+    }
+    currentModule = null;
+  }
+})();
diff --git a/samples/Photos/PhotoListTests/packages.config b/samples/Photos/PhotoListTests/packages.config
new file mode 100644
index 000000000..753b9e2a5
--- /dev/null
+++ b/samples/Photos/PhotoListTests/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp.Testing" version="0.7.5.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/Photos/PhotoTiles/PhotoTiles.csproj b/samples/Photos/PhotoTiles/PhotoTiles.csproj
new file mode 100644
index 000000000..7a54746e9
--- /dev/null
+++ b/samples/Photos/PhotoTiles/PhotoTiles.csproj
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{2F542547-7B1D-4C43-AF1F-092AEE556FC2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PhotoTiles</RootNamespace>
+    <AssemblyName>PhotoTiles</AssemblyName>
+    <ScriptTemplate>Properties\Script.template</ScriptTemplate>
+    <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateScript>True</GenerateScript>
+    <GenerateResources>True</GenerateResources>
+    <DeploymentPath>..\PhotosWeb\Scripts</DeploymentPath>
+    <RestoreNugetPackages>true</RestoreNugetPackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Debug\PhotoTiles.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Release\PhotoTiles.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Properties\FxCop.ruleset" />
+    <None Include="Properties\Script.template" />
+    <Compile Include="PhotoTilesPage.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Script.jQuery">
+      <HintPath>..\packages\ScriptSharp.Lib.jQuery.0.7.5.0\lib\Script.jQuery.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.jQuery.Templating">
+      <HintPath>..\packages\ScriptSharp.Lib.jQuery.Templating.0.7.5.0\lib\Script.jQuery.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.Web">
+      <HintPath>..\packages\ScriptSharp.Lib.HTML.0.7.5.0\lib\Script.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Photos\Photos.csproj">
+      <Project>{336cc726-e62d-484b-a15e-3e70a676d989}</Project>
+      <Name>Photos</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Plugins\Plugins.csproj">
+      <Project>{a441a116-8f91-4fbc-8420-d21c98283bd3}</Project>
+      <Name>Plugins</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets" Condition="Exists('..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets')" />
+  <Import Project="..\packages\nuget.targets" />
+</Project>
\ No newline at end of file
diff --git a/samples/Photos/PhotoTiles/PhotoTilesPage.cs b/samples/Photos/PhotoTiles/PhotoTilesPage.cs
new file mode 100644
index 000000000..5f2d491e0
--- /dev/null
+++ b/samples/Photos/PhotoTiles/PhotoTilesPage.cs
@@ -0,0 +1,81 @@
+// PhotoTilesPage.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Html;
+using System.Runtime.CompilerServices;
+using jQueryApi;
+using jQueryApi.Templating;
+using jQueryApi.Gridster;
+using jQueryApi.LightBox;
+using Photos;
+
+namespace PhotoGrid {
+
+    [GlobalMethods]
+    internal static class PhotoTilesPage {
+
+        static PhotoTilesPage() {
+            jQuery.OnDocumentReady(delegate() {
+                string apiKey = (string)jQuery.FromElement(Document.Body).GetDataValue("flickrKey");
+                IPhotoService flickrService = new FlickrPhotoService();
+
+                jQuery.Select("#searchButton").Click(delegate(jQueryEvent e) {
+                    string tags = jQuery.Select("#tagsTextBox").GetValue();
+
+                    flickrService.SearchPhotos(tags, 20).Done(
+                        delegate(IEnumerable<Photo> photos) {
+                            jQueryObject thumbnailList = jQuery.Select("#thumbsList");
+                            thumbnailList.Empty();
+
+                            if (photos == null) {
+                                return;
+                            }
+
+                            int photoIndex = 0;
+                            foreach (Photo photo in photos) {
+                                if (photoIndex % 6 == 0) {
+                                    jQuery.Select("#bigThumbnailTemplate").Plugin<jQueryTemplateObject>()
+                                        .RenderTemplate(photo)
+                                        .AppendTo(thumbnailList);
+                                }
+                                else if ((photoIndex % 3 == 0) || (photo.imageWidth == photo.imageHeight)) {
+                                    jQuery.Select("#sqThumbnailTemplate").Plugin<jQueryTemplateObject>()
+                                        .RenderTemplate(photo)
+                                        .AppendTo(thumbnailList);
+                                }
+                                else if (photo.thumbnailWidth > photo.thumbnailHeight) {
+                                    jQuery.Select("#horzThumbnailTemplate").Plugin<jQueryTemplateObject>()
+                                        .RenderTemplate(photo)
+                                        .AppendTo(thumbnailList);
+                                }
+                                else {
+                                    jQuery.Select("#vertThumbnailTemplate").Plugin<jQueryTemplateObject>()
+                                        .RenderTemplate(photo)
+                                        .AppendTo(thumbnailList);
+                                }
+
+                                photoIndex++;
+                            }
+
+                            GridsterOptions gridOptions = new GridsterOptions();
+                            gridOptions.Margins = new int[] { 10, 10 };
+                            gridOptions.BaseDimensions = new int[] { 140, 140 };
+
+                            thumbnailList.Plugin<jQueryGridsterObject>().Gridster(gridOptions)
+                                .Find("a")
+                                .Plugin<jQueryLightBoxObject>().LightBox();
+
+                            GridsterObject gridster =
+                                (GridsterObject)thumbnailList.GetDataValue("gridster");
+                            gridster.DisableDragging();
+                        });
+
+                    jQuery.FromElement(Document.Body).Focus();
+                    e.PreventDefault();
+                });
+            });
+        }
+    }
+}
diff --git a/samples/Photos/PhotoTiles/Properties/AssemblyInfo.cs b/samples/Photos/PhotoTiles/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..9ce779606
--- /dev/null
+++ b/samples/Photos/PhotoTiles/Properties/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("PhotoGrid")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script# Samples")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("PhotoGrid")]
diff --git a/samples/Photos/PhotoTiles/Properties/FxCop.ruleset b/samples/Photos/PhotoTiles/Properties/FxCop.ruleset
new file mode 100644
index 000000000..47c160f61
--- /dev/null
+++ b/samples/Photos/PhotoTiles/Properties/FxCop.ruleset
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Script# Rules" Description="General Script Rules" ToolsVersion="10.0">
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1000" Action="Warning" />
+    <Rule Id="CA1001" Action="Warning" />
+    <Rule Id="CA1008" Action="Warning" />
+    <Rule Id="CA1009" Action="Warning" />
+    <Rule Id="CA1010" Action="Warning" />
+    <Rule Id="CA1011" Action="Warning" />
+    <Rule Id="CA1012" Action="Warning" />
+    <Rule Id="CA1013" Action="Warning" />
+    <Rule Id="CA1016" Action="Warning" />
+    <Rule Id="CA1018" Action="Warning" />
+    <Rule Id="CA1019" Action="Warning" />
+    <Rule Id="CA1020" Action="Warning" />
+    <Rule Id="CA1021" Action="Warning" />
+    <Rule Id="CA1023" Action="Warning" />
+    <Rule Id="CA1024" Action="Warning" />
+    <Rule Id="CA1026" Action="Warning" />
+    <Rule Id="CA1027" Action="Warning" />
+    <Rule Id="CA1028" Action="Warning" />
+    <Rule Id="CA1030" Action="Warning" />
+    <Rule Id="CA1032" Action="Warning" />
+    <Rule Id="CA1033" Action="Warning" />
+    <Rule Id="CA1034" Action="Warning" />
+    <Rule Id="CA1036" Action="Warning" />
+    <Rule Id="CA1040" Action="Warning" />
+    <Rule Id="CA1041" Action="Warning" />
+    <Rule Id="CA1043" Action="Warning" />
+    <Rule Id="CA1044" Action="Warning" />
+    <Rule Id="CA1045" Action="Warning" />
+    <Rule Id="CA1046" Action="Warning" />
+    <Rule Id="CA1047" Action="Warning" />
+    <Rule Id="CA1048" Action="Warning" />
+    <Rule Id="CA1052" Action="Warning" />
+    <Rule Id="CA1053" Action="Warning" />
+    <Rule Id="CA1058" Action="Warning" />
+    <Rule Id="CA1059" Action="Warning" />
+    <Rule Id="CA1061" Action="Warning" />
+    <Rule Id="CA1065" Action="Warning" />
+    <Rule Id="CA1500" Action="Warning" />
+    <Rule Id="CA1501" Action="Warning" />
+    <Rule Id="CA1502" Action="Warning" />
+    <Rule Id="CA1504" Action="Warning" />
+    <Rule Id="CA1505" Action="Warning" />
+    <Rule Id="CA1506" Action="Warning" />
+    <Rule Id="CA1700" Action="Warning" />
+    <Rule Id="CA1701" Action="Warning" />
+    <Rule Id="CA1702" Action="Warning" />
+    <Rule Id="CA1703" Action="Warning" />
+    <Rule Id="CA1704" Action="Warning" />
+    <Rule Id="CA1707" Action="Warning" />
+    <Rule Id="CA1708" Action="Warning" />
+    <Rule Id="CA1709" Action="Warning" />
+    <Rule Id="CA1710" Action="Warning" />
+    <Rule Id="CA1711" Action="Warning" />
+    <Rule Id="CA1712" Action="Warning" />
+    <Rule Id="CA1713" Action="Warning" />
+    <Rule Id="CA1714" Action="Warning" />
+    <Rule Id="CA1715" Action="Warning" />
+    <Rule Id="CA1716" Action="Warning" />
+    <Rule Id="CA1717" Action="Warning" />
+    <Rule Id="CA1719" Action="Warning" />
+    <Rule Id="CA1720" Action="Warning" />
+    <Rule Id="CA1721" Action="Warning" />
+    <Rule Id="CA1722" Action="Warning" />
+    <Rule Id="CA1724" Action="Warning" />
+    <Rule Id="CA1725" Action="Warning" />
+    <Rule Id="CA1726" Action="Warning" />
+    <Rule Id="CA1800" Action="Warning" />
+    <Rule Id="CA1801" Action="Warning" />
+    <Rule Id="CA1802" Action="Warning" />
+    <Rule Id="CA1804" Action="Warning" />
+    <Rule Id="CA1806" Action="Warning" />
+    <Rule Id="CA1809" Action="Warning" />
+    <Rule Id="CA1811" Action="Warning" />
+    <Rule Id="CA1812" Action="Warning" />
+    <Rule Id="CA1813" Action="Warning" />
+    <Rule Id="CA1814" Action="Warning" />
+    <Rule Id="CA1815" Action="Warning" />
+    <Rule Id="CA1819" Action="Warning" />
+    <Rule Id="CA1820" Action="Warning" />
+    <Rule Id="CA1821" Action="Warning" />
+    <Rule Id="CA2201" Action="Warning" />
+    <Rule Id="CA2202" Action="Warning" />
+    <Rule Id="CA2204" Action="Warning" />
+    <Rule Id="CA2207" Action="Warning" />
+    <Rule Id="CA2213" Action="Warning" />
+    <Rule Id="CA2214" Action="Warning" />
+    <Rule Id="CA2215" Action="Warning" />
+    <Rule Id="CA2217" Action="Warning" />
+    <Rule Id="CA2218" Action="Warning" />
+    <Rule Id="CA2219" Action="Warning" />
+    <Rule Id="CA2222" Action="Warning" />
+    <Rule Id="CA2223" Action="Warning" />
+    <Rule Id="CA2224" Action="Warning" />
+    <Rule Id="CA2226" Action="Warning" />
+    <Rule Id="CA2227" Action="Warning" />
+    <Rule Id="CA2233" Action="Warning" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/samples/Photos/PhotoTiles/Properties/Script.template b/samples/Photos/PhotoTiles/Properties/Script.template
new file mode 100644
index 000000000..8fcd90176
--- /dev/null
+++ b/samples/Photos/PhotoTiles/Properties/Script.template
@@ -0,0 +1,8 @@
+//! #= ScriptFile ##
+//
+
+(function($) {
+#include[as-is] "%code%"
+})(jQuery);
+
+//! This script was generated using Script# v#= CompilerVersion ##
diff --git a/samples/Photos/PhotoTiles/packages.config b/samples/Photos/PhotoTiles/packages.config
new file mode 100644
index 000000000..6f6f76839
--- /dev/null
+++ b/samples/Photos/PhotoTiles/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.HTML" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.jQuery" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.jQuery.Templating" version="0.7.5.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/Photos/Photos.sln b/samples/Photos/Photos.sln
new file mode 100644
index 000000000..98a205941
--- /dev/null
+++ b/samples/Photos/Photos.sln
@@ -0,0 +1,61 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Photos", "Photos\Photos.csproj", "{336CC726-E62D-484B-A15E-3E70A676D989}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugins", "Plugins\Plugins.csproj", "{A441A116-8F91-4FBC-8420-D21C98283BD3}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotoGrid", "PhotoGrid\PhotoGrid.csproj", "{2F542546-7B1D-4C43-AF1F-092AEE556FC2}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotoList", "PhotoList\PhotoList.csproj", "{D4DF1CC1-C044-4C90-AB09-9744E9ACFCC9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotosWeb", "PhotosWeb\PhotosWeb.csproj", "{D1A2D374-10B7-45A6-A699-AFDE6AD62150}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotoListTests", "PhotoListTests\PhotoListTests.csproj", "{99344CB4-B164-4635-8795-D44E53357EE8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E27F9C93-1A3C-453A-B259-9ED71B63D332}"
+	ProjectSection(SolutionItems) = preProject
+		PhotoListTests.testsettings = PhotoListTests.testsettings
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PhotoTiles", "PhotoTiles\PhotoTiles.csproj", "{2F542547-7B1D-4C43-AF1F-092AEE556FC2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{336CC726-E62D-484B-A15E-3E70A676D989}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{336CC726-E62D-484B-A15E-3E70A676D989}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{336CC726-E62D-484B-A15E-3E70A676D989}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{336CC726-E62D-484B-A15E-3E70A676D989}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A441A116-8F91-4FBC-8420-D21C98283BD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A441A116-8F91-4FBC-8420-D21C98283BD3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A441A116-8F91-4FBC-8420-D21C98283BD3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A441A116-8F91-4FBC-8420-D21C98283BD3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F542546-7B1D-4C43-AF1F-092AEE556FC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F542546-7B1D-4C43-AF1F-092AEE556FC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F542546-7B1D-4C43-AF1F-092AEE556FC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F542546-7B1D-4C43-AF1F-092AEE556FC2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D4DF1CC1-C044-4C90-AB09-9744E9ACFCC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D4DF1CC1-C044-4C90-AB09-9744E9ACFCC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D4DF1CC1-C044-4C90-AB09-9744E9ACFCC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D4DF1CC1-C044-4C90-AB09-9744E9ACFCC9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D1A2D374-10B7-45A6-A699-AFDE6AD62150}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D1A2D374-10B7-45A6-A699-AFDE6AD62150}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D1A2D374-10B7-45A6-A699-AFDE6AD62150}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D1A2D374-10B7-45A6-A699-AFDE6AD62150}.Release|Any CPU.Build.0 = Release|Any CPU
+		{99344CB4-B164-4635-8795-D44E53357EE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{99344CB4-B164-4635-8795-D44E53357EE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{99344CB4-B164-4635-8795-D44E53357EE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{99344CB4-B164-4635-8795-D44E53357EE8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2F542547-7B1D-4C43-AF1F-092AEE556FC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2F542547-7B1D-4C43-AF1F-092AEE556FC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2F542547-7B1D-4C43-AF1F-092AEE556FC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2F542547-7B1D-4C43-AF1F-092AEE556FC2}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/samples/Photos/Photos/FlickrClient/Flickr.cs b/samples/Photos/Photos/FlickrClient/Flickr.cs
new file mode 100644
index 000000000..80d7bc7ba
--- /dev/null
+++ b/samples/Photos/Photos/FlickrClient/Flickr.cs
@@ -0,0 +1,38 @@
+// Flickr.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+namespace Photos.FlickrClient {
+
+    public interface IFlickrService {
+
+        void SearchPhotos(string tags, int count, FlickrSearchCallback callback);
+    }
+
+    public sealed class FlickrService : IFlickrService {
+
+        private const string FlickrSearchURLFormat =
+            "http://api.flickr.com/services/rest/?method=flickr.photos.search&api_key=be9b6f66bd7a1c0c0f1465a1b7e8a764&tags={0}&per_page={1}&sort=interestingness-desc&safe_search=1&content_type=1&in_gallery=true&extras=o_dims%2Curl_sq%2Curl_m&format=json&jsoncallback={2}";
+
+        public void SearchPhotos(string tags, int count, FlickrSearchCallback callback) {
+            FlickrCallback requestCallback = delegate(PhotoSearchResponse response) {
+                callback(response.Photos.Results);
+            };
+            string callbackName = Delegate.CreateExport(requestCallback);
+
+            string url = String.Format(FlickrSearchURLFormat, tags.EncodeUriComponent(), count, callbackName);
+            ScriptElement script = (ScriptElement)Document.CreateElement("script");
+            script.Type = "text/javascript";
+            script.Src = url;
+            Document.GetElementsByTagName("head")[0].AppendChild(script);
+        }
+    }
+
+    internal delegate void FlickrCallback(PhotoSearchResponse response);
+
+    public delegate void FlickrSearchCallback(List<PhotoResult> photos);
+}
diff --git a/samples/Photos/Photos/FlickrClient/Json.cs b/samples/Photos/Photos/FlickrClient/Json.cs
new file mode 100644
index 000000000..0d4e5736a
--- /dev/null
+++ b/samples/Photos/Photos/FlickrClient/Json.cs
@@ -0,0 +1,39 @@
+// Json.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using jQueryApi;
+
+namespace Photos.FlickrClient {
+
+    [Imported]
+    public sealed class PhotoSearchResponse {
+
+        [ScriptName("photos")]
+        public PhotoCollection Photos;
+    }
+
+    [Imported]
+    public sealed class PhotoCollection {
+
+        [ScriptName("photo")]
+        public List<PhotoResult> Results;
+    }
+
+    [Imported]
+    public sealed class PhotoResult {
+
+        public string ID;
+        public string Owner;
+        public string Title;
+        public string Url_sq;
+        public string Url_m;
+        public string Url_t;
+        public string Height_m;
+        public string Width_m;
+        public string Height_t;
+        public string Width_t;
+    }
+}
diff --git a/samples/Photos/Photos/FlickrPhotoService.cs b/samples/Photos/Photos/FlickrPhotoService.cs
new file mode 100644
index 000000000..5a929a3dd
--- /dev/null
+++ b/samples/Photos/Photos/FlickrPhotoService.cs
@@ -0,0 +1,60 @@
+// FlickrPhotoService.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using jQueryApi;
+using Photos.FlickrClient;
+
+namespace Photos {
+
+    public sealed class FlickrPhotoService : IPhotoService {
+
+        private static string SearchUriFormat = "http://api.flickr.com/services/rest/?method=flickr.photos.search&api_key={0}&tags={1}&sort=interestingness-desc&safe_search=1&extras=o_dims%2Curl_sq%2Curl_m%2Curl_t&per_page={2}&format=json";
+        private static string Base58Alphabet = "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ";
+        private string _apiKey;
+
+        public FlickrPhotoService() {
+            _apiKey = "be9b6f66bd7a1c0c0f1465a1b7e8a764";
+        }
+
+        private static string Base58Encode(string id) {
+            int number = Int32.Parse(id);
+
+            string encoded = "";
+            while (number > 0) {
+                int remainder = number % Base58Alphabet.Length;
+                number = (int)(number / Base58Alphabet.Length);
+                encoded = Base58Alphabet.CharAt(remainder) + encoded;
+            }
+
+            return encoded;
+        }
+
+        public IDeferred<IEnumerable<Photo>> SearchPhotos(string tags, int count) {
+            jQueryAjaxOptions ajaxOptions =
+                new jQueryAjaxOptions("url", String.Format(SearchUriFormat, _apiKey, tags.EncodeUriComponent(), count),
+                                      "jsonp", "jsoncallback",
+                                      "dataType", "jsonp");
+            return jQuery.AjaxRequest<PhotoSearchResponse>(ajaxOptions).Pipe<IEnumerable<Photo>>(
+                delegate(PhotoSearchResponse response) {
+                    List<Photo> photos =
+                        response.Photos.Results.Map<Photo>(delegate(PhotoResult photoResult) {
+                            return new Photo(photoResult.ID,
+                                             photoResult.Title,
+                                             "http://flic.kr/p/" + Base58Encode(photoResult.ID),
+                                             photoResult.Url_m,
+                                             photoResult.Url_t,
+                                             Int32.Parse(photoResult.Width_m),
+                                             Int32.Parse(photoResult.Height_m),
+                                             Int32.Parse(photoResult.Width_t),
+                                             Int32.Parse(photoResult.Height_t),
+                                             photoResult.Url_sq);
+                    });
+
+                    return photos;
+                });
+        }
+    }
+}
diff --git a/samples/Photos/Photos/IPhotoService.cs b/samples/Photos/Photos/IPhotoService.cs
new file mode 100644
index 000000000..860a14682
--- /dev/null
+++ b/samples/Photos/Photos/IPhotoService.cs
@@ -0,0 +1,14 @@
+// IPhotoService.cs
+//
+
+using System;
+using System.Collections.Generic;
+using jQueryApi;
+
+namespace Photos {
+
+    public interface IPhotoService {
+
+        IDeferred<IEnumerable<Photo>> SearchPhotos(string tags, int count);
+    }
+}
diff --git a/samples/Photos/Photos/Photo.cs b/samples/Photos/Photos/Photo.cs
new file mode 100644
index 000000000..18875f0ed
--- /dev/null
+++ b/samples/Photos/Photos/Photo.cs
@@ -0,0 +1,41 @@
+// Photo.cs
+//
+
+using System;
+
+namespace Photos {
+
+    /// <summary>
+    /// Represents a geo-tagged photo along with various bits of metadata.
+    /// </summary>
+    public sealed class Photo : Record {
+
+        public string id;
+
+        public string title;
+
+        public string url;
+        public string thumbnailUrl;
+        public string imageUrl;
+        public string squareImageUrl;
+
+        public int imageWidth;
+        public int imageHeight;
+
+        public int thumbnailWidth;
+        public int thumbnailHeight;
+
+        public Photo(string id, string title, string url, string imageUrl, string thumbnailUrl, int imageWidth, int imageHeight, int thumbnailWidth, int thumbnailHeight, string squareImageUrl) {
+            this.id = id;
+            this.title = title;
+            this.url = url;
+            this.imageUrl = imageUrl;
+            this.imageWidth = imageWidth;
+            this.imageHeight = imageHeight;
+            this.thumbnailWidth = thumbnailWidth;
+            this.thumbnailHeight = thumbnailHeight;
+            this.thumbnailUrl = thumbnailUrl;
+            this.squareImageUrl = squareImageUrl;
+        }
+    }
+}
diff --git a/samples/Photos/Photos/Photos.csproj b/samples/Photos/Photos/Photos.csproj
new file mode 100644
index 000000000..b67740215
--- /dev/null
+++ b/samples/Photos/Photos/Photos.csproj
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{336CC726-E62D-484B-A15E-3E70A676D989}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Photos</RootNamespace>
+    <AssemblyName>Photos</AssemblyName>
+    <ScriptTemplate>Properties\Script.template</ScriptTemplate>
+    <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateScript>True</GenerateScript>
+    <GenerateResources>True</GenerateResources>
+    <RestoreNugetPackages>true</RestoreNugetPackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Debug\Photos.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Release\Photos.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Properties\FxCop.ruleset" />
+    <None Include="Properties\Script.template" />
+    <Compile Include="FlickrClient\Flickr.cs" />
+    <Compile Include="FlickrClient\Json.cs" />
+    <Compile Include="IPhotoService.cs" />
+    <Compile Include="FlickrPhotoService.cs" />
+    <Compile Include="Photo.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Script.jQuery">
+      <HintPath>..\packages\ScriptSharp.Lib.jQuery.0.7.5.0\lib\Script.jQuery.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.Web">
+      <HintPath>..\packages\ScriptSharp.Lib.HTML.0.7.5.0\lib\Script.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets" Condition="Exists('..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets')" />
+  <Import Project="..\packages\nuget.targets" />
+</Project>
\ No newline at end of file
diff --git a/samples/Photos/Photos/Properties/AssemblyInfo.cs b/samples/Photos/Photos/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..b22746978
--- /dev/null
+++ b/samples/Photos/Photos/Properties/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Flickr")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script# Samples")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("Flickr")]
diff --git a/samples/Photos/Photos/Properties/FxCop.ruleset b/samples/Photos/Photos/Properties/FxCop.ruleset
new file mode 100644
index 000000000..47c160f61
--- /dev/null
+++ b/samples/Photos/Photos/Properties/FxCop.ruleset
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Script# Rules" Description="General Script Rules" ToolsVersion="10.0">
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1000" Action="Warning" />
+    <Rule Id="CA1001" Action="Warning" />
+    <Rule Id="CA1008" Action="Warning" />
+    <Rule Id="CA1009" Action="Warning" />
+    <Rule Id="CA1010" Action="Warning" />
+    <Rule Id="CA1011" Action="Warning" />
+    <Rule Id="CA1012" Action="Warning" />
+    <Rule Id="CA1013" Action="Warning" />
+    <Rule Id="CA1016" Action="Warning" />
+    <Rule Id="CA1018" Action="Warning" />
+    <Rule Id="CA1019" Action="Warning" />
+    <Rule Id="CA1020" Action="Warning" />
+    <Rule Id="CA1021" Action="Warning" />
+    <Rule Id="CA1023" Action="Warning" />
+    <Rule Id="CA1024" Action="Warning" />
+    <Rule Id="CA1026" Action="Warning" />
+    <Rule Id="CA1027" Action="Warning" />
+    <Rule Id="CA1028" Action="Warning" />
+    <Rule Id="CA1030" Action="Warning" />
+    <Rule Id="CA1032" Action="Warning" />
+    <Rule Id="CA1033" Action="Warning" />
+    <Rule Id="CA1034" Action="Warning" />
+    <Rule Id="CA1036" Action="Warning" />
+    <Rule Id="CA1040" Action="Warning" />
+    <Rule Id="CA1041" Action="Warning" />
+    <Rule Id="CA1043" Action="Warning" />
+    <Rule Id="CA1044" Action="Warning" />
+    <Rule Id="CA1045" Action="Warning" />
+    <Rule Id="CA1046" Action="Warning" />
+    <Rule Id="CA1047" Action="Warning" />
+    <Rule Id="CA1048" Action="Warning" />
+    <Rule Id="CA1052" Action="Warning" />
+    <Rule Id="CA1053" Action="Warning" />
+    <Rule Id="CA1058" Action="Warning" />
+    <Rule Id="CA1059" Action="Warning" />
+    <Rule Id="CA1061" Action="Warning" />
+    <Rule Id="CA1065" Action="Warning" />
+    <Rule Id="CA1500" Action="Warning" />
+    <Rule Id="CA1501" Action="Warning" />
+    <Rule Id="CA1502" Action="Warning" />
+    <Rule Id="CA1504" Action="Warning" />
+    <Rule Id="CA1505" Action="Warning" />
+    <Rule Id="CA1506" Action="Warning" />
+    <Rule Id="CA1700" Action="Warning" />
+    <Rule Id="CA1701" Action="Warning" />
+    <Rule Id="CA1702" Action="Warning" />
+    <Rule Id="CA1703" Action="Warning" />
+    <Rule Id="CA1704" Action="Warning" />
+    <Rule Id="CA1707" Action="Warning" />
+    <Rule Id="CA1708" Action="Warning" />
+    <Rule Id="CA1709" Action="Warning" />
+    <Rule Id="CA1710" Action="Warning" />
+    <Rule Id="CA1711" Action="Warning" />
+    <Rule Id="CA1712" Action="Warning" />
+    <Rule Id="CA1713" Action="Warning" />
+    <Rule Id="CA1714" Action="Warning" />
+    <Rule Id="CA1715" Action="Warning" />
+    <Rule Id="CA1716" Action="Warning" />
+    <Rule Id="CA1717" Action="Warning" />
+    <Rule Id="CA1719" Action="Warning" />
+    <Rule Id="CA1720" Action="Warning" />
+    <Rule Id="CA1721" Action="Warning" />
+    <Rule Id="CA1722" Action="Warning" />
+    <Rule Id="CA1724" Action="Warning" />
+    <Rule Id="CA1725" Action="Warning" />
+    <Rule Id="CA1726" Action="Warning" />
+    <Rule Id="CA1800" Action="Warning" />
+    <Rule Id="CA1801" Action="Warning" />
+    <Rule Id="CA1802" Action="Warning" />
+    <Rule Id="CA1804" Action="Warning" />
+    <Rule Id="CA1806" Action="Warning" />
+    <Rule Id="CA1809" Action="Warning" />
+    <Rule Id="CA1811" Action="Warning" />
+    <Rule Id="CA1812" Action="Warning" />
+    <Rule Id="CA1813" Action="Warning" />
+    <Rule Id="CA1814" Action="Warning" />
+    <Rule Id="CA1815" Action="Warning" />
+    <Rule Id="CA1819" Action="Warning" />
+    <Rule Id="CA1820" Action="Warning" />
+    <Rule Id="CA1821" Action="Warning" />
+    <Rule Id="CA2201" Action="Warning" />
+    <Rule Id="CA2202" Action="Warning" />
+    <Rule Id="CA2204" Action="Warning" />
+    <Rule Id="CA2207" Action="Warning" />
+    <Rule Id="CA2213" Action="Warning" />
+    <Rule Id="CA2214" Action="Warning" />
+    <Rule Id="CA2215" Action="Warning" />
+    <Rule Id="CA2217" Action="Warning" />
+    <Rule Id="CA2218" Action="Warning" />
+    <Rule Id="CA2219" Action="Warning" />
+    <Rule Id="CA2222" Action="Warning" />
+    <Rule Id="CA2223" Action="Warning" />
+    <Rule Id="CA2224" Action="Warning" />
+    <Rule Id="CA2226" Action="Warning" />
+    <Rule Id="CA2227" Action="Warning" />
+    <Rule Id="CA2233" Action="Warning" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/samples/Photos/Photos/Properties/Script.template b/samples/Photos/Photos/Properties/Script.template
new file mode 100644
index 000000000..d0fad56de
--- /dev/null
+++ b/samples/Photos/Photos/Properties/Script.template
@@ -0,0 +1,8 @@
+//! #= ScriptFile ##
+//
+
+(function() {
+#include[as-is] "%code%"
+})();
+
+//! This script was generated using Script# v#= CompilerVersion ##
diff --git a/samples/Photos/Photos/packages.config b/samples/Photos/Photos/packages.config
new file mode 100644
index 000000000..8b5e6e6e7
--- /dev/null
+++ b/samples/Photos/Photos/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.HTML" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.jQuery" version="0.7.5.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/Photos/PhotosWeb/Content/Images/lightbox-blank.gif b/samples/Photos/PhotosWeb/Content/Images/lightbox-blank.gif
new file mode 100644
index 000000000..1d11fa9ad
Binary files /dev/null and b/samples/Photos/PhotosWeb/Content/Images/lightbox-blank.gif differ
diff --git a/samples/Photos/PhotosWeb/Content/Images/lightbox-btn-close.gif b/samples/Photos/PhotosWeb/Content/Images/lightbox-btn-close.gif
new file mode 100644
index 000000000..33bcf517a
Binary files /dev/null and b/samples/Photos/PhotosWeb/Content/Images/lightbox-btn-close.gif differ
diff --git a/samples/Photos/PhotosWeb/Content/Images/lightbox-btn-next.gif b/samples/Photos/PhotosWeb/Content/Images/lightbox-btn-next.gif
new file mode 100644
index 000000000..a0d4fcf84
Binary files /dev/null and b/samples/Photos/PhotosWeb/Content/Images/lightbox-btn-next.gif differ
diff --git a/samples/Photos/PhotosWeb/Content/Images/lightbox-btn-prev.gif b/samples/Photos/PhotosWeb/Content/Images/lightbox-btn-prev.gif
new file mode 100644
index 000000000..040ee5992
Binary files /dev/null and b/samples/Photos/PhotosWeb/Content/Images/lightbox-btn-prev.gif differ
diff --git a/samples/Photos/PhotosWeb/Content/Images/lightbox-ico-loading.gif b/samples/Photos/PhotosWeb/Content/Images/lightbox-ico-loading.gif
new file mode 100644
index 000000000..4f1429c06
Binary files /dev/null and b/samples/Photos/PhotosWeb/Content/Images/lightbox-ico-loading.gif differ
diff --git a/samples/Photos/PhotosWeb/Content/jquery.gridster.css b/samples/Photos/PhotosWeb/Content/jquery.gridster.css
new file mode 100644
index 000000000..3f3fad042
--- /dev/null
+++ b/samples/Photos/PhotosWeb/Content/jquery.gridster.css
@@ -0,0 +1,64 @@
+/*! gridster.js - v0.1.0 - 2012-08-20
+* http://gridster.net/
+* Copyright (c) 2012 ducksboard; Licensed MIT */
+
+.gridster {
+    position:relative;
+}
+
+.gridster > * {
+    margin: 0 auto;
+    -webkit-transition: height .4s;
+    -moz-transition: height .4s;
+    -o-transition: height .4s;
+    -ms-transition: height .4s;
+    transition: height .4s;
+}
+
+.gridster .gs_w{
+    z-index: 2;
+    position: absolute;
+}
+
+.ready .gs_w:not(.preview-holder) {
+    -webkit-transition: opacity .3s, left .3s, top .3s;
+    -moz-transition: opacity .3s, left .3s, top .3s;
+    -o-transition: opacity .3s, left .3s, top .3s;
+    transition: opacity .3s, left .3s, top .3s;
+}
+
+.ready .gs_w:not(.preview-holder) {
+    -webkit-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
+    -moz-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
+    -o-transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
+    transition: opacity .3s, left .3s, top .3s, width .3s, height .3s;
+}
+
+.gridster .preview-holder {
+    z-index: 1;
+    position: absolute;
+    background-color: #fff;
+    border-color: #fff;
+    opacity: 0.3;
+}
+
+.gridster .player-revert {
+    z-index: 10!important;
+    -webkit-transition: left .3s, top .3s!important;
+    -moz-transition: left .3s, top .3s!important;
+    -o-transition: left .3s, top .3s!important;
+    transition:  left .3s, top .3s!important;
+}
+
+.gridster .dragging {
+    z-index: 10!important;
+    -webkit-transition: all 0s !important;
+    -moz-transition: all 0s !important;
+    -o-transition: all 0s !important;
+    transition: all 0s !important;
+}
+
+/* Uncomment this if you set helper : "clone" in draggable options */
+/*.gridster .player {
+  opacity:0;
+}*/
diff --git a/samples/Photos/PhotosWeb/Content/jquery.lightbox-0.5.css b/samples/Photos/PhotosWeb/Content/jquery.lightbox-0.5.css
new file mode 100644
index 000000000..62618a8f3
--- /dev/null
+++ b/samples/Photos/PhotosWeb/Content/jquery.lightbox-0.5.css
@@ -0,0 +1,101 @@
+/**
+ * jQuery lightBox plugin
+ * This jQuery plugin was inspired and based on Lightbox 2 by Lokesh Dhakar (http://www.huddletogether.com/projects/lightbox2/)
+ * and adapted to me for use like a plugin from jQuery.
+ * @name jquery-lightbox-0.5.css
+ * @author Leandro Vieira Pinho - http://leandrovieira.com
+ * @version 0.5
+ * @date April 11, 2008
+ * @category jQuery plugin
+ * @copyright (c) 2008 Leandro Vieira Pinho (leandrovieira.com)
+ * @license CCAttribution-ShareAlike 2.5 Brazil - http://creativecommons.org/licenses/by-sa/2.5/br/deed.en_US
+ * @example Visit http://leandrovieira.com/projects/jquery/lightbox/ for more informations about this jQuery plugin
+ */
+#jquery-overlay {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 90;
+	width: 100%;
+	height: 500px;
+}
+#jquery-lightbox {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	z-index: 100;
+	text-align: center;
+	line-height: 0;
+}
+#jquery-lightbox a img { border: none; }
+#lightbox-container-image-box {
+	position: relative;
+	background-color: #fff;
+	width: 250px;
+	height: 250px;
+	margin: 0 auto;
+}
+#lightbox-container-image { padding: 10px; }
+#lightbox-loading {
+	position: absolute;
+	top: 40%;
+	left: 0%;
+	height: 25%;
+	width: 100%;
+	text-align: center;
+	line-height: 0;
+}
+#lightbox-nav {
+	position: absolute;
+	top: 0;
+	left: 0;
+	height: 100%;
+	width: 100%;
+	z-index: 10;
+}
+#lightbox-container-image-box > #lightbox-nav { left: 0; }
+#lightbox-nav a { outline: none;}
+#lightbox-nav-btnPrev, #lightbox-nav-btnNext {
+	width: 49%;
+	height: 100%;
+	zoom: 1;
+	display: block;
+}
+#lightbox-nav-btnPrev { 
+	left: 0; 
+	float: left;
+}
+#lightbox-nav-btnNext { 
+	right: 0; 
+	float: right;
+}
+#lightbox-container-image-data-box {
+	font: 10px Verdana, Helvetica, sans-serif;
+	background-color: #fff;
+	margin: 0 auto;
+	line-height: 1.4em;
+	overflow: auto;
+	width: 100%;
+	padding: 0 10px 0;
+}
+#lightbox-container-image-data {
+	padding: 0 10px; 
+	color: #666; 
+}
+#lightbox-container-image-data #lightbox-image-details { 
+	width: 70%; 
+	float: left; 
+	text-align: left; 
+}	
+#lightbox-image-details-caption { font-weight: bold; }
+#lightbox-image-details-currentNumber {
+	display: block; 
+	clear: left; 
+	padding-bottom: 1.0em;	
+}			
+#lightbox-secNav-btnClose {
+	width: 66px; 
+	float: right;
+	padding-bottom: 0.7em;	
+}
\ No newline at end of file
diff --git a/samples/Photos/PhotosWeb/PhotoGrid.htm b/samples/Photos/PhotosWeb/PhotoGrid.htm
new file mode 100644
index 000000000..67c45f7e6
--- /dev/null
+++ b/samples/Photos/PhotosWeb/PhotoGrid.htm
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Photo Grid</title>
+  <style type="text/css">
+    body { background-color: white; text-align: center; }
+    input, button { font-family: Segoe UI; font-size: 11pt; }
+    #searchForm, #thumbsList { margin-bottom: 10px; }
+    #thumbsList { font-size: 0pt; }
+    #thumbsList li { display: inline-block; margin: 10px; padding: 4px; border: solid 1px #AAA; background: white; }
+    #thumbsList li a { text-decoration: none; }
+    #thumbsList img.thumbnail { border: none; }
+    
+    .isotope, .isotope .isotope-item { -webkit-transition-duration: 0.8s; -moz-transition-duration: 0.8s; transition-duration: 0.8s; }
+    .isotope { -webkit-transition-property: height, width; -moz-transition-property: height, width; transition-property: height, width; }
+    .isotope .isotope-item { -webkit-transition-property: -webkit-transform, opacity; -moz-transition-property: -moz-transform, opacity; transition-property: transform, opacity; }
+  </style>
+  <link rel="stylesheet" type="text/css" href="/Content/jquery.lightbox-0.5.css" />
+</head>
+<body data-flickr-key="be9b6f66bd7a1c0c0f1465a1b7e8a764">
+  <form id="searchForm">
+    <input type="search" id="tagsTextBox" size="40" placeholder="search for interestingness" />
+    <button type="submit" id="searchButton">Search</button><br />
+  </form>
+  <ul id="thumbsList"></ul>
+  <script type="text/html" id="thumbnailTemplate">
+    <li>
+      <a href="${imageUrl}" title="${title}"><img class="thumbnail" src="${thumbnailUrl}" title="${title}" width="${parseInt(thumbnailWidth*1.25)}" height="${parseInt(thumbnailHeight*1.25)}" /></a>
+    </li>
+  </script>
+  <script type="text/javascript" src="/Scripts/mscorlib.debug.js"></script>
+  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.6/jquery.min.js"></script>
+  <script type="text/javascript" src="/Scripts/jquery.tmpl.js"></script>
+  <script type="text/javascript" src="/Scripts/jquery.isotope.min.js"></script>
+  <script type="text/javascript" src="/Scripts/jquery.lightbox-0.5.js"></script>
+  <script type="text/javascript" src="/Scripts/Photos.debug.js"></script>
+  <script type="text/javascript" src="/Scripts/PhotoGrid.debug.js"></script>
+</body>
+</html>
diff --git a/samples/Photos/PhotosWeb/PhotoList.htm b/samples/Photos/PhotosWeb/PhotoList.htm
new file mode 100644
index 000000000..3182cb667
--- /dev/null
+++ b/samples/Photos/PhotosWeb/PhotoList.htm
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head>
+  <title>Photo List</title>
+  <style type="text/css">
+    body { background-color: black; text-align: center; }
+    input, button, label { font-family: Georgia; font-size: 16pt; }
+    #inputPanel, #thumbsList { margin-bottom: 10px; }
+    #photoPanel { background-color: white; padding: 4px; display: inline-block; }
+    #thumbsList { font-size: 0pt; }
+    #thumbsList li { display: inline-block; margin: 10px; padding: 4px; border: double 1px #404040;  cursor: hand; }
+    #thumbsList img.thumbnail { width: 75px; height: 75px; }
+    #thumbsList img.preload { width: 0px; height: 0px; }
+  </style>
+</head>
+<body>
+  <div id="inputPanel">
+    <label>Enter some tags:</label><br />
+    <input type="text" id="tagsTextBox" size="40" placeholder="search for interestingness" />
+    <button type="button" id="searchButton">Search</button>
+  </div>
+  <div id="gallery">
+    <ul id="thumbsList"></ul>
+    <div id="photoPanel" style="display: none"></div>
+  </div>
+  <script type="text/html" id="thumbnailTemplate">
+    <li>
+      <img class="thumbnail" src="${url_sq}" title="${title}" />
+      <img class="preload" src="${url_m}" />
+    </li>
+  </script>
+  <script type="text/html" id="photoTemplate">
+    <img src="${url_m}" title="${title}" />
+    <br />
+    <label>${title}</label>
+  </script>
+
+  <script type="text/javascript" src="http://code.jquery.com/jquery-1.4.2.js"></script>
+  <script type="text/javascript" src="/Scripts/jquery.tmpl.js"></script>
+  <script type="text/javascript" src="/Scripts/jquery.bbq.js"></script>
+  <script type="text/javascript" src="/Scripts/mscorlib.js"></script>
+  <script type="text/javascript" src="/Scripts/Photos.debug.js"></script>
+  <script type="text/javascript" src="/Scripts/PhotoList.debug.js"></script>
+  <script type="text/javascript">
+    PhotoList.ListPage.main();
+  </script>
+</body>
+</html>
diff --git a/samples/Photos/PhotosWeb/PhotoTiles.htm b/samples/Photos/PhotosWeb/PhotoTiles.htm
new file mode 100644
index 000000000..b92ff11a6
--- /dev/null
+++ b/samples/Photos/PhotosWeb/PhotoTiles.htm
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Photo Tiles</title>
+  <style type="text/css">
+    body { background-color: white; text-align: center; }
+    input, button { font-family: Segoe UI; font-size: 11pt; }
+    #searchForm, #thumbsList { margin-bottom: 10px; }
+    #thumbsList { font-size: 0pt; }
+    #thumbsList li { display: inline-block; background: white; box-sizing: border-box; margin: 10px; }
+    #thumbsList li a { text-decoration: none; background-size: cover; background-repeat: no-repeat; background-position: center center; display: inline-block; box-shadow: 0 0 15px #888; }
+    #thumbsList li img { display: none; }
+  </style>
+  <link rel="stylesheet" type="text/css" href="/Content/jquery.lightbox-0.5.css" />
+  <link rel="stylesheet" type="text/css" href="/Content/jquery.gridster.css" />
+</head>
+<body data-flickr-key="be9b6f66bd7a1c0c0f1465a1b7e8a764">
+  <form id="searchForm">
+    <input type="search" id="tagsTextBox" size="40" placeholder="search for interestingness" />
+    <button type="submit" id="searchButton">Search</button><br />
+  </form>
+  <div id="photoTiles">
+    <ul id="thumbsList"></ul>
+  </div>
+  <script type="text/html" id="bigThumbnailTemplate">
+    <li data-sizex="2" data-sizey="2" data-row="1" data-col="1">
+      <a href="${imageUrl}" title="${title}" style="width: 280px; height: 280px; background-image: url(${imageUrl})">
+        <img src="${imageUrl}" title="${title}" />
+      </a>
+    </li>
+  </script>
+  <script type="text/html" id="sqThumbnailTemplate">
+    <li data-sizex="1" data-sizey="1" data-row="1" data-col="1">
+      <a href="${imageUrl}" title="${title}" style="width: 140px; height: 140px; background-image: url(${imageUrl})">
+        <img src="${imageUrl}" title="${title}" />
+      </a>
+    </li>
+  </script>
+  <script type="text/html" id="horzThumbnailTemplate">
+    <li data-sizex="2" data-sizey="1" data-row="1" data-col="1">
+      <a href="${imageUrl}" title="${title}" style="width: 280px; height: 140px; background-image: url(${imageUrl})">
+        <img src="${imageUrl}" title="${title}" />
+      </a>
+    </li>
+  </script>
+  <script type="text/html" id="vertThumbnailTemplate">
+    <li data-sizex="1" data-sizey="2" data-row="1" data-col="1">
+      <a href="${imageUrl}" title="${title}" style="width: 140px; height: 280px; background-image: url(${imageUrl})">
+        <img src="${imageUrl}" title="${title}" />
+      </a>
+    </li>
+  </script>
+  <script type="text/javascript" src="/Scripts/mscorlib.debug.js"></script>
+  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+  <script type="text/javascript" src="/Scripts/jquery.tmpl.js"></script>
+  <script type="text/javascript" src="/Scripts/jquery.lightbox-0.5.js"></script>
+  <script type="text/javascript" src="/Scripts/jquery.gridster.js"></script>
+  <script type="text/javascript" src="/Scripts/Photos.debug.js"></script>
+  <script type="text/javascript" src="/Scripts/PhotoTiles.debug.js"></script>
+</body>
+</html>
diff --git a/samples/Photos/PhotosWeb/PhotosWeb.csproj b/samples/Photos/PhotosWeb/PhotosWeb.csproj
new file mode 100644
index 000000000..32c3a0488
--- /dev/null
+++ b/samples/Photos/PhotosWeb/PhotosWeb.csproj
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>
+    </ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{D1A2D374-10B7-45A6-A699-AFDE6AD62150}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>PhotosWeb</RootNamespace>
+    <AssemblyName>PhotosWeb</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <UseIISExpress>true</UseIISExpress>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+    <TargetFrameworkProfile />
+    <RestoreNugetPackages>true</RestoreNugetPackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Configuration" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Content\Images\lightbox-blank.gif" />
+    <Content Include="Content\Images\lightbox-btn-close.gif" />
+    <Content Include="Content\Images\lightbox-btn-next.gif" />
+    <Content Include="Content\Images\lightbox-btn-prev.gif" />
+    <Content Include="Content\Images\lightbox-ico-loading.gif" />
+    <Content Include="Content\jquery.gridster.css" />
+    <Content Include="Content\jquery.lightbox-0.5.css" />
+    <Content Include="PhotoTiles.htm" />
+    <Content Include="PhotoGrid.htm" />
+    <Content Include="PhotoList.htm" />
+    <Content Include="Scripts\jquery.bbq.js" />
+    <Content Include="Scripts\jquery.gridster.js" />
+    <Content Include="Scripts\jquery.isotope.min.js" />
+    <Content Include="Scripts\jquery.lightbox-0.5.js" />
+    <Content Include="Scripts\jquery.tmpl.js" />
+    <Content Include="Scripts\mscorlib.debug.js" />
+    <Content Include="Scripts\mscorlib.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\nuget.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>True</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>0</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://localhost:19223/</IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/samples/Photos/PhotosWeb/Properties/AssemblyInfo.cs b/samples/Photos/PhotosWeb/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..61372cb21
--- /dev/null
+++ b/samples/Photos/PhotosWeb/Properties/AssemblyInfo.cs
@@ -0,0 +1,17 @@
+// AssemblyInfo.cs
+//
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("PhotosWeb")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script# Samples")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Photos/PhotosWeb/Scripts/jquery.gridster.js b/samples/Photos/PhotosWeb/Scripts/jquery.gridster.js
new file mode 100644
index 000000000..9193da624
--- /dev/null
+++ b/samples/Photos/PhotosWeb/Scripts/jquery.gridster.js
@@ -0,0 +1,3148 @@
+/*! gridster.js - v0.1.0 - 2012-08-20
+* http://gridster.net/
+* Copyright (c) 2012 ducksboard; Licensed MIT */
+
+;(function($, window, document, undefined){
+    /**
+    * Creates objects with coordinates (x1, y1, x2, y2, cx, cy, width, height)
+    * to simulate DOM elements on the screen.
+    * Coords is used by Gridster to create a faux grid with any DOM element can
+    * collide.
+    *
+    * @class Coords
+    * @param {HTMLElement|Object} obj The jQuery HTMLElement or a object with: left,
+    * top, width and height properties.
+    * @return {Object} Coords instance.
+    * @constructor
+    */
+    function Coords(obj) {
+        if (obj[0] && $.isPlainObject(obj[0])) {
+            this.data = obj[0];
+        }else {
+            this.el = obj;
+        }
+
+        this.isCoords = true;
+        this.coords = {};
+        this.init();
+        return this;
+    }
+
+
+    var fn = Coords.prototype;
+
+
+    fn.init = function(){
+        this.set();
+        this.original_coords = this.get();
+    };
+
+
+    fn.set = function(update, not_update_offsets) {
+        var el = this.el;
+
+        if (el && !update) {
+            this.data = el.offset();
+            this.data.width = el.width();
+            this.data.height = el.height();
+        }
+
+        if (el && update && !not_update_offsets) {
+            var offset = el.offset();
+            this.data.top = offset.top;
+            this.data.left = offset.left;
+        }
+
+        var d = this.data;
+
+        this.coords.x1 = d.left;
+        this.coords.y1 = d.top;
+        this.coords.x2 = d.left + d.width;
+        this.coords.y2 = d.top + d.height;
+        this.coords.cx = d.left + (d.width / 2);
+        this.coords.cy = d.top + (d.height / 2);
+        this.coords.width  = d.width;
+        this.coords.height = d.height;
+        this.coords.el  = el || false ;
+
+        return this;
+    };
+
+
+    fn.update = function(data){
+        if (!data && !this.el) {
+            return this;
+        }
+
+        if (data) {
+            var new_data = $.extend({}, this.data, data);
+            this.data = new_data;
+            return this.set(true, true);
+        }
+
+        this.set(true);
+        return this;
+    };
+
+
+    fn.get = function(){
+        return this.coords;
+    };
+
+
+    //jQuery adapter
+    $.fn.coords = function() {
+        if (this.data('coords') ) {
+            return this.data('coords');
+        }
+
+        var ins = new Coords(this, arguments[0]);
+        this.data('coords', ins);
+        return ins;
+    };
+
+}(jQuery, window, document));
+
+;(function($, window, document, undefined){
+
+    var defaults = {
+        colliders_context: document.body
+        // ,on_overlap: function(collider_data){},
+        // on_overlap_start : function(collider_data){},
+        // on_overlap_stop : function(collider_data){}
+    };
+
+
+    /**
+    * Detects collisions between a DOM element against other DOM elements or
+    * Coords objects.
+    *
+    * @class Collision
+    * @uses Coords
+    * @param {HTMLElement} el The jQuery wrapped HTMLElement.
+    * @param {HTMLElement|Array} colliders Can be a jQuery collection
+    *  of HTMLElements or an Array of Coords instances.
+    * @param {Object} [options] An Object with all options you want to
+    *        overwrite:
+    *   @param {Function} [options.on_overlap_start] Executes a function the first
+    *    time each `collider ` is overlapped.
+    *   @param {Function} [options.on_overlap_stop] Executes a function when a
+    *    `collider` is no longer collided.
+    *   @param {Function} [options.on_overlap] Executes a function when the
+    * mouse is moved during the collision.
+    * @return {Object} Collision instance.
+    * @constructor
+    */
+    function Collision(el, colliders, options) {
+        this.options = $.extend(defaults, options);
+        this.$element = el;
+        this.last_colliders = [];
+        this.last_colliders_coords = [];
+        if (typeof colliders === 'string' || colliders instanceof jQuery) {
+            this.$colliders = $(colliders,
+                 this.options.colliders_context).not(this.$element);
+        }else{
+            this.colliders = $(colliders);
+        }
+
+        this.init();
+    }
+
+
+    var fn = Collision.prototype;
+
+
+    fn.init = function() {
+        this.find_collisions();
+    };
+
+
+    fn.overlaps = function(a, b) {
+        var x = false;
+        var y = false;
+
+        if ((b.x1 >= a.x1 && b.x1 <= a.x2) ||
+            (b.x2 >= a.x1 && b.x2 <= a.x2) ||
+            (a.x1 >= b.x1 && a.x2 <= b.x2)
+        ) { x = true; }
+
+        if ((b.y1 >= a.y1 && b.y1 <= a.y2) ||
+            (b.y2 >= a.y1 && b.y2 <= a.y2) ||
+            (a.y1 >= b.y1 && a.y2 <= b.y2)
+        ) { y = true; }
+
+        return (x && y);
+    };
+
+
+    fn.detect_overlapping_region = function(a, b){
+        var regionX = '';
+        var regionY = '';
+
+        if (a.y1 > b.cy && a.y1 < b.y2) { regionX = 'N'; }
+        if (a.y2 > b.y1 && a.y2 < b.cy) { regionX = 'S'; }
+        if (a.x1 > b.cx && a.x1 < b.x2) { regionY = 'W'; }
+        if (a.x2 > b.x1 && a.x2 < b.cx) { regionY = 'E'; }
+
+        return (regionX + regionY) || 'C';
+    };
+
+
+    fn.calculate_overlapped_area_coords = function(a, b){
+        var x1 = Math.max(a.x1, b.x1);
+        var y1 = Math.max(a.y1, b.y1);
+        var x2 = Math.min(a.x2, b.x2);
+        var y2 = Math.min(a.y2, b.y2);
+
+        return $({
+            left: x1,
+            top: y1,
+             width : (x2 - x1),
+            height: (y2 - y1)
+          }).coords().get();
+    };
+
+
+    fn.calculate_overlapped_area = function(coords){
+        return (coords.width * coords.height);
+    };
+
+
+    fn.manage_colliders_start_stop = function(new_colliders_coords, start_callback, stop_callback){
+        var last = this.last_colliders_coords;
+
+        for (var i = 0, il = last.length; i < il; i++) {
+            if ($.inArray(last[i], new_colliders_coords) === -1) {
+                start_callback.call(this, last[i]);
+            }
+        }
+
+        for (var j = 0, jl = new_colliders_coords.length; j < jl; j++) {
+            if ($.inArray(new_colliders_coords[j], last) === -1) {
+                stop_callback.call(this, new_colliders_coords[j]);
+            }
+
+        }
+    };
+
+
+    fn.find_collisions = function(player_data_coords){
+        var self = this;
+        var colliders_coords = [];
+        var colliders_data = [];
+        var $colliders = (this.colliders || this.$colliders);
+        var count = $colliders.length;
+        var player_coords = self.$element.coords()
+                             .update(player_data_coords || false).get();
+
+        while(count--){
+          var $collider = self.$colliders ?
+                           $($colliders[count]) : $colliders[count];
+          var $collider_coords_ins = ($collider.isCoords) ?
+                  $collider : $collider.coords();
+          var collider_coords = $collider_coords_ins.get();
+          var overlaps = self.overlaps(player_coords, collider_coords);
+
+          if (!overlaps) {
+            continue;
+          }
+
+          var region = self.detect_overlapping_region(
+              player_coords, collider_coords);
+
+            //todo: make this an option
+            if (region === 'C'){
+                var area_coords = self.calculate_overlapped_area_coords(
+                    player_coords, collider_coords);
+                var area = self.calculate_overlapped_area(area_coords);
+                var collider_data = {
+                    area: area,
+                    area_coords : area_coords,
+                    region: region,
+                    coords: collider_coords,
+                    player_coords: player_coords,
+                    el: $collider
+                };
+
+                if (self.options.on_overlap) {
+                    self.options.on_overlap.call(this, collider_data);
+                }
+                colliders_coords.push($collider_coords_ins);
+                colliders_data.push(collider_data);
+            }
+        }
+
+        if (self.options.on_overlap_stop || self.options.on_overlap_start) {
+            this.manage_colliders_start_stop(colliders_coords,
+                self.options.on_overlap_stop, self.options.on_overlap_start);
+        }
+
+        this.last_colliders_coords = colliders_coords;
+
+        return colliders_data;
+    };
+
+
+    fn.get_closest_colliders = function(player_data_coords){
+        var colliders = this.find_collisions(player_data_coords);
+        var min_area = 100;
+        colliders.sort(function(a, b){
+            if (a.area <= min_area) {
+              return 1;
+            }
+
+            /* if colliders are being overlapped by the "C" (center) region,
+             * we have to set a lower index in the array to which they are placed
+             * above in the grid. */
+            if (a.region === 'C' && b.region === 'C') {
+                if (a.coords.y1 < b.coords.y1 || a.coords.x1 < b.coords.x1) {
+                    return - 1;
+                }else{
+                    return 1;
+                }
+            }
+
+            if (a.area < b.area){
+                return 1;
+            }
+
+            return 1;
+        });
+        return colliders;
+    };
+
+
+    //jQuery adapter
+    $.fn.collision = function(collider, options) {
+          return new Collision( this, collider, options );
+    };
+
+
+}(jQuery, window, document));
+
+;(function(window, undefined) {
+    /* Debounce and throttle functions taken from underscore.js */
+    window.debounce = function(func, wait, immediate) {
+        var timeout;
+        return function() {
+          var context = this, args = arguments;
+          var later = function() {
+            timeout = null;
+            if (!immediate) func.apply(context, args);
+          };
+          if (immediate && !timeout) func.apply(context, args);
+          clearTimeout(timeout);
+          timeout = setTimeout(later, wait);
+        };
+    };
+
+
+    window.throttle = function(func, wait) {
+        var context, args, timeout, throttling, more, result;
+        var whenDone = debounce(
+            function(){ more = throttling = false; }, wait);
+        return function() {
+          context = this; args = arguments;
+          var later = function() {
+            timeout = null;
+            if (more) func.apply(context, args);
+            whenDone();
+          };
+          if (!timeout) timeout = setTimeout(later, wait);
+          if (throttling) {
+            more = true;
+          } else {
+            result = func.apply(context, args);
+          }
+          whenDone();
+          throttling = true;
+          return result;
+        };
+    };
+
+})(window);
+
+;(function($, window, document, undefined){
+
+    var defaults = {
+        items: '.gs_w',
+        distance: 1,
+        limit: true,
+        offset_left: 0,
+        autoscroll: true
+        // ,drag: function(e){},
+        // start : function(e, ui){},
+        // stop : function(e){}
+    };
+
+    var $window = $(window);
+    var isTouch = !!('ontouchstart' in window);
+    var pointer_events = {
+        start: isTouch ? 'touchstart' : 'mousedown.draggable',
+        move: isTouch ? 'touchmove' : 'mousemove.draggable',
+        end: isTouch ? 'touchend' : 'mouseup.draggable'
+    };
+
+    /**
+    * Basic drag implementation for DOM elements inside a container.
+    * Provide start/stop/drag callbacks.
+    *
+    * @class Draggable
+    * @param {HTMLElement} el The HTMLelement that contains all the widgets
+    *  to be dragged.
+    * @param {Object} [options] An Object with all options you want to
+    *        overwrite:
+    *    @param {HTMLElement|String} [options.items] Define who will
+    *     be the draggable items. Can be a CSS Selector String or a
+    *     collection of HTMLElements.
+    *    @param {Number} [options.distance] Distance in pixels after mousedown
+    *     the mouse must move before dragging should start.
+    *    @param {Boolean} [options.limit] Constrains dragging to the width of
+    *     the container
+    *    @param {offset_left} [options.offset_left] Offset added to the item
+    *     that is being dragged.
+    *    @param {Number} [options.drag] Executes a callback when the mouse is
+    *     moved during the dragging.
+    *    @param {Number} [options.start] Executes a callback when the drag
+    *     starts.
+    *    @param {Number} [options.stop] Executes a callback when the drag stops.
+    * @return {Object} Returns `el`.
+    * @constructor
+    */
+    function Draggable(el, options) {
+      this.options = $.extend({}, defaults, options);
+      this.$body = $(document.body);
+      this.$container = $(el);
+      this.$dragitems = $(this.options.items, this.$container);
+      this.is_dragging = false;
+      this.player_min_left = 0 + this.options.offset_left;
+      this.init();
+    }
+
+    var fn = Draggable.prototype;
+
+    fn.init = function() {
+        this.calculate_positions();
+        this.$container.css('position', 'relative');
+        this.enable();
+
+        $(window).bind('resize',
+            throttle($.proxy(this.calculate_positions, this), 200));
+    };
+
+
+    fn.get_actual_pos = function($el) {
+        var pos = $el.position();
+        return pos;
+    };
+
+
+    fn.get_mouse_pos = function(e) {
+        if (isTouch) {
+            var oe = e.originalEvent;
+            e = oe.touches.length ? oe.touches[0] : oe.changedTouches[0];
+        };
+
+        return {
+            left: e.clientX,
+            top: e.clientY
+        };
+    };
+
+
+    fn.get_offset = function(e) {
+        e.preventDefault();
+        var mouse_actual_pos = this.get_mouse_pos(e);
+        var diff_x = Math.round(
+            mouse_actual_pos.left - this.mouse_init_pos.left);
+        var diff_y = Math.round(mouse_actual_pos.top - this.mouse_init_pos.top);
+
+        var left = Math.round(this.el_init_offset.left + diff_x - this.baseX);
+        var top = Math.round(
+            this.el_init_offset.top + diff_y - this.baseY + this.scrollOffset);
+
+        if (this.options.limit) {
+            if (left > this.player_max_left) {
+                left = this.player_max_left;
+            }else if(left < this.player_min_left) {
+                left = this.player_min_left;
+            }
+        }
+
+        return {
+            left: left,
+            top: top,
+            mouse_left: mouse_actual_pos.left,
+            mouse_top: mouse_actual_pos.top
+        };
+    };
+
+
+    fn.manage_scroll = function(offset) {
+        /* scroll document */
+        var nextScrollTop;
+        var scrollTop = $window.scrollTop();
+        var min_window_y = scrollTop;
+        var max_window_y = min_window_y + this.window_height;
+
+        var mouse_down_zone = max_window_y - 50;
+        var mouse_up_zone = min_window_y + 50;
+
+        var abs_mouse_left = offset.mouse_left;
+        var abs_mouse_top = min_window_y + offset.mouse_top;
+
+        var max_player_y = (this.doc_height - this.window_height +
+            this.player_height);
+
+        if (abs_mouse_top >= mouse_down_zone) {
+            nextScrollTop = scrollTop + 30;
+            if (nextScrollTop < max_player_y) {
+                $window.scrollTop(nextScrollTop);
+                this.scrollOffset = this.scrollOffset + 30;
+            }
+        };
+
+        if (abs_mouse_top <= mouse_up_zone) {
+            nextScrollTop = scrollTop - 30;
+            if (nextScrollTop > 0) {
+                $window.scrollTop(nextScrollTop);
+                this.scrollOffset = this.scrollOffset - 30;
+            }
+        };
+    }
+
+
+    fn.calculate_positions = function(e) {
+        this.window_height = $window.height();
+    }
+
+
+    fn.drag_handler = function(e) {
+        var node = e.target.nodeName;
+
+        if (e.which !== 1 && !isTouch) {
+            return;
+        }
+
+        if (node === 'INPUT' || node === 'TEXTAREA' || node === 'SELECT' ||
+            node === 'BUTTON') {
+            return;
+        };
+
+        var self = this;
+        var first = true;
+        this.$player = $(e.currentTarget);
+
+        this.el_init_pos = this.get_actual_pos(this.$player);
+        this.mouse_init_pos = this.get_mouse_pos(e);
+        this.offsetY = this.mouse_init_pos.top - this.el_init_pos.top;
+
+        this.$body.on(pointer_events.move, function(mme){
+            var mouse_actual_pos = self.get_mouse_pos(mme);
+            var diff_x = Math.abs(
+                mouse_actual_pos.left - self.mouse_init_pos.left);
+            var diff_y = Math.abs(
+                mouse_actual_pos.top - self.mouse_init_pos.top);
+            if (!(diff_x > self.options.distance ||
+                diff_y > self.options.distance)
+            ) {
+                return false;
+            }
+
+            if (first) {
+                first = false;
+                self.on_dragstart.call(self, mme);
+                return false;
+            }
+
+            if (self.is_dragging == true) {
+                self.on_dragmove.call(self, mme);
+            }
+
+            return false;
+        });
+
+        return false;
+    };
+
+
+    fn.on_dragstart = function(e) {
+        e.preventDefault();
+        this.drag_start = true;
+        this.is_dragging = true;
+        var offset = this.$container.offset();
+        this.baseX = Math.round(offset.left);
+        this.baseY = Math.round(offset.top);
+        this.doc_height = $(document).height();
+
+        if (this.options.helper === 'clone') {
+            this.$helper = this.$player.clone()
+                .appendTo(this.$container).addClass('helper');
+            this.helper = true;
+        }else{
+            this.helper = false;
+        }
+        this.scrollOffset = 0;
+        this.el_init_offset = this.$player.offset();
+        this.player_width = this.$player.width();
+        this.player_height = this.$player.height();
+        this.player_max_left = (this.$container.width() - this.player_width +
+            this.options.offset_left);
+
+        if (this.options.start) {
+            this.options.start.call(this.$player, e, {
+                helper: this.helper ? this.$helper : this.$player
+            });
+        }
+        return false;
+    };
+
+
+    fn.on_dragmove = function(e) {
+        var offset = this.get_offset(e);
+
+        this.options.autoscroll && this.manage_scroll(offset);
+
+        (this.helper ? this.$helper : this.$player).css({
+            'position': 'absolute',
+            'left' : offset.left,
+            'top' : offset.top
+        });
+
+        var ui = {
+            'position': {
+                'left': offset.left,
+                'top': offset.top
+            }
+        };
+
+        if (this.options.drag) {
+            this.options.drag.call(this.$player, e, ui);
+        }
+        return false;
+    };
+
+
+    fn.on_dragstop = function(e) {
+        var offset = this.get_offset(e);
+        this.drag_start = false;
+
+        var ui = {
+            'position': {
+                'left': offset.left,
+                'top': offset.top
+            }
+        };
+
+        if (this.options.stop) {
+            this.options.stop.call(this.$player, e, ui);
+        }
+
+        if (this.helper) {
+            this.$helper.remove();
+        }
+
+        return false;
+    };
+
+    fn.on_select_start = function(e) {
+        return false;
+    }
+
+
+    fn.enable = function(){
+        this.$container.on('selectstart', this.on_select_start);
+
+        this.$container.on(pointer_events.start, this.options.items, $.proxy(
+            this.drag_handler, this));
+
+        this.$body.on(pointer_events.end, $.proxy(function(e) {
+            this.is_dragging = false;
+            this.$body.off(pointer_events.move);
+            if (this.drag_start) {
+                this.on_dragstop(e);
+            }
+        }, this));
+    };
+
+
+    fn.disable = function(){
+        this.$container.off(pointer_events.start);
+        this.$body.off(pointer_events.end);
+        this.$container.off('selectstart', this.on_select_start);
+    };
+
+
+    fn.destroy = function(){
+        this.disable();
+        $.removeData(this.$container, 'drag');
+    };
+
+
+    //jQuery adapter
+    $.fn.drag = function ( options ) {
+        return this.each(function () {
+            if (!$.data(this, 'drag')) {
+                $.data(this, 'drag', new Draggable( this, options ));
+            }
+        });
+    };
+
+
+}(jQuery, window, document));
+
+;(function($, window, document, undefined) {
+
+    var defaults = {
+        widget_selector: '> li',
+        widget_margins: [10, 10],
+        widget_base_dimensions: [400, 225],
+        extra_rows: 0,
+        extra_cols: 0,
+        min_cols: 1,
+        min_rows: 15,
+        max_size_x: 6,
+        autogenerate_stylesheet: true,
+        avoid_overlapped_widgets: true,
+        serialize_params: function($w, wgd) {
+            return {
+                col: wgd.col,
+                row: wgd.row,
+                size_x: wgd.size_x,
+                size_y: wgd.size_y
+            };
+        },
+        collision: {},
+        draggable: {
+            distance: 4
+        }
+    };
+
+
+    /**
+    * @class Gridster
+    * @uses Draggable
+    * @uses Collision
+    * @param {HTMLElement} el The HTMLelement that contains all the widgets.
+    * @param {Object} [options] An Object with all options you want to
+    *        overwrite:
+    *    @param {HTMLElement|String} [options.widget_selector] Define who will
+    *     be the draggable widgets. Can be a CSS Selector String or a
+    *     collection of HTMLElements
+    *    @param {Array} [options.widget_margins] Margin between widgets.
+    *     The first index for the horizontal margin (left, right) and
+    *     the second for the vertical margin (top, bottom).
+    *    @param {Array} [options.widget_base_dimensions] Base widget dimensions
+    *     in pixels. The first index for the width and the second for the
+    *     height.
+    *    @param {Number} [options.extra_cols] Add more columns in addition to
+    *     those that have been calculated.
+    *    @param {Number} [options.extra_rows] Add more rows in addition to
+    *     those that have been calculated.
+    *    @param {Number} [options.min_cols] The minimum required columns.
+    *    @param {Number} [options.min_rows] The minimum required rows.
+    *    @param {Number} [options.max_size_x] The maximum number of columns
+    *     that a widget can span.
+    *    @param {Boolean} [options.autogenerate_stylesheet] If true, all the
+    *     CSS required to position all widgets in their respective columns
+    *     and rows will be generated automatically and injected to the
+    *     `<head>` of the document. You can set this to false, and write
+    *     your own CSS targeting rows and cols via data-attributes like so:
+    *     `[data-col="1"] { left: 10px; }`
+    *    @param {Boolean} [options.avoid_overlapped_widgets] Avoid that widgets loaded
+    *     from the DOM can be overlapped. It is helpful if the positions were
+    *     bad stored in the database or if there was any conflict.
+    *    @param {Function} [options.serialize_params] Return the data you want
+    *     for each widget in the serialization. Two arguments are passed:
+    *     `$w`: the jQuery wrapped HTMLElement, and `wgd`: the grid
+    *     coords object (`col`, `row`, `size_x`, `size_y`).
+    *    @param {Object} [options.collision] An Object with all options for
+    *     Collision class you want to overwrite. See Collision docs for
+    *     more info.
+    *    @param {Object} [options.draggable] An Object with all options for
+    *     Draggable class you want to overwrite. See Draggable docs for more
+    *     info.
+    *
+    * @constructor
+    */
+    function Gridster(el, options) {
+      this.options = $.extend(true, defaults, options);
+      this.$el = $(el);
+      this.$wrapper = this.$el.parent();
+      this.$widgets = $(this.options.widget_selector, this.$el).addClass('gs_w');
+      this.widgets = [];
+      this.$changed = $([]);
+      this.wrapper_width = this.$wrapper.width();
+      this.min_widget_width = (this.options.widget_margins[0] * 2) +
+        this.options.widget_base_dimensions[0];
+      this.min_widget_height = (this.options.widget_margins[1] * 2) +
+        this.options.widget_base_dimensions[1];
+      this.init();
+    }
+
+    Gridster.generated_stylesheets = [];
+
+    var fn = Gridster.prototype;
+
+    fn.init = function() {
+        this.generate_grid_and_stylesheet();
+        this.get_widgets_from_DOM();
+        this.set_dom_grid_height();
+        this.$wrapper.addClass('ready');
+        this.draggable();
+
+        $(window).bind(
+            'resize', throttle($.proxy(this.recalculate_faux_grid, this), 200));
+    };
+
+
+    /**
+    * Disables dragging.
+    *
+    * @method disable
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.disable = function() {
+        this.$wrapper.find('.player-revert').removeClass('player-revert');
+        this.drag_api.disable();
+        return this;
+    };
+
+
+    /**
+    * Enables dragging.
+    *
+    * @method enable
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.enable = function() {
+        this.drag_api.enable();
+        return this;
+    };
+
+
+    /**
+    * Add a new widget to the grid.
+    *
+    * @method add_widget
+    * @param {String|HTMLElement} html The string representing the HTML of the widget
+    *  or the HTMLElement.
+    * @param {Number} [size_x] The nº of rows the widget occupies horizontally.
+    * @param {Number} [size_y] The nº of columns the widget occupies vertically.
+    * @param {Number} [col] The column the widget should start in.
+    * @param {Number} [row] The row the widget should start in.
+    * @return {HTMLElement} Returns the jQuery wrapped HTMLElement representing.
+    *  the widget that was just created.
+    */
+    fn.add_widget = function(html, size_x, size_y, col, row) {
+        var pos;
+        size_x || (size_x = 1);
+        size_y || (size_y = 1);
+
+        if (!col & !row) {
+            pos = this.next_position(size_x, size_y);
+        }else{
+            pos = {
+                col: col,
+                row: row
+            };
+
+            this.empty_cells(col, row, size_x, size_y);
+        }
+
+        var $w = $(html).attr({
+                'data-col': pos.col,
+                'data-row': pos.row,
+                'data-sizex' : size_x,
+                'data-sizey' : size_y
+            }).addClass('gs_w').appendTo(this.$el).hide();
+
+        this.$widgets = this.$widgets.add($w);
+
+        this.register_widget($w);
+
+        this.add_faux_rows(pos.size_y);
+
+        this.set_dom_grid_height();
+
+        return $w.fadeIn();
+    };
+
+
+
+    /**
+    * Change the size of a widget.
+    *
+    * @method resize_widget
+    * @param {HTMLElement} $widget The jQuery wrapped HTMLElement
+    *  representing the widget.
+    * @param {Number} size_x The number of columns that will occupy the widget.
+    * @param {Number} size_y The number of rows that will occupy the widget.
+    * @return {HTMLElement} Returns $widget.
+    */
+    fn.resize_widget = function($widget, size_x, size_y) {
+        var wgd = $widget.coords().grid;
+        size_x || (size_x = wgd.size_x);
+        size_y || (size_y = wgd.size_y);
+
+        if (size_x > this.cols) {
+            size_x = this.cols;
+        };
+
+        var old_cells_occupied = this.get_cells_occupied(wgd);
+        var old_size_x = wgd.size_x;
+        var old_size_y = wgd.size_y;
+        var old_col = wgd.col;
+        var new_col = old_col;
+        var wider = size_x > old_size_x;
+        var taller = size_y > old_size_y;
+
+        if (old_col + size_x - 1 > this.cols) {
+            var diff = old_col + (size_x - 1) - this.cols;
+            var c = old_col - diff;
+            new_col = Math.max(1, c);
+        };
+
+        var new_grid_data = {
+            col: new_col,
+            row: wgd.row,
+            size_x: size_x,
+            size_y: size_y
+        };
+
+        var new_cells_occupied = this.get_cells_occupied(new_grid_data);
+
+        var empty_cols = [];
+        $.each(old_cells_occupied.cols, function(i, col) {
+            if ($.inArray(col, new_cells_occupied.cols) === -1) {
+                empty_cols.push(col);
+            };
+        });
+
+        var occupied_cols = [];
+        $.each(new_cells_occupied.cols, function(i, col) {
+            if ($.inArray(col, old_cells_occupied.cols) === -1) {
+                occupied_cols.push(col);
+            }
+        });
+
+        var empty_rows = [];
+        $.each(old_cells_occupied.rows, function(i, row) {
+            if ($.inArray(row, new_cells_occupied.rows) === -1) {
+                empty_rows.push(row);
+            };
+        });
+
+        var occupied_rows = [];
+        $.each(new_cells_occupied.rows, function(i, row) {
+            if ($.inArray(row, old_cells_occupied.rows) === -1) {
+                occupied_rows.push(row);
+            };
+        });
+
+        this.remove_from_gridmap(wgd);
+
+        if (occupied_cols.length) {
+            var cols_to_empty = [
+                new_col, wgd.row, size_x, Math.min(old_size_y, size_y), $widget
+            ];
+            this.empty_cells.apply(this, cols_to_empty);
+        };
+
+        if (occupied_rows.length) {
+            var rows_to_empty = [new_col, wgd.row, size_x, size_y, $widget];
+            this.empty_cells.apply(this, rows_to_empty);
+        };
+
+        wgd.col = new_col;
+        wgd.size_x = size_x;
+        wgd.size_y = size_y;
+        this.add_to_gridmap(new_grid_data, $widget);
+
+        //update coords instance attributes
+        $widget.data('coords').update({
+            width: (size_x * this.options.widget_base_dimensions[0] +
+                ((size_x - 1) * this.options.widget_margins[0]) * 2),
+            height: (size_y * this.options.widget_base_dimensions[1] +
+                ((size_y - 1) * this.options.widget_margins[1]) * 2)
+        });
+
+        if (size_y > old_size_y) {
+            this.add_faux_rows(size_y - old_size_y);
+        };
+
+        $widget.attr({
+            'data-col': new_col,
+            'data-sizex': size_x,
+            'data-sizey': size_y
+        });
+
+        if (empty_cols.length) {
+            var cols_to_remove_holes = [
+                empty_cols[0], wgd.row,
+                empty_cols.length,
+                Math.min(old_size_y, size_y),
+                $widget
+            ];
+
+            this.remove_empty_cells.apply(this, cols_to_remove_holes);
+        }
+
+        if (empty_rows.length) {
+            var rows_to_remove_holes = [
+                new_col, wgd.row, size_x, size_y, $widget
+            ];
+            this.remove_empty_cells.apply(this, rows_to_remove_holes);
+        }
+
+        return $widget;
+    };
+
+    /**
+    * Move down widgets in cells represented by the arguments col, row, size_x,
+    * size_y
+    *
+    * @method empty_cells
+    * @param {Number} col The column where the group of cells begin.
+    * @param {Number} row The row where the group of cells begin.
+    * @param {Number} size_x The number of columns that the group of cells
+    * occupy.
+    * @param {Number} size_y The number of rows that the group of cells
+    * occupy.
+    * @param {HTMLElement} $exclude Exclude widgets from being moved.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.empty_cells = function(col, row, size_x, size_y, $exclude) {
+        var $nexts = this.widgets_below({
+                col: col,
+                row: row - size_y,
+                size_x: size_x,
+                size_y: size_y
+            });
+
+        $nexts.not($exclude).each($.proxy(function(i, w) {
+            var wgd = $(w).coords().grid;
+            if (!(wgd.row <= (row + size_y - 1))) { return; };
+            var diff =  (row + size_y) - wgd.row;
+            this.move_widget_down($(w), diff);
+        }, this));
+
+        this.set_dom_grid_height();
+
+        return this;
+    };
+
+
+    /**
+    * Move up widgets below cells represented by the arguments col, row, size_x,
+    * size_y.
+    *
+    * @method remove_empty_cells
+    * @param {Number} col The column where the group of cells begin.
+    * @param {Number} row The row where the group of cells begin.
+    * @param {Number} size_x The number of columns that the group of cells
+    * occupy.
+    * @param {Number} size_y The number of rows that the group of cells
+    * occupy.
+    * @param {HTMLElement} $exclude Exclude widgets from being moved.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.remove_empty_cells = function(col, row, size_x, size_y, exclude) {
+        var $nexts = this.widgets_below({
+            col: col,
+            row: row,
+            size_x: size_x,
+            size_y: size_y
+        });
+
+        $nexts.not(exclude).each($.proxy(function(i, widget) {
+            this.move_widget_up( $(widget), size_y );
+        }, this));
+
+        this.set_dom_grid_height();
+
+        return this;
+    }
+
+
+    /**
+    * Get the most left column below to add a new widget.
+    *
+    * @method next_position
+    * @param {Number} size_x The nº of rows the widget occupies horizontally.
+    * @param {Number} size_y The nº of columns the widget occupies vertically.
+    * @return {Object} Returns a grid coords object representing the future
+    *  widget coords.
+    */
+    fn.next_position = function(size_x, size_y) {
+        size_x || (size_x = 1);
+        size_y || (size_y = 1);
+        var ga = this.gridmap;
+        var cols_l = ga.length;
+        var valid_pos = [];
+
+        for (var c = 1; c < cols_l; c++) {
+            var rows_l = ga[c].length;
+            for (var r = 1; r <= rows_l; r++) {
+                var can_move_to = this.can_move_to({
+                    size_x: size_x,
+                    size_y: size_y
+                }, c, r);
+
+                if (can_move_to) {
+                    valid_pos.push({
+                        col: c,
+                        row: r,
+                        size_y: size_y,
+                        size_x: size_x
+                    });
+                }
+            }
+        }
+
+        if (valid_pos.length) {
+            return this.sort_by_row_and_col_asc(valid_pos)[0];
+        }
+        return false;
+    };
+
+
+    /**
+    * Remove a widget from the grid.
+    *
+    * @method remove_widget
+    * @param {HTMLElement} el The jQuery wrapped HTMLElement you want to remove.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.remove_widget = function(el, callback) {
+        var $el = el instanceof jQuery ? el : $(el);
+        var wgd = $el.coords().grid;
+
+        this.cells_occupied_by_placeholder = {};
+        this.$widgets = this.$widgets.not($el);
+
+        var $nexts = this.widgets_below($el);
+
+        this.remove_from_gridmap(wgd);
+
+        $el.fadeOut($.proxy(function() {
+            $el.remove();
+
+            $nexts.each($.proxy(function(i, widget) {
+                this.move_widget_up( $(widget), wgd.size_y );
+            }, this));
+
+            this.set_dom_grid_height();
+
+            if (callback) {
+                callback.call(this, el);
+            }
+        }, this));
+    };
+
+
+    /**
+    * Returns a serialized array of the widgets in the grid.
+    *
+    * @method serialize
+    * @param {HTMLElement} [$widgets] The collection of jQuery wrapped
+    *  HTMLElements you want to serialize. If no argument is passed all widgets
+    *  will be serialized.
+    * @return {Array} Returns an Array of Objects with the data specified in
+    *  the serialize_params option.
+    */
+    fn.serialize = function($widgets) {
+        $widgets || ($widgets = this.$widgets);
+        var result = [];
+        $widgets.each($.proxy(function(i, widget) {
+            result.push(this.options.serialize_params(
+                $(widget), $(widget).coords().grid ) );
+        }, this));
+
+        return result;
+    };
+
+
+    /**
+    * Returns a serialized array of the widgets that have changed their
+    *  position.
+    *
+    * @method serialize_changed
+    * @return {Array} Returns an Array of Objects with the data specified in
+    *  the serialize_params option.
+    */
+    fn.serialize_changed = function() {
+        return this.serialize(this.$changed);
+    };
+
+
+    /**
+    * Creates the grid coords object representing the widget a add it to the
+    * mapped array of positions.
+    *
+    * @method register_widget
+    * @return {Array} Returns the instance of the Gridster class.
+    */
+    fn.register_widget = function($el) {
+
+        var wgd = {
+            'col': parseInt($el.attr('data-col'), 10),
+            'row': parseInt($el.attr('data-row'), 10),
+            'size_x': parseInt($el.attr('data-sizex'), 10),
+            'size_y': parseInt($el.attr('data-sizey'), 10),
+            'el': $el
+        };
+
+        if (this.options.avoid_overlapped_widgets &&
+            !this.can_move_to(
+             {size_x: wgd.size_x, size_y: wgd.size_y}, wgd.col, wgd.row)
+        ) {
+            wgd = this.next_position(wgd.size_x, wgd.size_y);
+            wgd.el = $el;
+            $el.attr({
+                'data-col': wgd.col,
+                'data-row': wgd.row,
+                'data-sizex': wgd.size_x,
+                'data-sizey': wgd.size_y
+            });
+        }
+
+        // attach Coord object to player data-coord attribute
+        $el.data('coords', $el.coords());
+
+        // Extend Coord object with grid position info
+        $el.data('coords').grid = wgd;
+
+        this.add_to_gridmap(wgd, $el);
+        this.widgets.push($el);
+        return this;
+    };
+
+
+    /**
+    * Update in the mapped array of positions the value of cells represented by
+    * the grid coords object passed in the `grid_data` param.
+    *
+    * @param {Object} grid_data The grid coords object representing the cells
+    *  to update in the mapped array.
+    * @param {HTMLElement|Boolean} value Pass `false` or the jQuery wrapped
+    *  HTMLElement, depends if you want to delete an existing position or add
+    *  a new one.
+    * @method update_widget_position
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.update_widget_position = function(grid_data, value) {
+        this.for_each_cell_occupied(grid_data, function(col, row) {
+            if (!this.gridmap[col]) { return this; }
+            this.gridmap[col][row] = value;
+        });
+        return this;
+    };
+
+
+    /**
+    * Remove a widget from the mapped array of positions.
+    *
+    * @method remove_from_gridmap
+    * @param {Object} grid_data The grid coords object representing the cells
+    *  to update in the mapped array.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.remove_from_gridmap = function(grid_data) {
+        return this.update_widget_position(grid_data, false);
+    };
+
+
+    /**
+    * Add a widget to the mapped array of positions.
+    *
+    * @method add_to_gridmap
+    * @param {Object} grid_data The grid coords object representing the cells
+    *  to update in the mapped array.
+    * @param {HTMLElement|Boolean} value The value to set in the specified
+    *  position .
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.add_to_gridmap = function(grid_data, value) {
+        this.update_widget_position(grid_data, value || grid_data.el);
+
+        if (grid_data.el) {
+            var $widgets = this.widgets_below(grid_data.el);
+            $widgets.each($.proxy(function(i, widget) {
+                this.move_widget_up( $(widget));
+            }, this));
+        }
+    };
+
+
+    /**
+    * Make widgets draggable.
+    *
+    * @uses Draggable
+    * @method draggable
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.draggable = function() {
+        var self = this;
+        var draggable_options = $.extend(true, {}, this.options.draggable, {
+            offset_left: this.options.widget_margins[0],
+            start: function(event, ui) {
+                self.$widgets.filter('.player-revert')
+                    .removeClass('player-revert');
+
+                self.$player = $(this);
+                self.$helper = self.options.draggable.helper === 'clone' ?
+                    $(ui.helper) : self.$player;
+                self.helper = !self.$helper.is(self.$player);
+
+                self.on_start_drag.call(self, event, ui);
+                self.$el.trigger('gridster:dragstart');
+            },
+            stop: function(event, ui) {
+                self.on_stop_drag.call(self, event, ui);
+                self.$el.trigger('gridster:dragstop');
+            },
+            drag: throttle(function(event, ui) {
+                self.on_drag.call(self, event, ui);
+                self.$el.trigger('gridster:drag');
+            }, 60)
+          });
+
+        this.drag_api = this.$el.drag(draggable_options).data('drag');
+        return this;
+    };
+
+
+    /**
+    * This function is executed when the player begins to be dragged.
+    *
+    * @method on_start_drag
+    * @param {Event} The original browser event
+    * @param {Object} A prepared ui object.
+    */
+    fn.on_start_drag = function(event, ui) {
+
+        this.$helper.add(this.$player).add(this.$wrapper).addClass('dragging');
+
+        this.$player.addClass('player');
+        this.player_grid_data = this.$player.coords().grid;
+        this.placeholder_grid_data = $.extend({}, this.player_grid_data);
+
+        //set new grid height along the dragging period
+        this.$el.css('height', this.$el.height() +
+          (this.player_grid_data.size_y * this.min_widget_height));
+
+        var colliders = this.faux_grid;
+        var coords = this.$player.data('coords').coords;
+
+        this.cells_occupied_by_player = this.get_cells_occupied(
+            this.player_grid_data);
+        this.cells_occupied_by_placeholder = this.get_cells_occupied(
+            this.placeholder_grid_data);
+
+        this.last_cols = [];
+        this.last_rows = [];
+
+
+        // see jquery.collision.js
+        this.collision_api = this.$helper.collision(
+            colliders, this.options.collision);
+
+        this.$preview_holder = $('<li />', {
+              'class': 'preview-holder',
+              'data-row': this.$player.attr('data-row'),
+              'data-col': this.$player.attr('data-col'),
+              css: {
+                  width: coords.width,
+                  height: coords.height
+              }
+        }).appendTo(this.$el);
+
+        if (this.options.draggable.start) {
+          this.options.draggable.start.call(this, event, ui);
+        }
+    };
+
+
+    /**
+    * This function is executed when the player is being dragged.
+    *
+    * @method on_drag
+    * @param {Event} The original browser event
+    * @param {Object} A prepared ui object.
+    */
+    fn.on_drag = function(event, ui) {
+        //break if dragstop has been fired
+        if (this.$player === null) {
+            return false;
+        };
+
+        var abs_offset = {
+            left: ui.position.left + this.baseX,
+            top: ui.position.top + this.baseY
+        };
+
+        this.colliders_data = this.collision_api.get_closest_colliders(
+            abs_offset);
+
+        this.on_overlapped_column_change(
+            this.on_start_overlapping_column,
+            this.on_stop_overlapping_column
+        );
+
+        this.on_overlapped_row_change(
+            this.on_start_overlapping_row,
+            this.on_stop_overlapping_row
+        );
+
+        if (this.helper && this.$player) {
+            this.$player.css({
+                'left': ui.position.left,
+                'top': ui.position.top
+            });
+        }
+
+        if (this.options.draggable.drag) {
+            this.options.draggable.drag.call(this, event, ui);
+        }
+    };
+
+    /**
+    * This function is executed when the player stops being dragged.
+    *
+    * @method on_stop_drag
+    * @param {Event} The original browser event
+    * @param {Object} A prepared ui object.
+    */
+    fn.on_stop_drag = function(event, ui) {
+        this.$helper.add(this.$player).add(this.$wrapper)
+            .removeClass('dragging');
+
+        ui.position.left = ui.position.left + this.baseX;
+        ui.position.top = ui.position.top + this.baseY;
+        this.colliders_data = this.collision_api.get_closest_colliders(ui.position);
+
+        this.on_overlapped_column_change(
+            this.on_start_overlapping_column,
+            this.on_stop_overlapping_column
+        );
+
+        this.on_overlapped_row_change(
+            this.on_start_overlapping_row,
+            this.on_stop_overlapping_row
+        );
+
+        this.$player.addClass('player-revert').removeClass('player')
+            .attr({
+                'data-col': this.placeholder_grid_data.col,
+                'data-row': this.placeholder_grid_data.row
+            }).css({
+                'left': '',
+                'top': ''
+            });
+
+        this.$changed = this.$changed.add(this.$player);
+
+        this.cells_occupied_by_player = this.get_cells_occupied(
+            this.placeholder_grid_data);
+        this.set_cells_player_occupies(
+            this.placeholder_grid_data.col, this.placeholder_grid_data.row);
+
+        this.$player.coords().grid.row = this.placeholder_grid_data.row;
+        this.$player.coords().grid.col = this.placeholder_grid_data.col;
+
+        if (this.options.draggable.stop) {
+          this.options.draggable.stop.call(this, event, ui);
+        }
+
+        this.$preview_holder.remove();
+
+        this.$player = null;
+        this.$helper = null;
+        this.placeholder_grid_data = {};
+        this.player_grid_data = {};
+        this.cells_occupied_by_placeholder = {};
+        this.cells_occupied_by_player = {};
+
+        this.set_dom_grid_height();
+    };
+
+
+    /**
+    * Executes the callbacks passed as arguments when a column begins to be
+    * overlapped or stops being overlapped.
+    *
+    * @param {Function} start_callback Function executed when a new column
+    *  begins to be overlapped. The column is passed as first argument.
+    * @param {Function} stop_callback Function executed when a column stops
+    *  being overlapped. The column is passed as first argument.
+    * @method on_overlapped_column_change
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.on_overlapped_column_change = function(start_callback, stop_callback) {
+        if (!this.colliders_data.length) {
+            return;
+        }
+        var cols = this.get_targeted_columns(
+            this.colliders_data[0].el.data.col);
+
+        var last_n_cols = this.last_cols.length;
+        var n_cols = cols.length;
+        var i;
+
+        for (i = 0; i < n_cols; i++) {
+            if ($.inArray(cols[i], this.last_cols) === -1) {
+                (start_callback || $.noop).call(this, cols[i]);
+            }
+        }
+
+        for (i = 0; i< last_n_cols; i++) {
+            if ($.inArray(this.last_cols[i], cols) === -1) {
+                (stop_callback || $.noop).call(this, this.last_cols[i]);
+            }
+        }
+
+        this.last_cols = cols;
+
+        return this;
+    };
+
+
+    /**
+    * Executes the callbacks passed as arguments when a row starts to be
+    * overlapped or stops being overlapped.
+    *
+    * @param {Function} start_callback Function executed when a new row begins
+    *  to be overlapped. The row is passed as first argument.
+    * @param {Function} stop_callback Function executed when a row stops being
+    *  overlapped. The row is passed as first argument.
+    * @method on_overlapped_row_change
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.on_overlapped_row_change = function(start_callback, end_callback) {
+        if (!this.colliders_data.length) {
+            return;
+        }
+        var rows = this.get_targeted_rows(this.colliders_data[0].el.data.row);
+        var last_n_rows = this.last_rows.length;
+        var n_rows = rows.length;
+        var i;
+
+        for (i = 0; i < n_rows; i++) {
+            if ($.inArray(rows[i], this.last_rows) === -1) {
+                (start_callback || $.noop).call(this, rows[i]);
+            }
+        }
+
+        for (i = 0; i < last_n_rows; i++) {
+            if ($.inArray(this.last_rows[i], rows) === -1) {
+                (end_callback || $.noop).call(this, this.last_rows[i]);
+            }
+        }
+
+        this.last_rows = rows;
+    };
+
+
+    /**
+    * Sets the current position of the player
+    *
+    * @param {Function} start_callback Function executed when a new row begins
+    *  to be overlapped. The row is passed as first argument.
+    * @param {Function} stop_callback Function executed when a row stops being
+    *  overlapped. The row is passed as first argument.
+    * @method set_player
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.set_player = function(col, row, no_player) {
+        var self = this;
+        if (!no_player) {
+            this.empty_cells_player_occupies();
+        };
+        var cell = !no_player ? self.colliders_data[0].el.data : {col: col};
+        var to_col = cell.col;
+        var to_row = row || cell.row;
+
+        this.player_grid_data = {
+            col: to_col,
+            row: to_row,
+            size_y : this.player_grid_data.size_y,
+            size_x : this.player_grid_data.size_x
+        };
+
+        this.cells_occupied_by_player = this.get_cells_occupied(
+            this.player_grid_data);
+
+        var $overlapped_widgets = this.get_widgets_overlapped(
+            this.player_grid_data);
+
+        var constraints = this.widgets_constraints($overlapped_widgets);
+
+        this.manage_movements(constraints.can_go_up, to_col, to_row);
+        this.manage_movements(constraints.can_not_go_up, to_col, to_row);
+
+        /* if there is not widgets overlapping in the new player position,
+         * update the new placeholder position. */
+        if (!$overlapped_widgets.length) {
+            var pp = this.can_go_player_up(this.player_grid_data);
+            if (pp !== false) {
+                to_row = pp;
+            }
+            this.set_placeholder(to_col, to_row);
+        }
+
+        return {
+            col: to_col,
+            row: to_row
+        };
+    };
+
+
+    /**
+    * See which of the widgets in the $widgets param collection can go to
+    * a upper row and which not.
+    *
+    * @method widgets_contraints
+    * @param {HTMLElements} $widgets A jQuery wrapped collection of
+    * HTMLElements.
+    * @return {Array} Returns a literal Object with two keys: `can_go_up` &
+    * `can_not_go_up`. Each contains a set of HTMLElements.
+    */
+    fn.widgets_constraints = function($widgets) {
+        var $widgets_can_go_up = $([]);
+        var $widgets_can_not_go_up;
+        var wgd_can_go_up = [];
+        var wgd_can_not_go_up = [];
+
+        $widgets.each($.proxy(function(i, w) {
+            var $w = $(w);
+            var wgd = $w.coords().grid;
+            if (this.can_go_widget_up(wgd)) {
+                $widgets_can_go_up = $widgets_can_go_up.add($w);
+                wgd_can_go_up.push(wgd);
+            }else{
+                wgd_can_not_go_up.push(wgd);
+            }
+        }, this));
+
+        $widgets_can_not_go_up = $widgets.not($widgets_can_go_up);
+
+        return {
+            can_go_up: this.sort_by_row_asc(wgd_can_go_up),
+            can_not_go_up: this.sort_by_row_desc(wgd_can_not_go_up)
+        };
+    };
+
+
+    /**
+    * Sorts an Array of grid coords objects (representing the grid coords of
+    * each widget) in ascending way.
+    *
+    * @method sort_by_row_asc
+    * @param {Array} widgets Array of grid coords objects
+    * @return {Array} Returns the array sorted.
+    */
+    fn.sort_by_row_asc = function(widgets) {
+        widgets = widgets.sort(function(a, b) {
+            if (!a.row) {
+                a = $(a).coords().grid;
+                b = $(b).coords().grid;
+            };
+
+           if (a.row > b.row) {
+               return 1;
+           }
+           return -1;
+        });
+
+        return widgets;
+    };
+
+
+    /**
+    * Sorts an Array of grid coords objects (representing the grid coords of
+    * each widget) placing first the empty cells upper left.
+    *
+    * @method sort_by_row_and_col_asc
+    * @param {Array} widgets Array of grid coords objects
+    * @return {Array} Returns the array sorted.
+    */
+    fn.sort_by_row_and_col_asc = function(widgets) {
+        widgets = widgets.sort(function(a, b) {
+           if (a.row > b.row || a.row == b.row && a.col > b.col) {
+               return 1;
+           }
+           return -1;
+        });
+
+        return widgets;
+    };
+
+
+    /**
+    * Sorts an Array of grid coords objects by column (representing the grid
+    * coords of each widget) in ascending way.
+    *
+    * @method sort_by_col_asc
+    * @param {Array} widgets Array of grid coords objects
+    * @return {Array} Returns the array sorted.
+    */
+    fn.sort_by_col_asc = function(widgets) {
+        widgets = widgets.sort(function(a, b) {
+           if (a.col > b.col) {
+               return 1;
+           }
+           return -1;
+        });
+
+        return widgets;
+    };
+
+
+    /**
+    * Sorts an Array of grid coords objects (representing the grid coords of
+    * each widget) in descending way.
+    *
+    * @method sort_by_row_desc
+    * @param {Array} widgets Array of grid coords objects
+    * @return {Array} Returns the array sorted.
+    */
+    fn.sort_by_row_desc = function(widgets) {
+        widgets = widgets.sort(function(a, b) {
+            if (a.row + a.size_y < b.row + b.size_y) {
+                return 1;
+            }
+           return -1;
+        });
+        return widgets;
+    };
+
+
+    /**
+    * Sorts an Array of grid coords objects (representing the grid coords of
+    * each widget) in descending way.
+    *
+    * @method manage_movements
+    * @param {HTMLElements} $widgets A jQuery collection of HTMLElements
+    *  representing the widgets you want to move.
+    * @param {Number} to_col The column to which we want to move the widgets.
+    * @param {Number} to_row The row to which we want to move the widgets.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.manage_movements = function($widgets, to_col, to_row) {
+        $.each($widgets, $.proxy(function(i, w) {
+            var wgd = w;
+            var $w = wgd.el;
+
+            var can_go_widget_up = this.can_go_widget_up(wgd);
+
+            if (can_go_widget_up) {
+                //target CAN go up
+                //so move widget up
+                this.move_widget_to($w, can_go_widget_up);
+                this.set_placeholder(to_col, can_go_widget_up + wgd.size_y);
+
+            } else {
+                //target can't go up
+                var can_go_player_up = this.can_go_player_up(
+                    this.player_grid_data);
+
+                if (!can_go_player_up) {
+                    // target can't go up
+                    // player cant't go up
+                    // so we need to move widget down to a position that dont
+                    // overlaps player
+                    var y = (to_row + this.player_grid_data.size_y) - wgd.row;
+
+                    this.move_widget_down($w, y);
+                    this.set_placeholder(to_col, to_row);
+                }
+            }
+        }, this));
+
+        return this;
+    };
+
+    /**
+    * Determines if there is a widget in the row and col given. Or if the
+    * HTMLElement passed as first argument is the player.
+    *
+    * @method is_player
+    * @param {Number|HTMLElement} col_or_el A jQuery wrapped collection of
+    * HTMLElements.
+    * @param {Number} [row] The column to which we want to move the widgets.
+    * @return {Boolean} Returns true or false.
+    */
+    fn.is_player = function(col_or_el, row) {
+        if (row && !this.gridmap[col_or_el]) { return false; }
+        var $w = row ? this.gridmap[col_or_el][row] : col_or_el;
+        return $w && ($w.is(this.$player) || $w.is(this.$helper));
+    };
+
+
+    /**
+    * Determines if the widget that is being dragged is currently over the row
+    * and col given.
+    *
+    * @method is_player_in
+    * @param {Number} col The column to check.
+    * @param {Number} row The row to check.
+    * @return {Boolean} Returns true or false.
+    */
+    fn.is_player_in = function(col, row) {
+        var c = this.cells_occupied_by_player || {};
+        return $.inArray(col, c.cols) >= 0 && $.inArray(row, c.rows) >= 0;
+    };
+
+
+    /**
+    * Determines if the placeholder is currently over the row and col given.
+    *
+    * @method is_placeholder_in
+    * @param {Number} col The column to check.
+    * @param {Number} row The row to check.
+    * @return {Boolean} Returns true or false.
+    */
+    fn.is_placeholder_in = function(col, row) {
+        var c = this.cells_occupied_by_placeholder || {};
+        return this.is_placeholder_in_col(col) && $.inArray(row, c.rows) >= 0;
+    };
+
+
+    /**
+    * Determines if the placeholder is currently over the column given.
+    *
+    * @method is_placeholder_in_col
+    * @param {Number} col The column to check.
+    * @return {Boolean} Returns true or false.
+    */
+    fn.is_placeholder_in_col = function(col) {
+        var c = this.cells_occupied_by_placeholder || [];
+        return $.inArray(col, c.cols) >= 0;
+    };
+
+
+    /**
+    * Determines if the cell represented by col and row params is empty.
+    *
+    * @method is_empty
+    * @param {Number} col The column to check.
+    * @param {Number} row The row to check.
+    * @return {Boolean} Returns true or false.
+    */
+    fn.is_empty = function(col, row) {
+        if (typeof this.gridmap[col] !== 'undefined' &&
+            typeof this.gridmap[col][row] !== 'undefined' &&
+            this.gridmap[col][row] === false
+        ) {
+            return true;
+        }
+        return false;
+    };
+
+
+    /**
+    * Determines if the cell represented by col and row params is occupied.
+    *
+    * @method is_occupied
+    * @param {Number} col The column to check.
+    * @param {Number} row The row to check.
+    * @return {Boolean} Returns true or false.
+    */
+    fn.is_occupied = function(col, row) {
+        if (!this.gridmap[col]) {
+            return false;
+        }
+
+        if (this.gridmap[col][row]) {
+            return true;
+        }
+        return false;
+    };
+
+
+    /**
+    * Determines if there is a widget in the cell represented by col/row params.
+    *
+    * @method is_widget
+    * @param {Number} col The column to check.
+    * @param {Number} row The row to check.
+    * @return {Boolean|HTMLElement} Returns false if there is no widget,
+    * else returns the jQuery HTMLElement
+    */
+    fn.is_widget = function(col, row) {
+        var cell = this.gridmap[col];
+        if (!cell) {
+            return false;
+        }
+
+        cell = cell[row];
+
+        if (cell) {
+            return cell;
+        }
+
+        return false;
+    };
+
+
+    /**
+    * Determines if there is a widget in the cell represented by col/row
+    * params and if this is under the widget that is being dragged.
+    *
+    * @method is_widget_under_player
+    * @param {Number} col The column to check.
+    * @param {Number} row The row to check.
+    * @return {Boolean} Returns true or false.
+    */
+    fn.is_widget_under_player = function(col, row) {
+        if (this.is_widget(col, row)) {
+            return this.is_player_in(col, row);
+        }
+        return false;
+    };
+
+
+    /**
+    * Get widgets overlapping with the player.
+    *
+    * @method get_widgets_under_player
+    * @return {HTMLElement} Returns a jQuery collection of HTMLElements
+    */
+    fn.get_widgets_under_player = function() {
+        var cells = this.cells_occupied_by_player || {cols: [], rows: []};
+        var $widgets = $([]);
+
+        $.each(cells.cols, $.proxy(function(i, col) {
+            $.each(cells.rows, $.proxy(function(i, row) {
+                if(this.is_widget(col, row)) {
+                    $widgets = $widgets.add(this.gridmap[col][row]);
+                }
+            }, this));
+        }, this));
+
+        return $widgets;
+    };
+
+
+    /**
+    * Put placeholder at the row and column specified.
+    *
+    * @method set_placeholder
+    * @param {Number} col The column to which we want to move the
+    *  placeholder.
+    * @param {Number} row The row to which we want to move the
+    *  placeholder.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.set_placeholder = function(col, row) {
+        var phgd = $.extend({}, this.placeholder_grid_data);
+        var $nexts = this.widgets_below({
+                col: phgd.col,
+                row: phgd.row,
+                size_y: phgd.size_y,
+                size_x: phgd.size_x
+            });
+
+        //Prevents widgets go out of the grid
+        var right_col = (col + phgd.size_x - 1);
+        if (right_col > this.cols) {
+            col = col - (right_col - col);
+        }
+
+        var moved_down = this.placeholder_grid_data.row < row;
+        var changed_column = this.placeholder_grid_data.col !== col;
+
+        this.placeholder_grid_data.col = col;
+        this.placeholder_grid_data.row = row;
+
+        this.cells_occupied_by_placeholder = this.get_cells_occupied(
+            this.placeholder_grid_data);
+
+        this.$preview_holder.attr({
+            'data-row' : row,
+            'data-col' : col
+        });
+
+        if (moved_down || changed_column) {
+            $nexts.each($.proxy(function(i, widget) {
+                this.move_widget_up(
+                 $(widget), this.placeholder_grid_data.col - col + phgd.size_y);
+            }, this));
+        }
+
+    };
+
+
+    /**
+    * Determines whether the player can move to a position above.
+    *
+    * @method can_go_player_up
+    * @param {Object} widget_grid_data The actual grid coords object of the
+    *  player.
+    * @return {Number|Boolean} If the player can be moved to an upper row
+    *  returns the row number, else returns false.
+    */
+    fn.can_go_player_up = function(widget_grid_data) {
+        var p_bottom_row = widget_grid_data.row + widget_grid_data.size_y - 1;
+        var result = true;
+        var upper_rows = [];
+        var min_row = 10000;
+        var $widgets_under_player = this.get_widgets_under_player();
+
+        /* generate an array with columns as index and array with upper rows
+         * empty as value */
+        this.for_each_column_occupied(widget_grid_data, function(tcol) {
+            var grid_col = this.gridmap[tcol];
+            var r = p_bottom_row + 1;
+            upper_rows[tcol] = [];
+
+            while (--r > 0) {
+                if (this.is_empty(tcol, r) || this.is_player(tcol, r) ||
+                    this.is_widget(tcol, r) &&
+                    grid_col[r].is($widgets_under_player)
+                ) {
+                    upper_rows[tcol].push(r);
+                    min_row = r < min_row ? r : min_row;
+                }else{
+                    break;
+                }
+            }
+
+            if (upper_rows[tcol].length === 0) {
+                result = false;
+                return true; //break
+            }
+
+            upper_rows[tcol].sort();
+        });
+
+        if (!result) { return false; }
+
+        return this.get_valid_rows(widget_grid_data, upper_rows, min_row);
+    };
+
+
+    /**
+    * Determines whether a widget can move to a position above.
+    *
+    * @method can_go_widget_up
+    * @param {Object} widget_grid_data The actual grid coords object of the
+    *  widget we want to check.
+    * @return {Number|Boolean} If the widget can be moved to an upper row
+    *  returns the row number, else returns false.
+    */
+    fn.can_go_widget_up = function(widget_grid_data) {
+        var p_bottom_row = widget_grid_data.row + widget_grid_data.size_y - 1;
+        var result = true;
+        var upper_rows = [];
+        var min_row = 10000;
+
+        if (widget_grid_data.col < this.player_grid_data.col &&
+            (widget_grid_data.col + widget_grid_data.size_y - 1) >
+            (this.player_grid_data.col + this.player_grid_data.size_y - 1)
+         ) {
+            return false;
+        };
+
+        /* generate an array with columns as index and array with upper rows
+         * empty as value */
+        this.for_each_column_occupied(widget_grid_data, function(tcol) {
+            var grid_col = this.gridmap[tcol];
+            upper_rows[tcol] = [];
+
+            var r = p_bottom_row + 1;
+
+            while (--r > 0) {
+                if (this.is_widget(tcol, r) && !this.is_player_in(tcol, r)) {
+                    if (!grid_col[r].is(widget_grid_data.el)) {
+                        break;
+                    };
+                }
+
+                if (!this.is_player(tcol, r) &&
+                    !this.is_placeholder_in(tcol, r) &&
+                    !this.is_player_in(tcol, r)) {
+                    upper_rows[tcol].push(r);
+                };
+
+                if (r < min_row) {
+                    min_row = r;
+                }
+            }
+
+            if (upper_rows[tcol].length === 0) {
+                result = false;
+                return true; //break
+            }
+
+            upper_rows[tcol].sort();
+        });
+
+        if (!result) { return false; }
+
+        return this.get_valid_rows(widget_grid_data, upper_rows, min_row);
+    };
+
+
+    /**
+    * Search a valid row for the widget represented by `widget_grid_data' in
+    * the `upper_rows` array. Iteration starts from row specified in `min_row`.
+    *
+    * @method get_valid_rows
+    * @param {Object} widget_grid_data The actual grid coords object of the
+    *  player.
+    * @param {Array} upper_rows An array with columns as index and arrays
+    *  of valid rows as values.
+    * @param {Number} min_row The upper row from which the iteration will start.
+    * @return {Number|Boolean} Returns the upper row valid from the `upper_rows`
+    *  for the widget in question.
+    */
+    fn.get_valid_rows = function(widget_grid_data, upper_rows, min_row) {
+        var p_top_row = widget_grid_data.row;
+        var p_bottom_row = widget_grid_data.row + widget_grid_data.size_y - 1;
+        var size_y = widget_grid_data.size_y;
+        var r = min_row - 1;
+        var valid_rows = [];
+
+        while (++r <= p_bottom_row ) {
+            var common = true;
+            $.each(upper_rows, function(col, rows) {
+                if ($.isArray(rows) && $.inArray(r, rows) === -1) {
+                    common = false;
+                }
+            });
+
+            if (common === true) {
+                valid_rows.push(r);
+                if (valid_rows.length === size_y) {
+                    break;
+                }
+            }
+        }
+
+        var new_row = false;
+        if (size_y === 1) {
+            if (valid_rows[0] !== p_top_row) {
+                new_row = valid_rows[0] || false;
+            }
+        }else{
+            if (valid_rows[0] !== p_top_row) {
+                new_row = this.get_consecutive_numbers_index(
+                    valid_rows, size_y);
+            }
+        }
+
+        return new_row;
+    };
+
+
+    fn.get_consecutive_numbers_index = function(arr, size_y) {
+        var max = arr.length;
+        var result = [];
+        var first = true;
+        var prev = -1; // or null?
+
+        for (var i=0; i < max; i++) {
+            if (first || arr[i] === prev + 1) {
+                result.push(i);
+                if (result.length === size_y) {
+                    break;
+                }
+                first = false;
+            }else{
+                result = [];
+                first = true;
+            }
+
+            prev = arr[i];
+        }
+
+        return result.length >= size_y ? arr[result[0]] : false;
+    };
+
+
+    /**
+    * Get widgets overlapping with the player.
+    *
+    * @method get_widgets_overlapped
+    * @return {HTMLElements} Returns a jQuery collection of HTMLElements.
+    */
+    fn.get_widgets_overlapped = function() {
+        var $w;
+        var $widgets = $([]);
+        var used = [];
+        var rows_from_bottom = this.cells_occupied_by_player.rows.slice(0);
+        rows_from_bottom.reverse();
+
+        $.each(this.cells_occupied_by_player.cols, $.proxy(function(i, col) {
+            $.each(rows_from_bottom, $.proxy(function(i, row) {
+                // if there is a widget in the player position
+                if (!this.gridmap[col]) { return true; } //next iteration
+                var $w = this.gridmap[col][row];
+                if (this.is_occupied(col, row) && !this.is_player($w) &&
+                    $.inArray($w, used) === -1
+                ) {
+                    $widgets = $widgets.add($w);
+                    used.push($w);
+                }
+
+            }, this));
+        }, this));
+
+        return $widgets;
+    };
+
+
+    /**
+    * This callback is executed when the player begins to collide with a column.
+    *
+    * @method on_start_overlapping_column
+    * @param {Number} col The collided column.
+    * @return {HTMLElements} Returns a jQuery collection of HTMLElements.
+    */
+    fn.on_start_overlapping_column = function(col) {
+        this.set_player(col, false);
+    };
+
+
+    /**
+    * A callback executed when the player begins to collide with a row.
+    *
+    * @method on_start_overlapping_row
+    * @param {Number} col The collided row.
+    * @return {HTMLElements} Returns a jQuery collection of HTMLElements.
+    */
+    fn.on_start_overlapping_row = function(row) {
+        this.set_player(false, row);
+    };
+
+
+    /**
+    * A callback executed when the the player ends to collide with a column.
+    *
+    * @method on_stop_overlapping_column
+    * @param {Number} col The collided row.
+    * @return {HTMLElements} Returns a jQuery collection of HTMLElements.
+    */
+    fn.on_stop_overlapping_column = function(col) {
+        this.set_player(col, false);
+
+        var self = this;
+        this.for_each_widget_below(col, this.cells_occupied_by_player.rows[0],
+            function(tcol, trow) {
+                self.move_widget_up(this, self.player_grid_data.size_y);
+        });
+    };
+
+
+    /**
+    * This callback is executed when the player ends to collide with a row.
+    *
+    * @method on_stop_overlapping_row
+    * @param {Number} row The collided row.
+    * @return {HTMLElements} Returns a jQuery collection of HTMLElements.
+    */
+    fn.on_stop_overlapping_row = function(row) {
+        this.set_player(false, row);
+
+        var self = this;
+        var cols = this.cells_occupied_by_player.cols;
+        for (var c = 0, cl = cols.length; c < cl; c++) {
+            this.for_each_widget_below(cols[c], row, function(tcol, trow) {
+                self.move_widget_up(this, self.player_grid_data.size_y);
+            });
+        }
+    };
+
+
+    /**
+    * Move a widget to a specific row. The cell or cells must be empty.
+    * If the widget has widgets below, all of these widgets will be moved also
+    * if they can.
+    *
+    * @method move_widget_to
+    * @param {HTMLElement} $widget The jQuery wrapped HTMLElement of the
+    * widget is going to be moved.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.move_widget_to = function($widget, row) {
+        var self = this;
+        var widget_grid_data = $widget.coords().grid;
+        var diff = row - widget_grid_data.row;
+        var $next_widgets = this.widgets_below($widget);
+
+        var can_move_to_new_cell = this.can_move_to(
+            widget_grid_data, widget_grid_data.col, row, $widget);
+
+        if (can_move_to_new_cell === false) {
+            return false;
+        }
+
+        this.remove_from_gridmap(widget_grid_data);
+        widget_grid_data.row = row;
+        this.add_to_gridmap(widget_grid_data);
+        $widget.attr('data-row', row);
+        this.$changed = this.$changed.add($widget);
+
+
+        $next_widgets.each(function(i, widget) {
+            var $w = $(widget);
+            var wgd = $w.coords().grid;
+            var can_go_up = self.can_go_widget_up(wgd);
+            if (can_go_up && can_go_up !== wgd.row) {
+                self.move_widget_to($w, can_go_up);
+            }
+        });
+
+        return this;
+    };
+
+
+    /**
+    * Move up the specified widget and all below it.
+    *
+    * @method move_widget_up
+    * @param {HTMLElement} $widget The widget you want to move.
+    * @param {Number} [y_units] The number of cells that the widget has to move.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.move_widget_up = function($widget, y_units) {
+        var el_grid_data = $widget.coords().grid;
+        var actual_row = el_grid_data.row;
+        var moved = [];
+        var can_go_up = true;
+        y_units || (y_units = 1);
+
+        if (!this.can_go_up($widget)) { return false; } //break;
+
+        this.for_each_column_occupied(el_grid_data, function(col) {
+            // can_go_up
+            if ($.inArray($widget, moved) === -1) {
+                var widget_grid_data = $widget.coords().grid;
+                var next_row = actual_row - y_units;
+                next_row = this.can_go_up_to_row(
+                    widget_grid_data, col, next_row);
+
+                if (!next_row) {
+                    return true;
+                }
+
+                var $next_widgets = this.widgets_below($widget);
+
+                this.remove_from_gridmap(widget_grid_data);
+                widget_grid_data.row = next_row;
+                this.add_to_gridmap(widget_grid_data);
+                $widget.attr('data-row', widget_grid_data.row);
+                this.$changed = this.$changed.add($widget);
+
+                moved.push($widget);
+
+                $next_widgets.each($.proxy(function(i, widget) {
+                    this.move_widget_up($(widget), y_units);
+                }, this));
+            }
+        });
+
+    };
+
+
+    /**
+    * Move down the specified widget and all below it.
+    *
+    * @method move_widget_down
+    * @param {HTMLElement} $widget The jQuery object representing the widget
+    *  you want to move.
+    * @param {Number} The number of cells that the widget has to move.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.move_widget_down = function($widget, y_units) {
+        var el_grid_data = $widget.coords().grid;
+        var actual_row = el_grid_data.row;
+        var moved = [];
+        var y_diff = y_units;
+
+        if (!$widget) { return false; }
+
+        if ($.inArray($widget, moved) === -1) {
+
+            var widget_grid_data = $widget.coords().grid;
+            var next_row = actual_row + y_units;
+            var $next_widgets = this.widgets_below($widget);
+
+            this.remove_from_gridmap(widget_grid_data);
+
+            $next_widgets.each($.proxy(function(i, widget) {
+                var $w = $(widget);
+                var wd = $w.coords().grid;
+                var tmp_y = this.displacement_diff(
+                             wd, widget_grid_data, y_diff);
+
+                if (tmp_y > 0) {
+                    this.move_widget_down($w, tmp_y);
+                }
+            }, this));
+
+            widget_grid_data.row = next_row;
+            this.update_widget_position(widget_grid_data, $widget);
+            $widget.attr('data-row', widget_grid_data.row);
+            this.$changed = this.$changed.add($widget);
+
+            moved.push($widget);
+        }
+    };
+
+
+    /**
+    * Check if the widget can move to the specified row, else returns the
+    * upper row possible.
+    *
+    * @method can_go_up_to_row
+    * @param {Number} widget_grid_data The current grid coords object of the
+    *  widget.
+    * @param {Number} col The target column.
+    * @param {Number} row The target row.
+    * @return {Boolean|Number} Returns the row number if the widget can move
+    *  to the target position, else returns false.
+    */
+    fn.can_go_up_to_row = function(widget_grid_data, col, row) {
+        var ga = this.gridmap;
+        var result = true;
+        var urc = []; // upper_rows_in_columns
+        var actual_row = widget_grid_data.row;
+        var r;
+
+        /* generate an array with columns as index and array with
+         * upper rows empty in the column */
+        this.for_each_column_occupied(widget_grid_data, function(tcol) {
+            var grid_col = ga[tcol];
+            urc[tcol] = [];
+
+            r = actual_row;
+            while (r--) {
+                if (this.is_empty(tcol, r) &&
+                    !this.is_placeholder_in(tcol, r)
+                ) {
+                    urc[tcol].push(r);
+                }else{
+                    break;
+                }
+            }
+
+            if (!urc[tcol].length) {
+                result = false;
+                return true;
+            }
+
+        });
+
+        if (!result) { return false; }
+
+        /* get common rows starting from upper position in all the columns
+         * that widget occupies */
+        r = row;
+        for (r = 1; r < actual_row; r++) {
+            var common = true;
+
+            for (var uc = 0, ucl = urc.length; uc < ucl; uc++) {
+                if (urc[uc] && $.inArray(r, urc[uc]) === -1) {
+                    common = false;
+                }
+            }
+
+            if (common === true) {
+                result = r;
+                break;
+            }
+        }
+
+        return result;
+    };
+
+
+    fn.displacement_diff = function(widget_grid_data, parent_bgd, y_units) {
+        var actual_row = widget_grid_data.row;
+        var diffs = [];
+        var parent_max_y = parent_bgd.row + parent_bgd.size_y;
+
+        this.for_each_column_occupied(widget_grid_data, function(col) {
+            var temp_y_units = 0;
+
+            for (var r = parent_max_y; r < actual_row; r++) {
+                if (this.is_empty(col, r)) {
+                    temp_y_units = temp_y_units + 1;
+                }
+            }
+
+            diffs.push(temp_y_units);
+        });
+
+        var max_diff = Math.max.apply(Math, diffs);
+        y_units = (y_units - max_diff);
+
+        return y_units > 0 ? y_units : 0;
+    };
+
+
+    /**
+    * Get widgets below a widget.
+    *
+    * @method widgets_below
+    * @param {HTMLElement} $el The jQuery wrapped HTMLElement.
+    * @return {HTMLElements} A jQuery collection of HTMLElements.
+    */
+    fn.widgets_below = function($el) {
+        var el_grid_data = $.isPlainObject($el) ? $el : $el.coords().grid;
+        var self = this;
+        var ga = this.gridmap;
+        var next_row = el_grid_data.row + el_grid_data.size_y - 1;
+        var $nexts = $([]);
+
+        this.for_each_column_occupied(el_grid_data, function(col) {
+            self.for_each_widget_below(col, next_row, function(tcol, trow) {
+                if (!self.is_player(this) && $.inArray(this, $nexts) === -1) {
+                    $nexts = $nexts.add(this);
+                    return true; // break
+                }
+            });
+        });
+
+        return this.sort_by_row_asc($nexts);
+    };
+
+
+    /**
+    * Update the array of mapped positions with the new player position.
+    *
+    * @method set_cells_player_occupies
+    * @param {Number} col The new player col.
+    * @param {Number} col The new player row.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.set_cells_player_occupies = function(col, row) {
+        this.remove_from_gridmap(this.placeholder_grid_data);
+        this.placeholder_grid_data.col = col;
+        this.placeholder_grid_data.row = row;
+        this.add_to_gridmap(this.placeholder_grid_data, this.$player);
+        return this;
+    };
+
+
+    /**
+    * Remove from the array of mapped positions the reference to the player.
+    *
+    * @method empty_cells_player_occupies
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.empty_cells_player_occupies = function() {
+        this.remove_from_gridmap(this.placeholder_grid_data);
+        return this;
+    };
+
+
+    fn.can_go_up = function($el) {
+        var el_grid_data = $el.coords().grid;
+        var initial_row = el_grid_data.row;
+        var prev_row = initial_row - 1;
+        var ga = this.gridmap;
+        var upper_rows_by_column = [];
+
+        var result = true;
+        if (initial_row === 1) { return false; }
+
+        this.for_each_column_occupied(el_grid_data, function(col) {
+            var $w = this.is_widget(col, prev_row);
+
+            if (this.is_occupied(col, prev_row) ||
+                this.is_player(col, prev_row) ||
+                this.is_placeholder_in(col, prev_row) ||
+                this.is_player_in(col, prev_row)
+            ) {
+                result = false;
+                return true; //break
+            }
+        });
+
+        return result;
+    };
+
+
+
+    /**
+    * Check if it's possible to move a widget to a specific col/row. It takes
+    * into account the dimensions (`size_y` and `size_x` attrs. of the grid
+    *  coords object) the widget occupies.
+    *
+    * @method can_move_to
+    * @param {Object} widget_grid_data The grid coords object that represents
+    *  the widget.
+    * @param {Object} col The col to check.
+    * @param {Object} row The row to check.
+    * @return {Boolean} Returns true if all cells are empty, else return false.
+    */
+    fn.can_move_to = function(widget_grid_data, col, row) {
+        var ga = this.gridmap;
+        var $w = widget_grid_data.el;
+        var future_wd = {
+            size_y: widget_grid_data.size_y,
+            size_x: widget_grid_data.size_x,
+            col: col,
+            row: row
+        };
+        var result = true;
+
+        //Prevents widgets go out of the grid
+        var right_col = col + widget_grid_data.size_x - 1;
+        if (right_col > this.cols) {
+            return false;
+        };
+
+        this.for_each_cell_occupied(future_wd, function(tcol, trow) {
+            var $tw = this.is_widget(tcol, trow);
+            if ($tw && (!widget_grid_data.el || $tw.is($w))) {
+                result = false;
+            }
+        });
+
+        return result;
+    };
+
+
+    /**
+    * Given the leftmost column returns all columns that are overlapping
+    *  with the player.
+    *
+    * @method get_targeted_columns
+    * @param {Number} [from_col] The leftmost column.
+    * @return {Array} Returns an array with column numbers.
+    */
+    fn.get_targeted_columns = function(from_col) {
+        var max = (from_col || this.player_grid_data.col) +
+            (this.player_grid_data.size_x - 1);
+        var cols = [];
+        for (var col = from_col; col <= max; col++) {
+            cols.push(col);
+        }
+        return cols;
+    };
+
+
+    /**
+    * Given the upper row returns all rows that are overlapping with the player.
+    *
+    * @method get_targeted_rows
+    * @param {Number} [from_row] The upper row.
+    * @return {Array} Returns an array with row numbers.
+    */
+    fn.get_targeted_rows = function(from_row) {
+        var max = (from_row || this.player_grid_data.row) +
+            (this.player_grid_data.size_y - 1);
+        var rows = [];
+        for (var row = from_row; row <= max; row++) {
+            rows.push(row);
+        }
+        return rows;
+    };
+
+    /**
+    * Get all columns and rows that a widget occupies.
+    *
+    * @method get_cells_occupied
+    * @param {Object} el_grid_data The grid coords object of the widget.
+    * @return {Object} Returns an object like `{ cols: [], rows: []}`.
+    */
+    fn.get_cells_occupied = function(el_grid_data) {
+        var cells = { cols: [], rows: []};
+        var i;
+        if (arguments[1] instanceof jQuery) {
+            el_grid_data = arguments[1].coords().grid;
+        }
+
+        for (i = 0; i < el_grid_data.size_x; i++) {
+            var col = el_grid_data.col + i;
+            cells.cols.push(col);
+        }
+
+        for (i = 0; i < el_grid_data.size_y; i++) {
+            var row = el_grid_data.row + i;
+            cells.rows.push(row);
+        }
+
+        return cells;
+    };
+
+
+    /**
+    * Iterate over the cells occupied by a widget executing a function for
+    * each one.
+    *
+    * @method for_each_cell_occupied
+    * @param {Object} el_grid_data The grid coords object that represents the
+    *  widget.
+    * @param {Function} callback The function to execute on each column
+    *  iteration. Column and row are passed as arguments.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.for_each_cell_occupied = function(grid_data, callback) {
+        this.for_each_column_occupied(grid_data, function(col) {
+            this.for_each_row_occupied(grid_data, function(row) {
+                callback.call(this, col, row);
+            });
+        });
+        return this;
+    };
+
+
+    /**
+    * Iterate over the columns occupied by a widget executing a function for
+    * each one.
+    *
+    * @method for_each_column_occupied
+    * @param {Object} el_grid_data The grid coords object that represents
+    *  the widget.
+    * @param {Function} callback The function to execute on each column
+    *  iteration. The column number is passed as first argument.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.for_each_column_occupied = function(el_grid_data, callback) {
+        for (var i = 0; i < el_grid_data.size_x; i++) {
+            var col = el_grid_data.col + i;
+            callback.call(this, col, el_grid_data);
+        }
+    };
+
+
+    /**
+    * Iterate over the rows occupied by a widget executing a function for
+    * each one.
+    *
+    * @method for_each_row_occupied
+    * @param {Object} el_grid_data The grid coords object that represents
+    *  the widget.
+    * @param {Function} callback The function to execute on each column
+    *  iteration. The row number is passed as first argument.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.for_each_row_occupied = function(el_grid_data, callback) {
+        for (var i = 0; i < el_grid_data.size_y; i++) {
+            var row = el_grid_data.row + i;
+            callback.call(this, row, el_grid_data);
+        }
+    };
+
+
+
+    fn._traversing_widgets = function(type, direction, col, row, callback) {
+        var ga = this.gridmap;
+        if (!ga[col]) { return; }
+
+        var cr, max;
+        var action = type + '/' + direction;
+        if (arguments[2] instanceof jQuery) {
+            var el_grid_data = arguments[2].coords().grid;
+            col = el_grid_data.col;
+            row = el_grid_data.row;
+            callback = arguments[3];
+        }
+        var matched = [];
+        var trow = row;
+
+
+        var methods = {
+            'for_each/above': function() {
+                while (trow--) {
+                    if (trow > 0 && this.is_widget(col, trow) &&
+                        $.inArray(ga[col][trow], matched) === -1
+                    ) {
+                        cr = callback.call(ga[col][trow], col, trow);
+                        matched.push(ga[col][trow]);
+                        if (cr) { break; }
+                    }
+                }
+            },
+            'for_each/below': function() {
+                for (trow = row + 1, max = ga[col].length; trow < max; trow++) {
+                    if (this.is_widget(col, trow) &&
+                        $.inArray(ga[col][trow], matched) === -1
+                    ) {
+                        cr = callback.call(ga[col][trow], col, trow);
+                        matched.push(ga[col][trow]);
+                        if (cr) { break; }
+                    }
+                }
+            }
+        };
+
+        if (methods[action]) {
+            methods[action].call(this);
+        }
+    };
+
+
+    /**
+    * Iterate over each widget above the column and row specified.
+    *
+    * @method for_each_widget_above
+    * @param {Number} col The column to start iterating.
+    * @param {Number} row The row to start iterating.
+    * @param {Function} callback The function to execute on each widget
+    *  iteration. The value of `this` inside the function is the jQuery
+    *  wrapped HTMLElement.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.for_each_widget_above = function(col, row, callback) {
+        this._traversing_widgets('for_each', 'above', col, row, callback);
+        return this;
+    };
+
+
+    /**
+    * Iterate over each widget below the column and row specified.
+    *
+    * @method for_each_widget_below
+    * @param {Number} col The column to start iterating.
+    * @param {Number} row The row to start iterating.
+    * @param {Function} callback The function to execute on each widget
+    *  iteration. The value of `this` inside the function is the jQuery wrapped
+    *  HTMLElement.
+    * @return {Class} Returns the instance of the Gridster Class.
+    */
+    fn.for_each_widget_below = function(col, row, callback) {
+        this._traversing_widgets('for_each', 'below', col, row, callback);
+        return this;
+    };
+
+
+    /**
+    * Returns the highest occupied cell in the grid.
+    *
+    * @method get_highest_occupied_cell
+    * @return {Object} Returns an object with `col` and `row` numbers.
+    */
+    fn.get_highest_occupied_cell = function() {
+        var r;
+        var gm = this.gridmap;
+        var rows = [];
+        var row_in_col = [];
+        for (var c = gm.length - 1; c >= 1; c--) {
+            for (r = gm[c].length - 1; r >= 1; r--) {
+                if (this.is_widget(c, r)) {
+                    rows.push(r);
+                    row_in_col[r] = c;
+                    break;
+                }
+            }
+        }
+
+        var highest_row = Math.max.apply(Math, rows);
+
+        this.highest_occupied_cell = {
+            col: row_in_col[highest_row],
+            row: highest_row
+        };
+
+        return this.highest_occupied_cell;
+    };
+
+
+    fn.get_widgets_from = function(col, row) {
+        var ga = this.gridmap;
+        var $widgets = $();
+
+        if (col) {
+            $widgets = $widgets.add(
+                this.$widgets.filter(function() {
+                    var tcol = $(this).attr('data-col');
+                    return (tcol === col || tcol > col);
+                })
+            );
+        }
+
+        if (row) {
+            $widgets = $widgets.add(
+                this.$widgets.filter(function() {
+                    var trow = $(this).attr('data-row');
+                    return (trow === row || trow > row);
+                })
+            );
+        }
+
+        return $widgets;
+    }
+
+
+    /**
+    * Set the current height of the parent grid.
+    *
+    * @method set_dom_grid_height
+    * @return {Object} Returns the instance of the Gridster class.
+    */
+    fn.set_dom_grid_height = function() {
+        var r = this.get_highest_occupied_cell().row;
+        this.$el.css('height', r * this.min_widget_height);
+        return this;
+    };
+
+
+    /**
+    * It generates the neccessary styles to position the widgets.
+    *
+    * @method generate_stylesheet
+    * @param {Number} rows Number of columns.
+    * @param {Number} cols Number of rows.
+    * @return {Object} Returns the instance of the Gridster class.
+    */
+    fn.generate_stylesheet = function(opts) {
+        var styles = '';
+        var max_size_x = this.options.max_size_x;
+        var max_rows = 0;
+        var max_cols = 0;
+        var i;
+        var rules;
+
+        opts || (opts = {});
+        opts.cols || (opts.cols = this.cols);
+        opts.rows || (opts.rows = this.rows);
+        opts.namespace || (opts.namespace = '');
+        opts.widget_base_dimensions ||
+            (opts.widget_base_dimensions = this.options.widget_base_dimensions);
+        opts.widget_margins ||
+            (opts.widget_margins = this.options.widget_margins);
+        opts.min_widget_width = (opts.widget_margins[0] * 2) +
+            opts.widget_base_dimensions[0];
+        opts.min_widget_height = (opts.widget_margins[1] * 2) +
+            opts.widget_base_dimensions[1];
+
+        // don't duplicate stylesheets for the same configuration
+        var serialized_opts = $.param(opts);
+        if ($.inArray(serialized_opts, Gridster.generated_stylesheets) >= 0) {
+            return false;
+        }
+
+        Gridster.generated_stylesheets.push(serialized_opts);
+
+        /* generate CSS styles for cols */
+        for (i = opts.cols; i >= 0; i--) {
+            styles += (opts.namespace + ' [data-col="'+ (i + 1) + '"] { left:' +
+                ((i * opts.widget_base_dimensions[0]) +
+                (i * opts.widget_margins[0]) +
+                ((i + 1) * opts.widget_margins[0])) + 'px;} ');
+        }
+
+        /* generate CSS styles for rows */
+        for (i = opts.rows; i >= 0; i--) {
+            styles += (opts.namespace + ' [data-row="' + (i + 1) + '"] { top:' +
+                ((i * opts.widget_base_dimensions[1]) +
+                (i * opts.widget_margins[1]) +
+                ((i + 1) * opts.widget_margins[1]) ) + 'px;} ');
+        }
+
+        for (var y = 1; y <= opts.rows; y++) {
+            styles += (opts.namespace + ' [data-sizey="' + y + '"] { height:' +
+                (y * opts.widget_base_dimensions[1] +
+                (y - 1) * (opts.widget_margins[1] * 2)) + 'px;}');
+        }
+
+        for (var x = 1; x <= max_size_x; x++) {
+            styles += (opts.namespace + ' [data-sizex="' + x + '"] { width:' +
+                (x * opts.widget_base_dimensions[0] +
+                (x - 1) * (opts.widget_margins[0] * 2)) + 'px;}');
+        }
+
+        return this.add_style_tag(styles);
+    };
+
+
+    /**
+    * Injects the given CSS as string to the head of the document.
+    *
+    * @method add_style_tag
+    * @param {String} css The styles to apply.
+    * @return {Object} Returns the instance of the Gridster class.
+    */
+    fn.add_style_tag = function(css) {
+      var d = document;
+      var tag = d.createElement('style');
+
+      d.getElementsByTagName('head')[0].appendChild(tag);
+      tag.setAttribute('type', 'text/css');
+
+      if (tag.styleSheet) {
+        tag.styleSheet.cssText = css;
+      }else{
+        tag.appendChild(document.createTextNode(css));
+      }
+      return this;
+    };
+
+
+    /**
+    * Generates a faux grid to collide with it when a widget is dragged and
+    * detect row or column that we want to go.
+    *
+    * @method generate_faux_grid
+    * @param {Number} rows Number of columns.
+    * @param {Number} cols Number of rows.
+    * @return {Object} Returns the instance of the Gridster class.
+    */
+    fn.generate_faux_grid = function(rows, cols) {
+        this.faux_grid = [];
+        this.gridmap = [];
+        var col;
+        var row;
+        for (col = cols; col > 0; col--) {
+            this.gridmap[col] = [];
+            for (row = rows; row > 0; row--) {
+                this.add_faux_cell(row, col);
+            }
+        }
+        return this;
+    };
+
+
+    /**
+    * Add cell to the faux grid.
+    *
+    * @method add_faux_cell
+    * @param {Number} row The row for the new faux cell.
+    * @param {Number} col The col for the new faux cell.
+    * @return {Object} Returns the instance of the Gridster class.
+    */
+    fn.add_faux_cell = function(row, col) {
+        var coords = $({
+                        left: this.baseX + ((col - 1) * this.min_widget_width),
+                        top: this.baseY + (row -1) * this.min_widget_height,
+                        width: this.min_widget_width,
+                        height: this.min_widget_height,
+                        col: col,
+                        row: row,
+                        original_col: col,
+                        original_row: row
+                    }).coords();
+
+        this.gridmap[col][row] = false;
+        this.faux_grid.push(coords);
+
+        return this;
+    };
+
+
+    /**
+    * Add rows to the faux grid.
+    *
+    * @method add_faux_rows
+    * @param {Number} rows The number of rows you want to add to the faux grid.
+    * @return {Object} Returns the instance of the Gridster class.
+    */
+    fn.add_faux_rows = function(rows) {
+        var actual_rows = this.rows;
+        var max_rows = actual_rows + (rows || 1);
+
+        for (var r = max_rows; r > actual_rows; r--) {
+            for (var c = this.cols; c >= 1; c--) {
+                this.add_faux_cell(r, c);
+            };
+        };
+
+        this.rows = max_rows;
+
+        if (this.options.autogenerate_stylesheet) {
+            this.generate_stylesheet();
+        }
+
+        return this;
+    };
+
+
+    /**
+    * Recalculates the offsets for the faux grid. You need to use it when
+    * the browser is resized.
+    *
+    * @method recalculate_faux_grid
+    * @return {Object} Returns the instance of the Gridster class.
+    */
+    fn.recalculate_faux_grid = function() {
+        var aw = this.$wrapper.width();
+        this.baseX = ($(window).width() - aw) / 2;
+        this.baseY = this.$wrapper.offset().top;
+
+        $.each(this.faux_grid, $.proxy(function(i, coords) {
+            this.faux_grid[i] = coords.update({
+                left: this.baseX + (coords.data.col -1) * this.min_widget_width,
+                top: this.baseY + (coords.data.row -1) * this.min_widget_height
+            });
+
+        }, this));
+
+        return this;
+    };
+
+
+    /**
+    * Get all widgets in the DOM and register them.
+    *
+    * @method get_widgets_from_DOM
+    * @return {Object} Returns the instance of the Gridster class.
+    */
+    fn.get_widgets_from_DOM = function() {
+        this.$widgets.each($.proxy(function(i, widget) {
+            this.register_widget($(widget));
+        }, this));
+        return this;
+    };
+
+
+    /**
+    * Calculate columns and rows to be set based on the configuration
+    *  parameters, grid dimensions, etc ...
+    *
+    * @method generate_grid_and_stylesheet
+    * @return {Object} Returns the instance of the Gridster class.
+    */
+    fn.generate_grid_and_stylesheet = function() {
+        var aw = this.$wrapper.width();
+        var ah = this.$wrapper.height();
+
+        var cols = Math.floor(aw / this.min_widget_width) +
+                   this.options.extra_cols;
+
+        var actual_cols = this.$widgets.map(function() {
+            return $(this).attr('data-col');
+        });
+        actual_cols = Array.prototype.slice.call(actual_cols, 0);
+        //needed to pass tests with phantomjs
+        actual_cols.length || (actual_cols = [0]);
+
+        var min_cols = Math.max.apply(Math, actual_cols);
+
+        // get all rows that could be occupied by the current widgets
+        var max_rows = this.options.extra_rows;
+        this.$widgets.each(function(i, w){
+            max_rows += (+$(w).attr('data-sizey'));
+        });
+
+        this.cols = Math.max(min_cols, cols, this.options.min_cols);
+        this.rows = Math.max(max_rows, this.options.min_rows);
+
+        this.baseX = ($(window).width() - aw) / 2;
+        this.baseY = this.$wrapper.offset().top;
+
+        if (this.options.autogenerate_stylesheet) {
+            this.generate_stylesheet();
+        }
+
+        return this.generate_faux_grid(this.rows, this.cols);
+    };
+
+
+    //jQuery adapter
+    $.fn.gridster = function(options) {
+     return this.each(function() {
+       if (!$(this).data('gridster')) {
+         $(this).data('gridster', new Gridster( this, options ));
+       }
+     });
+    };
+
+
+}(jQuery, window, document));
diff --git a/samples/Photos/PhotosWeb/packages.config b/samples/Photos/PhotosWeb/packages.config
new file mode 100644
index 000000000..faa19e174
--- /dev/null
+++ b/samples/Photos/PhotosWeb/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp.Runtime" version="0.7.5.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/Photos/Plugins/Gridster.cs b/samples/Photos/Plugins/Gridster.cs
new file mode 100644
index 000000000..55a6c2403
--- /dev/null
+++ b/samples/Photos/Plugins/Gridster.cs
@@ -0,0 +1,203 @@
+// Isotope.cs
+//
+
+using System;
+using System.Html;
+using System.Runtime.CompilerServices;
+using jQueryApi;
+
+namespace jQueryApi.Gridster {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class GridsterCollision {
+    }
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class GridsterDraggable {
+    }
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class GridsterCoordinates {
+
+        [ScriptName("col")]
+        [IntrinsicProperty]
+        public int Column {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        public int Row {
+            get;
+            set;
+        }
+
+        [ScriptName("size_x")]
+        [IntrinsicProperty]
+        public int SizeX {
+            get;
+            set;
+        }
+
+        [ScriptName("size_y")]
+        [IntrinsicProperty]
+        public int SizeY {
+            get;
+            set;
+        }
+    }
+
+    [Imported]
+    [IgnoreNamespace]
+    public delegate object GridsterSerializationCallback(jQueryObject widget, GridsterCoordinates coords);
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class GridsterOptions {
+
+        public GridsterOptions() {
+        }
+
+        public GridsterOptions(params object[] nameValuePairs) {
+        }
+
+        [ScriptName("autogenerate_stylesheet")]
+        [IntrinsicProperty]
+        public bool AutoGenerateStyleSheet {
+            get;
+            set;
+        }
+
+        [ScriptName("avoid_overlapped_widgets")]
+        [IntrinsicProperty]
+        public bool AvoidOverlapping {
+            get;
+            set;
+        }
+
+        [ScriptName("widget_base_dimensions")]
+        [IntrinsicProperty]
+        public int[] BaseDimensions {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        public GridsterCollision Collision {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        public GridsterDraggable Draggable {
+            get;
+            set;
+        }
+
+        [ScriptName("extra_cols")]
+        [IntrinsicProperty]
+        public int ExtraColumns {
+            get;
+            set;
+        }
+
+        [ScriptName("extra_rows")]
+        [IntrinsicProperty]
+        public int ExtraRows {
+            get;
+            set;
+        }
+
+        [ScriptName("widget_margins")]
+        [IntrinsicProperty]
+        public int[] Margins {
+            get;
+            set;
+        }
+
+        [ScriptName("max_size_x")]
+        [IntrinsicProperty]
+        public int MaximumColumnSpan {
+            get;
+            set;
+        }
+
+        [ScriptName("max_size_y")]
+        [IntrinsicProperty]
+        public int MaximumRowSpan {
+            get;
+            set;
+        }
+
+        [ScriptName("min_cols")]
+        [IntrinsicProperty]
+        public int MinimumColumns {
+            get;
+            set;
+        }
+
+        [ScriptName("min_rows")]
+        [IntrinsicProperty]
+        public int MinimumRows {
+            get;
+            set;
+        }
+
+        [ScriptName("widget_selector")]
+        [IntrinsicProperty]
+        public string Selector {
+            get;
+            set;
+        }
+
+        [ScriptName("serialize_params")]
+        [IntrinsicProperty]
+        public GridsterSerializationCallback SerializationCallback {
+            get;
+            set;
+        }
+    }
+
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class GridsterObject {
+
+        private GridsterObject() {
+        }
+
+        // TODO: Define methods...
+
+        [ScriptName("disable")]
+        public GridsterObject DisableDragging() {
+            return null;
+        }
+
+        [ScriptName("enable")]
+        public GridsterObject EnableDragging() {
+            return null;
+        }
+    }
+
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class jQueryGridsterObject : jQueryObject {
+
+        private jQueryGridsterObject() {
+        }
+
+        public jQueryObject Gridster() {
+            return null;
+        }
+
+        public jQueryObject Gridster(GridsterOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/samples/Photos/Plugins/Isotope.cs b/samples/Photos/Plugins/Isotope.cs
new file mode 100644
index 000000000..56279a742
--- /dev/null
+++ b/samples/Photos/Plugins/Isotope.cs
@@ -0,0 +1,48 @@
+// Isotope.cs
+//
+
+using System;
+using System.Html;
+using System.Runtime.CompilerServices;
+using jQueryApi;
+
+namespace jQueryApi.Isotope {
+
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum IsotopeLayout {
+
+        Masonry
+    }
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class IsotopeOptions : Record {
+
+        public IsotopeLayout LayoutMode;
+
+        public IsotopeOptions() {
+        }
+
+        public IsotopeOptions(params object[] nameValuePairs) {
+        }
+    }
+
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class jQueryIsotopeObject : jQueryObject {
+
+        private jQueryIsotopeObject() {
+        }
+
+        public jQueryObject Isotope() {
+            return null;
+        }
+
+        public jQueryObject Isotope(IsotopeOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/samples/Photos/Plugins/LightBox.cs b/samples/Photos/Plugins/LightBox.cs
new file mode 100644
index 000000000..b980f8cf6
--- /dev/null
+++ b/samples/Photos/Plugins/LightBox.cs
@@ -0,0 +1,22 @@
+// Isotope.cs
+//
+
+using System;
+using System.Html;
+using System.Runtime.CompilerServices;
+using jQueryApi;
+
+namespace jQueryApi.LightBox {
+
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class jQueryLightBoxObject : jQueryObject {
+
+        private jQueryLightBoxObject() {
+        }
+
+        public jQueryObject LightBox() {
+            return null;
+        }
+    }
+}
diff --git a/samples/Photos/Plugins/Plugins.csproj b/samples/Photos/Plugins/Plugins.csproj
new file mode 100644
index 000000000..6118bf360
--- /dev/null
+++ b/samples/Photos/Plugins/Plugins.csproj
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{A441A116-8F91-4FBC-8420-D21C98283BD3}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <FileAlignment>512</FileAlignment>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Plugins</RootNamespace>
+    <AssemblyName>Plugins</AssemblyName>
+    <RestoreNugetPackages>true</RestoreNugetPackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <DocumentationFile>bin\Debug\Plugins.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>
+    </DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <DocumentationFile>bin\Release\Plugins.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <ScriptInfo Include="Properties\ScriptInfo.txt" />
+    <Compile Include="Gridster.cs" />
+    <Compile Include="Isotope.cs" />
+    <Compile Include="LightBox.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Script.jQuery">
+      <HintPath>..\packages\ScriptSharp.Lib.jQuery.0.7.5.0\lib\Script.jQuery.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.Web">
+      <HintPath>..\packages\ScriptSharp.Lib.HTML.0.7.5.0\lib\Script.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(ScriptInfo)" DestinationFiles="$(OutputPath)$(AssemblyName).txt" />
+  </Target>
+  <Import Project="..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets" Condition="Exists('..\packages\ScriptSharp.0.7.5.0\tools\ScriptSharp.targets')" />
+  <Import Project="..\packages\nuget.targets" />
+</Project>
\ No newline at end of file
diff --git a/samples/Photos/Plugins/Properties/AssemblyInfo.cs b/samples/Photos/Plugins/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..56aa0d82a
--- /dev/null
+++ b/samples/Photos/Plugins/Properties/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Plugins")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script# Samples")]
+[assembly: AssemblyCopyright("Copyright ©  2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("Plugins")]
diff --git a/samples/Photos/Plugins/Properties/ScriptInfo.txt b/samples/Photos/Plugins/Properties/ScriptInfo.txt
new file mode 100644
index 000000000..802afb692
--- /dev/null
+++ b/samples/Photos/Plugins/Properties/ScriptInfo.txt
@@ -0,0 +1,12 @@
+Script Information
+===============================================================================
+
+This assembly provides access to script APIs. This is only meant for use at
+development time, so you can reference and compile your c# code against the
+script APIs. You must include the appropriate scripts in your page for
+runtime functionality.
+
+# TODO: You can use this file to describe which version of the script
+#       your import library is based on, the URLs of associated scripts
+#       or any particular usage information for including those scripts
+#       into the application.
diff --git a/samples/Photos/Plugins/packages.config b/samples/Photos/Plugins/packages.config
new file mode 100644
index 000000000..8b5e6e6e7
--- /dev/null
+++ b/samples/Photos/Plugins/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.HTML" version="0.7.5.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.jQuery" version="0.7.5.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/Photos/packages/nuget.exe b/samples/Photos/packages/nuget.exe
new file mode 100644
index 000000000..e313ff958
Binary files /dev/null and b/samples/Photos/packages/nuget.exe differ
diff --git a/samples/Photos/packages/nuget.targets b/samples/Photos/packages/nuget.targets
new file mode 100644
index 000000000..51fc72bd2
--- /dev/null
+++ b/samples/Photos/packages/nuget.targets
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <RestoreNugetPackages Condition="'$(RestoreNugetPackages)' == ''">false</RestoreNugetPackages>
+    <PackagesDir>$([System.IO.Directory]::GetParent($(MSBuildThisFileDirectory)))</PackagesDir>
+    <RestoreCommand>$(MSBuildThisFileDirectory)nuget.exe install "$(MSBuildProjectDirectory)\packages.config" -o "$(PackagesDir)"</RestoreCommand>
+    <BuildDependsOn Condition="$(RestoreNugetPackages) == 'true'">
+      RestorePackages;
+      $(BuildDependsOn);
+    </BuildDependsOn>
+  </PropertyGroup>
+
+  <Target Name="RestorePackages">
+    <Exec Command="$(RestoreCommand)" LogStandardErrorAsError="true" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/samples/Photos/packages/repositories.config b/samples/Photos/packages/repositories.config
new file mode 100644
index 000000000..eaf386955
--- /dev/null
+++ b/samples/Photos/packages/repositories.config
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+  <repository path="..\PhotoTiles\packages.config" />
+  <repository path="..\PhotoGrid\packages.config" />
+  <repository path="..\PhotoList\packages.config" />
+  <repository path="..\PhotoListTests\packages.config" />
+  <repository path="..\Photos\packages.config" />
+  <repository path="..\PhotosWeb\packages.config" />
+  <repository path="..\Plugins\packages.config" />
+</repositories>
\ No newline at end of file
diff --git a/samples/Todo/Todo.sln b/samples/Todo/Todo.sln
new file mode 100644
index 000000000..57b26a6aa
--- /dev/null
+++ b/samples/Todo/Todo.sln
@@ -0,0 +1,29 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Todo", "Todo\Todo.csproj", "{27D4B0A9-E192-40A9-BFE2-034B9B93AA40}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TodoWeb", "TodoWeb\TodoWeb.csproj", "{6B543006-1D4E-42A9-8679-4F43CA91DD4F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{27D4B0A9-E192-40A9-BFE2-034B9B93AA40} = {27D4B0A9-E192-40A9-BFE2-034B9B93AA40}
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{27D4B0A9-E192-40A9-BFE2-034B9B93AA40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{27D4B0A9-E192-40A9-BFE2-034B9B93AA40}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{27D4B0A9-E192-40A9-BFE2-034B9B93AA40}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{27D4B0A9-E192-40A9-BFE2-034B9B93AA40}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6B543006-1D4E-42A9-8679-4F43CA91DD4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6B543006-1D4E-42A9-8679-4F43CA91DD4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6B543006-1D4E-42A9-8679-4F43CA91DD4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6B543006-1D4E-42A9-8679-4F43CA91DD4F}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/samples/Todo/Todo/Properties/AssemblyInfo.cs b/samples/Todo/Todo/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..83a6fbc41
--- /dev/null
+++ b/samples/Todo/Todo/Properties/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Todo")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script# Samples")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("Todo")]
diff --git a/samples/Todo/Todo/Properties/FxCop.ruleset b/samples/Todo/Todo/Properties/FxCop.ruleset
new file mode 100644
index 000000000..47c160f61
--- /dev/null
+++ b/samples/Todo/Todo/Properties/FxCop.ruleset
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Script# Rules" Description="General Script Rules" ToolsVersion="10.0">
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1000" Action="Warning" />
+    <Rule Id="CA1001" Action="Warning" />
+    <Rule Id="CA1008" Action="Warning" />
+    <Rule Id="CA1009" Action="Warning" />
+    <Rule Id="CA1010" Action="Warning" />
+    <Rule Id="CA1011" Action="Warning" />
+    <Rule Id="CA1012" Action="Warning" />
+    <Rule Id="CA1013" Action="Warning" />
+    <Rule Id="CA1016" Action="Warning" />
+    <Rule Id="CA1018" Action="Warning" />
+    <Rule Id="CA1019" Action="Warning" />
+    <Rule Id="CA1020" Action="Warning" />
+    <Rule Id="CA1021" Action="Warning" />
+    <Rule Id="CA1023" Action="Warning" />
+    <Rule Id="CA1024" Action="Warning" />
+    <Rule Id="CA1026" Action="Warning" />
+    <Rule Id="CA1027" Action="Warning" />
+    <Rule Id="CA1028" Action="Warning" />
+    <Rule Id="CA1030" Action="Warning" />
+    <Rule Id="CA1032" Action="Warning" />
+    <Rule Id="CA1033" Action="Warning" />
+    <Rule Id="CA1034" Action="Warning" />
+    <Rule Id="CA1036" Action="Warning" />
+    <Rule Id="CA1040" Action="Warning" />
+    <Rule Id="CA1041" Action="Warning" />
+    <Rule Id="CA1043" Action="Warning" />
+    <Rule Id="CA1044" Action="Warning" />
+    <Rule Id="CA1045" Action="Warning" />
+    <Rule Id="CA1046" Action="Warning" />
+    <Rule Id="CA1047" Action="Warning" />
+    <Rule Id="CA1048" Action="Warning" />
+    <Rule Id="CA1052" Action="Warning" />
+    <Rule Id="CA1053" Action="Warning" />
+    <Rule Id="CA1058" Action="Warning" />
+    <Rule Id="CA1059" Action="Warning" />
+    <Rule Id="CA1061" Action="Warning" />
+    <Rule Id="CA1065" Action="Warning" />
+    <Rule Id="CA1500" Action="Warning" />
+    <Rule Id="CA1501" Action="Warning" />
+    <Rule Id="CA1502" Action="Warning" />
+    <Rule Id="CA1504" Action="Warning" />
+    <Rule Id="CA1505" Action="Warning" />
+    <Rule Id="CA1506" Action="Warning" />
+    <Rule Id="CA1700" Action="Warning" />
+    <Rule Id="CA1701" Action="Warning" />
+    <Rule Id="CA1702" Action="Warning" />
+    <Rule Id="CA1703" Action="Warning" />
+    <Rule Id="CA1704" Action="Warning" />
+    <Rule Id="CA1707" Action="Warning" />
+    <Rule Id="CA1708" Action="Warning" />
+    <Rule Id="CA1709" Action="Warning" />
+    <Rule Id="CA1710" Action="Warning" />
+    <Rule Id="CA1711" Action="Warning" />
+    <Rule Id="CA1712" Action="Warning" />
+    <Rule Id="CA1713" Action="Warning" />
+    <Rule Id="CA1714" Action="Warning" />
+    <Rule Id="CA1715" Action="Warning" />
+    <Rule Id="CA1716" Action="Warning" />
+    <Rule Id="CA1717" Action="Warning" />
+    <Rule Id="CA1719" Action="Warning" />
+    <Rule Id="CA1720" Action="Warning" />
+    <Rule Id="CA1721" Action="Warning" />
+    <Rule Id="CA1722" Action="Warning" />
+    <Rule Id="CA1724" Action="Warning" />
+    <Rule Id="CA1725" Action="Warning" />
+    <Rule Id="CA1726" Action="Warning" />
+    <Rule Id="CA1800" Action="Warning" />
+    <Rule Id="CA1801" Action="Warning" />
+    <Rule Id="CA1802" Action="Warning" />
+    <Rule Id="CA1804" Action="Warning" />
+    <Rule Id="CA1806" Action="Warning" />
+    <Rule Id="CA1809" Action="Warning" />
+    <Rule Id="CA1811" Action="Warning" />
+    <Rule Id="CA1812" Action="Warning" />
+    <Rule Id="CA1813" Action="Warning" />
+    <Rule Id="CA1814" Action="Warning" />
+    <Rule Id="CA1815" Action="Warning" />
+    <Rule Id="CA1819" Action="Warning" />
+    <Rule Id="CA1820" Action="Warning" />
+    <Rule Id="CA1821" Action="Warning" />
+    <Rule Id="CA2201" Action="Warning" />
+    <Rule Id="CA2202" Action="Warning" />
+    <Rule Id="CA2204" Action="Warning" />
+    <Rule Id="CA2207" Action="Warning" />
+    <Rule Id="CA2213" Action="Warning" />
+    <Rule Id="CA2214" Action="Warning" />
+    <Rule Id="CA2215" Action="Warning" />
+    <Rule Id="CA2217" Action="Warning" />
+    <Rule Id="CA2218" Action="Warning" />
+    <Rule Id="CA2219" Action="Warning" />
+    <Rule Id="CA2222" Action="Warning" />
+    <Rule Id="CA2223" Action="Warning" />
+    <Rule Id="CA2224" Action="Warning" />
+    <Rule Id="CA2226" Action="Warning" />
+    <Rule Id="CA2227" Action="Warning" />
+    <Rule Id="CA2233" Action="Warning" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/samples/Todo/Todo/Properties/Script.template b/samples/Todo/Todo/Properties/Script.template
new file mode 100644
index 000000000..8fcd90176
--- /dev/null
+++ b/samples/Todo/Todo/Properties/Script.template
@@ -0,0 +1,8 @@
+//! #= ScriptFile ##
+//
+
+(function($) {
+#include[as-is] "%code%"
+})(jQuery);
+
+//! This script was generated using Script# v#= CompilerVersion ##
diff --git a/samples/Todo/Todo/Todo.csproj b/samples/Todo/Todo/Todo.csproj
new file mode 100644
index 000000000..a9a17a5a6
--- /dev/null
+++ b/samples/Todo/Todo/Todo.csproj
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{27D4B0A9-E192-40A9-BFE2-034B9B93AA40}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Todo</RootNamespace>
+    <AssemblyName>Todo</AssemblyName>
+    <ScriptTemplate>Properties\Script.template</ScriptTemplate>
+    <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateScript>True</GenerateScript>
+    <GenerateResources>True</GenerateResources>
+    <DeploymentPath>..\TodoWeb\Scripts</DeploymentPath>
+    <RestoreNugetPackages>true</RestoreNugetPackages>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>
+    </DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>
+    </DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+    <None Include="Properties\FxCop.ruleset" />
+    <None Include="Properties\Script.template" />
+    <Compile Include="TodoApplication.cs" />
+    <Compile Include="TodoItem.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TodoList.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Script.jQuery">
+      <HintPath>..\packages\ScriptSharp.Lib.jQuery.0.7.6.0\lib\Script.jQuery.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.jQuery.Templating">
+      <HintPath>..\packages\ScriptSharp.Lib.jQuery.Templating.0.7.6.0\lib\Script.jQuery.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="Script.Web">
+      <HintPath>..\packages\ScriptSharp.Lib.HTML.0.7.6.0\lib\Script.Web.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\ScriptSharp.0.7.6.0\tools\ScriptSharp.targets" Condition="Exists('..\packages\ScriptSharp.0.7.6.0\tools\ScriptSharp.targets')" />
+  <Import Project="..\packages\nuget.targets" />
+</Project>
\ No newline at end of file
diff --git a/samples/Todo/Todo/TodoApplication.cs b/samples/Todo/Todo/TodoApplication.cs
new file mode 100644
index 000000000..3f0ac4277
--- /dev/null
+++ b/samples/Todo/Todo/TodoApplication.cs
@@ -0,0 +1,121 @@
+// TodoApplication.cs
+//
+
+using System;
+using System.Html;
+using jQueryApi;
+using jQueryApi.Templating;
+
+namespace Todo {
+
+    internal sealed class TodoApplication {
+
+        private TodoList _todoList;
+
+        private jQueryTemplateObject _itemTemplate;
+
+        private jQueryObject _newItem;
+        private jQueryObject _list;
+        private jQueryObject _activeCount;
+        private jQueryObject _clearButton;
+
+        static TodoApplication() {
+            jQuery.OnDocumentReady(delegate() {
+                new TodoApplication();
+            });
+        }
+
+        public TodoApplication() {
+            _todoList = new TodoList();
+
+            _itemTemplate = jQuery.Select("#itemTemplate").Plugin<jQueryTemplateObject>();
+
+            _newItem = jQuery.Select("#new-todo");
+            _list = jQuery.Select("#todo-list");
+            _activeCount = jQuery.Select("#todo-count");
+            _clearButton = jQuery.Select("#clear-completed");
+
+            _newItem.On("keyup", OnNewItemKeyUp);
+            _list.On("change", ".toggle", OnItemToggle);
+            _list.On("click", ".destroy", OnItemDelete);
+            _list.On("dblclick", "label", OnItemEditBegin);
+            _list.On("keypress", "input", OnItemEdit);
+            _list.On("blur", "input", OnItemEditComplete);
+            _clearButton.On("click", OnClearCompletedClick);
+
+            UpdateRendering();
+        }
+
+        private string GetItemID(Element e) {
+            return jQuery.FromElement(e).Closest("li").GetDataValue("id").ToString();
+        }
+
+        private void OnClearCompletedClick(jQueryEvent e) {
+            _todoList.DeleteItems();
+            UpdateRendering();
+        }
+
+        private void OnItemDelete(jQueryEvent e) {
+            string id = GetItemID(e.Target);
+            _todoList.DeleteItem(id);
+
+            UpdateRendering();
+        }
+
+        private void OnItemEdit(jQueryEvent e) {
+            if (e.Which == 13) {
+                e.Target.Blur();
+            }
+        }
+
+        private void OnItemEditBegin(jQueryEvent e) {
+            jQuery.FromElement(e.Target).Closest("li")
+                .AddClass("editing")
+                .Find(".edit")
+                .Focus();
+        }
+
+        private void OnItemEditComplete(jQueryEvent e) {
+            string id = GetItemID(e.Target);
+            TodoItem item = _todoList.GetItem(id);
+
+            string text = jQuery.FromElement(e.Target).GetValue().Trim();
+            if (String.IsNullOrEmpty(text)) {
+                _todoList.DeleteItem(item.ID);
+            }
+            else {
+                _todoList.UpdateItem(item, text, /* completed */ false);
+            }
+
+            UpdateRendering();
+        }
+
+        private void OnItemToggle(jQueryEvent e) {
+            string id = GetItemID(e.Target);
+            TodoItem item = _todoList.GetItem(id);
+
+            if (item != null) {
+                _todoList.UpdateItem(item, item.Title, !item.Completed);
+                UpdateRendering();
+            }
+        }
+
+        private void OnNewItemKeyUp(jQueryEvent e) {
+            string text = _newItem.GetValue().Trim();
+            if ((text.Length != 0) && (e.Which == 13)) {
+                _todoList.CreateItem(text);
+                _newItem.Value(String.Empty);
+
+                UpdateRendering();
+            }
+        }
+
+        private void UpdateRendering() {
+            _list.Empty();
+            _itemTemplate.RenderTemplate(_todoList.Items).AppendTo(_list);
+
+            _clearButton.SwitchClass("hidden", _todoList.CompletedCount == 0);
+            _activeCount.Text(_todoList.ActiveCount + " item(s) left");
+        }
+    }
+}
diff --git a/samples/Todo/Todo/TodoItem.cs b/samples/Todo/Todo/TodoItem.cs
new file mode 100644
index 000000000..c4e282eaa
--- /dev/null
+++ b/samples/Todo/Todo/TodoItem.cs
@@ -0,0 +1,21 @@
+// TodoItem.cs
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Todo {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    internal sealed class TodoItem {
+
+        public bool Completed;
+
+        [ScriptName("id")]
+        public string ID;
+
+        public string Title;
+    }
+}
diff --git a/samples/Todo/Todo/TodoList.cs b/samples/Todo/Todo/TodoList.cs
new file mode 100644
index 000000000..a23b5e36b
--- /dev/null
+++ b/samples/Todo/Todo/TodoList.cs
@@ -0,0 +1,109 @@
+// TodoList.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Html;
+using System.Serialization;
+
+namespace Todo {
+
+    internal sealed class TodoList {
+
+        private const string StorageKey = "todoItems";
+
+        private List<TodoItem> _items;
+
+        public TodoList() {
+            LoadItems();
+        }
+
+        public int ActiveCount {
+            get {
+                return _items.Reduce<int>(delegate(int previousValue, TodoItem item) {
+                    return previousValue + (item.Completed ? 0 : 1);
+                }, 0);
+            }
+        }
+
+        public int CompletedCount {
+            get {
+                return _items.Reduce<int>(delegate(int previousValue, TodoItem item) {
+                    return previousValue + (item.Completed ? 1 : 0);
+                }, 0);
+            }
+        }
+
+        public IEnumerable<TodoItem> Items {
+            get {
+                return _items;
+            }
+        }
+
+        public TodoItem CreateItem(string text) {
+            string id = Date.Now.GetTime().ToString();
+
+            TodoItem item = new TodoItem();
+            item.ID = id;
+            item.Title = text;
+            item.Completed = false;
+
+            _items.Add(item);
+            SaveItems();
+
+            return item;
+        }
+
+        public void DeleteItem(string id) {
+            foreach (TodoItem item in _items) {
+                if (item.ID == id) {
+                    _items.Remove(item);
+                    SaveItems();
+
+                    return;
+                }
+            }
+        }
+
+        public void DeleteItems() {
+            for (int i = _items.Count - 1; i >= 0; i--) {
+                if (_items[i].Completed) {
+                    _items.RemoveAt(i);
+                }
+            }
+
+            SaveItems();
+        }
+
+        public TodoItem GetItem(string id) {
+            foreach (TodoItem item in _items) {
+                if (item.ID == id) {
+                    return item;
+                }
+            }
+            return null;
+        }
+
+        private void LoadItems() {
+            string json = (string)Window.LocalStorage.GetItem(StorageKey);
+
+            if (String.IsNullOrEmpty(json) == false) {
+                _items = Json.ParseData<List<TodoItem>>(json);
+            }
+            else {
+                _items = new List<TodoItem>();
+            }
+        }
+
+        private void SaveItems() {
+            string json = Json.Stringify(_items);
+            Window.LocalStorage.SetItem(StorageKey, json);
+        }
+
+        public void UpdateItem(TodoItem item, string text, bool completed) {
+            item.Title = text;
+            item.Completed = completed;
+            SaveItems();
+        }
+    }
+}
diff --git a/samples/Todo/Todo/packages.config b/samples/Todo/Todo/packages.config
new file mode 100644
index 000000000..7a72c8bd3
--- /dev/null
+++ b/samples/Todo/Todo/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="ScriptSharp" version="0.7.6.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.HTML" version="0.7.6.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.jQuery" version="0.7.6.0" targetFramework="net40" />
+  <package id="ScriptSharp.Lib.jQuery.Templating" version="0.7.6.0" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/samples/Todo/TodoWeb/Assets/Background.png b/samples/Todo/TodoWeb/Assets/Background.png
new file mode 100644
index 000000000..b2a760082
Binary files /dev/null and b/samples/Todo/TodoWeb/Assets/Background.png differ
diff --git a/samples/Todo/TodoWeb/Assets/Todo.css b/samples/Todo/TodoWeb/Assets/Todo.css
new file mode 100644
index 000000000..39d0c5009
--- /dev/null
+++ b/samples/Todo/TodoWeb/Assets/Todo.css
@@ -0,0 +1,309 @@
+html, body {
+	margin: 0;
+	padding: 0;
+  width: 100%; height: 100%;
+}
+
+button {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	background: none;
+	font-size: 100%;
+	vertical-align: baseline;
+	font-family: inherit;
+	color: inherit;
+	-webkit-appearance: none;
+	-ms-appearance: none;
+	appearance: none;
+}
+
+body {
+	font: 14px 'Helvetica Neue', 'Segoe UI', Helvetica, sans-serif;
+	line-height: 1.4em;
+  background-color: #eaeaea;
+	background-image: url(Background.png);
+	color: #4d4d4d;
+	width: 550px;
+	margin: 0 auto;
+	-webkit-font-smoothing: antialiased;
+	-ms-font-smoothing: antialiased;
+	font-smoothing: antialiased;
+}
+
+#todoapp {
+	background: #fff;
+	background: rgba(255, 255, 255, 0.9);
+	margin: 130px 0 40px 0;
+	border: 1px solid #ccc;
+	position: relative;
+	border-top-left-radius: 2px;
+	border-top-right-radius: 2px;
+	box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.2),
+				0 25px 50px 0 rgba(0, 0, 0, 0.15);
+}
+
+#todoapp:before {
+	content: '';
+	border-left: 1px solid #f5d6d6;
+	border-right: 1px solid #f5d6d6;
+	width: 2px;
+	position: absolute;
+	top: 0;
+	left: 40px;
+	height: 100%;
+}
+
+#todoapp input::-webkit-input-placeholder {
+	font-style: italic;
+}
+
+#todoapp h1 {
+	position: absolute;
+	top: -120px;
+	width: 100%;
+	font-size: 70px;
+	font-weight: bold;
+	text-align: center;
+	color: #b3b3b3;
+	color: rgba(255, 255, 255, 0.3);
+	text-shadow: -1px -1px rgba(0, 0, 0, 0.2);
+	-webkit-text-rendering: optimizeLegibility;
+	-ms-text-rendering: optimizeLegibility;
+	text-rendering: optimizeLegibility;
+}
+
+#header {
+	padding-top: 15px;
+	border-radius: inherit;
+}
+
+#header:before {
+	content: '';
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	height: 15px;
+	z-index: 2;
+	border-bottom: 1px solid #6c615c;
+	background: #8d7d77;
+	background: -webkit-gradient(linear, left top, left bottom, from(rgba(132, 110, 100, 0.8)),to(rgba(101, 84, 76, 0.8)));
+	background: -webkit-linear-gradient(top, rgba(132, 110, 100, 0.8), rgba(101, 84, 76, 0.8));
+	background: -ms-linear-gradient(top, rgba(132, 110, 100, 0.8), rgba(101, 84, 76, 0.8));
+	background: linear-gradient(top, rgba(132, 110, 100, 0.8), rgba(101, 84, 76, 0.8));
+	border-top-left-radius: 1px;
+	border-top-right-radius: 1px;
+}
+
+#new-todo, .edit {
+	position: relative;
+	margin: 0;
+	width: 100%;
+	font-size: 24px;
+	font-family: inherit;
+	line-height: 1.4em;
+	outline: none;
+	color: inherit;
+	padding: 5px;
+  border: solid 1px rgba(0, 0, 0, 0.2);
+	box-shadow: inset 0 -1px 5px 0 rgba(0, 0, 0, 0.2);
+	-webkit-box-sizing: border-box;
+	-ms-box-sizing: border-box;
+	box-sizing: border-box;
+	-webkit-font-smoothing: antialiased;
+	-ms-font-smoothing: antialiased;
+	font-smoothing: antialiased;
+}
+
+#new-todo {
+	padding: 16px 16px 16px 60px;
+	border: none;
+	background: rgba(0, 0, 0, 0.02);
+	z-index: 2;
+	box-shadow: none;
+}
+
+#main {
+	position: relative;
+	z-index: 2;
+	border-top: 1px dotted #adadad;
+}
+
+#todo-list {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+#todo-list li {
+	position: relative;
+	font-size: 24px;
+	border-bottom: 1px dotted #ccc;
+}
+
+#todo-list li:last-child {
+	border-bottom: none;
+}
+
+#todo-list li.editing {
+	border-bottom: none;
+	padding: 0;
+}
+
+#todo-list li.editing .edit {
+	display: block;
+	width: 505px;
+	padding: 13px 17px 12px 17px;
+	margin: 0 0 0 43px;
+}
+
+#todo-list li.editing .view {
+	display: none;
+}
+
+#todo-list li .toggle {
+	text-align: center;
+	width: 40px;
+	height: 40px;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	margin: auto 0;
+	border: none;
+	-webkit-appearance: none;
+	-ms-appearance: none;
+	appearance: none;
+}
+
+#todo-list li .toggle:after {
+	font-size: 18px;
+	content: '✔';
+	line-height: 43px; /* 40 + a couple of pixels visual adjustment */
+	font-size: 20px;
+	color: #d9d9d9;
+	text-shadow: 0 -1px 0 #bfbfbf;
+}
+
+#todo-list li .toggle:checked:after {
+	color: #85ada7;
+	text-shadow: 0 1px 0 #669991;
+	bottom: 1px;
+	position: relative;
+}
+
+#todo-list li label {
+	word-break: break-word;
+	padding: 15px;
+	margin-left: 45px;
+	display: block;
+	line-height: 1.2;
+	-webkit-transition: color 0.4s;
+	-ms-transition: color 0.4s;
+	transition: color 0.4s;
+}
+
+#todo-list li.completed label {
+	color: #a9a9a9;
+	text-decoration: line-through;
+}
+
+#todo-list li .destroy {
+	display: none;
+	position: absolute;
+	top: 0;
+	right: 10px;
+	bottom: 0;
+	width: 40px;
+	height: 40px;
+	margin: auto 0;
+	font-size: 22px;
+	color: #a88a8a;
+	-webkit-transition: all 0.2s;
+	-ms-transition: all 0.2s;
+	transition: all 0.2s;
+}
+
+#todo-list li .destroy:hover {
+	text-shadow: 0 0 1px #000, 0 0 10px rgba(199, 107, 107, 0.8);
+	-webkit-transform: scale(1.3);
+	-ms-transform: scale(1.3);
+	transform: scale(1.3);
+}
+
+#todo-list li .destroy:after {
+	content: '✖';
+}
+
+#todo-list li:hover .destroy {
+	display: block;
+}
+
+#todo-list li .edit {
+	display: none;
+}
+
+#todo-list li.editing:last-child {
+	margin-bottom: -1px;
+}
+
+#footer {
+  font-size: 12px;
+	color: #777;
+	padding: 0 15px;
+	position: absolute;
+	right: 0;
+	bottom: -31px;
+	left: 0;
+	height: 20px;
+	z-index: 1;
+	text-align: center;
+}
+
+#footer:before {
+	content: '';
+	position: absolute;
+	right: 0;
+	bottom: 31px;
+	left: 0;
+	height: 50px;
+	z-index: -1;
+	box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3),
+				0 6px 0 -3px rgba(255, 255, 255, 0.8),
+				0 7px 1px -3px rgba(0, 0, 0, 0.3),
+				0 43px 0 -6px rgba(255, 255, 255, 0.8),
+				0 44px 2px -6px rgba(0, 0, 0, 0.2);
+}
+
+#todo-count {
+	float: left;
+	text-align: left;
+}
+
+#clear-completed {
+	float: right;
+	position: relative;
+	line-height: 20px;
+	text-decoration: none;
+	background: rgba(0, 0, 0, 0.1);
+	font-size: 11px;
+	padding: 0 10px;
+	border-radius: 3px;
+	box-shadow: 0 -1px 0 0 rgba(0, 0, 0, 0.2);
+}
+
+#clear-completed:hover {
+	background: rgba(0, 0, 0, 0.15);
+	box-shadow: 0 -1px 0 0 rgba(0, 0, 0, 0.3);
+}
+
+#info {
+	margin: 65px auto 0;
+	color: #a6a6a6;
+	font-size: 12px;
+	text-align: center;
+}
+
+.hidden{
+	display:none;
+}
diff --git a/samples/Todo/TodoWeb/Default.htm b/samples/Todo/TodoWeb/Default.htm
new file mode 100644
index 000000000..e6326e0b8
--- /dev/null
+++ b/samples/Todo/TodoWeb/Default.htm
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Todo</title>
+  <link rel="stylesheet" type="text/css" href="/Assets/Todo.css" />
+</head>
+<body>
+  <section id="todoapp">
+    <header id="header">
+      <h1>todos</h1>
+      <input id="new-todo" placeholder="What needs to be done?" autofocus>
+    </header>
+    <section id="main">
+      <ul id="todo-list"></ul>
+    </section>
+    <footer id="footer">
+      <span id="todo-count"></span>
+      <button id="clear-completed">Clear completed</button>
+    </footer>
+  </section>
+  <footer id="info">
+    <p>Script# TODO List Sample (based on TodoMVC)</p>
+  </footer>
+
+  <script id="itemTemplate" type="text/html">
+    <li {{if completed}}class="completed"{{/if}} data-id="${id}">
+      <div class="view">
+        <input class="toggle" type="checkbox" {{if completed}}checked{{/if}}>
+        <label>${title}</label>
+        <button class="destroy"></button>
+      </div>
+      <input class="edit" value="${title}">
+    </li>
+  </script>
+
+  <script src="/Scripts/jQuery.min.js"></script>
+  <script src="/Scripts/jQuery.tmpl.js"></script>
+  <script src="/Scripts/mscorlib.js"></script>
+  <script src="/Scripts/Todo.debug.js"></script>
+</body>
+</html>
diff --git a/samples/Todo/TodoWeb/Properties/AssemblyInfo.cs b/samples/Todo/TodoWeb/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..05d594856
--- /dev/null
+++ b/samples/Todo/TodoWeb/Properties/AssemblyInfo.cs
@@ -0,0 +1,16 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle("TodoWeb")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script# Samples")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/samples/Todo/TodoWeb/Scripts/jquery.min.js b/samples/Todo/TodoWeb/Scripts/jquery.min.js
new file mode 100644
index 000000000..16ad06c5a
--- /dev/null
+++ b/samples/Todo/TodoWeb/Scripts/jquery.min.js
@@ -0,0 +1,4 @@
+/*! jQuery v1.7.2 jquery.com | jquery.org/license */
+(function(a,b){function cy(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cu(a){if(!cj[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ck||(ck=c.createElement("iframe"),ck.frameBorder=ck.width=ck.height=0),b.appendChild(ck);if(!cl||!ck.createElement)cl=(ck.contentWindow||ck.contentDocument).document,cl.write((f.support.boxModel?"<!doctype html>":"")+"<html><body>"),cl.close();d=cl.createElement(a),cl.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ck)}cj[a]=e}return cj[a]}function ct(a,b){var c={};f.each(cp.concat.apply([],cp.slice(0,b)),function(){c[this]=a});return c}function cs(){cq=b}function cr(){setTimeout(cs,0);return cq=f.now()}function ci(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ch(){try{return new a.XMLHttpRequest}catch(b){}}function cb(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function ca(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function b_(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bD.test(a)?d(a,e):b_(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&f.type(b)==="object")for(var e in b)b_(a+"["+e+"]",b[e],c,d);else d(a,b)}function b$(a,c){var d,e,g=f.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((g[d]?a:e||(e={}))[d]=c[d]);e&&f.extend(!0,a,e)}function bZ(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bS,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bZ(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bZ(a,c,d,e,"*",g));return l}function bY(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bO),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bB(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?1:0,g=4;if(d>0){if(c!=="border")for(;e<g;e+=2)c||(d-=parseFloat(f.css(a,"padding"+bx[e]))||0),c==="margin"?d+=parseFloat(f.css(a,c+bx[e]))||0:d-=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0;return d+"px"}d=by(a,b);if(d<0||d==null)d=a.style[b];if(bt.test(d))return d;d=parseFloat(d)||0;if(c)for(;e<g;e+=2)d+=parseFloat(f.css(a,"padding"+bx[e]))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+bx[e]+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+bx[e]))||0);return d+"px"}function bo(a){var b=c.createElement("div");bh.appendChild(b),b.innerHTML=a.outerHTML;return b.firstChild}function bn(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bm(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bm)}function bm(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bl(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bk(a,b){var c;b.nodeType===1&&(b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?b.outerHTML=a.outerHTML:c!=="input"||a.type!=="checkbox"&&a.type!=="radio"?c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text):(a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value)),b.removeAttribute(f.expando),b.removeAttribute("_submit_attached"),b.removeAttribute("_change_attached"))}function bj(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d<e;d++)f.event.add(b,c,i[c][d])}h.data&&(h.data=f.extend({},h.data))}}function bi(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function U(a){var b=V.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function T(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(O.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function S(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function K(){return!0}function J(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?+d:j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c<d;c++)b[a[c]]=!0;return b}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=/-([a-z]|[0-9])/ig,w=/^-ms-/,x=function(a,b){return(b+"").toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=m.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.add(a);return this},eq:function(a){a=+a;return a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").off("ready")}},bindReady:function(){if(!A){A=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||D.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw new Error(a)},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){if(typeof c!="string"||!c)return null;var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,"ms-").replace(v,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b,c){var d;if(b){if(H)return H.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h,i){var j,k=d==null,l=0,m=a.length;if(d&&typeof d=="object"){for(l in d)e.access(a,c,l,d[l],1,h,f);g=1}else if(f!==b){j=i===b&&e.isFunction(f),k&&(j?(j=c,c=function(a,b,c){return j.call(e(a),c)}):(c.call(a,f),c=null));if(c)for(;l<m;l++)c(a[l],d,j?f.call(a[l],l,c(a[l],d)):f,i);g=1}return g?a:k?c.call(a):m?c(a[0],d):h},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g={};f.Callbacks=function(a){a=a?g[a]||h(a):{};var c=[],d=[],e,i,j,k,l,m,n=function(b){var d,e,g,h,i;for(d=0,e=b.length;d<e;d++)g=b[d],h=f.type(g),h==="array"?n(g):h==="function"&&(!a.unique||!p.has(g))&&c.push(g)},o=function(b,f){f=f||[],e=!a.memory||[b,f],i=!0,j=!0,m=k||0,k=0,l=c.length;for(;c&&m<l;m++)if(c[m].apply(b,f)===!1&&a.stopOnFalse){e=!0;break}j=!1,c&&(a.once?e===!0?p.disable():c=[]:d&&d.length&&(e=d.shift(),p.fireWith(e[0],e[1])))},p={add:function(){if(c){var a=c.length;n(arguments),j?l=c.length:e&&e!==!0&&(k=a,o(e[0],e[1]))}return this},remove:function(){if(c){var b=arguments,d=0,e=b.length;for(;d<e;d++)for(var f=0;f<c.length;f++)if(b[d]===c[f]){j&&f<=l&&(l--,f<=m&&m--),c.splice(f--,1);if(a.unique)break}}return this},has:function(a){if(c){var b=0,d=c.length;for(;b<d;b++)if(a===c[b])return!0}return!1},empty:function(){c=[];return this},disable:function(){c=d=e=b;return this},disabled:function(){return!c},lock:function(){d=b,(!e||e===!0)&&p.disable();return this},locked:function(){return!d},fireWith:function(b,c){d&&(j?a.once||d.push([b,c]):(!a.once||!e)&&o(b,c));return this},fire:function(){p.fireWith(this,arguments);return this},fired:function(){return!!i}};return p};var i=[].slice;f.extend({Deferred:function(a){var b=f.Callbacks("once memory"),c=f.Callbacks("once memory"),d=f.Callbacks("memory"),e="pending",g={resolve:b,reject:c,notify:d},h={done:b.add,fail:c.add,progress:d.add,state:function(){return e},isResolved:b.fired,isRejected:c.fired,then:function(a,b,c){i.done(a).fail(b).progress(c);return this},always:function(){i.done.apply(i,arguments).fail.apply(i,arguments);return this},pipe:function(a,b,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[b,"reject"],progress:[c,"notify"]},function(a,b){var c=b[0],e=b[1],g;f.isFunction(c)?i[a](function(){g=c.apply(this,arguments),g&&f.isFunction(g.promise)?g.promise().then(d.resolve,d.reject,d.notify):d[e+"With"](this===i?d:this,[g])}):i[a](d[e])})}).promise()},promise:function(a){if(a==null)a=h;else for(var b in h)a[b]=h[b];return a}},i=h.promise({}),j;for(j in g)i[j]=g[j].fire,i[j+"With"]=g[j].fireWith;i.done(function(){e="resolved"},c.disable,d.lock).fail(function(){e="rejected"},b.disable,d.lock),a&&a.call(i,i);return i},when:function(a){function m(a){return function(b){e[a]=arguments.length>1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;c<d;c++)b[c]&&b[c].promise&&f.isFunction(b[c].promise)?b[c].promise().then(l(c),j.reject,m(c)):--g;g||j.resolveWith(j,b)}else j!==a&&j.resolveWith(j,d?[a]:[]);return k}}),f.support=function(){var b,d,e,g,h,i,j,k,l,m,n,o,p=c.createElement("div"),q=c.documentElement;p.setAttribute("className","t"),p.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=p.getElementsByTagName("*"),e=p.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=p.getElementsByTagName("input")[0],b={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:p.className!=="t",enctype:!!c.createElement("form").enctype,html5Clone:c.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,pixelMargin:!0},f.boxModel=b.boxModel=c.compatMode==="CSS1Compat",i.checked=!0,b.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,b.optDisabled=!h.disabled;try{delete p.test}catch(r){b.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",function(){b.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),b.radioValue=i.value==="t",i.setAttribute("checked","checked"),i.setAttribute("name","t"),p.appendChild(i),j=c.createDocumentFragment(),j.appendChild(p.lastChild),b.checkClone=j.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=i.checked,j.removeChild(i),j.appendChild(p);if(p.attachEvent)for(n in{submit:1,change:1,focusin:1})m="on"+n,o=m in p,o||(p.setAttribute(m,"return;"),o=typeof p[m]=="function"),b[n+"Bubbles"]=o;j.removeChild(p),j=g=h=p=i=null,f(function(){var d,e,g,h,i,j,l,m,n,q,r,s,t,u=c.getElementsByTagName("body")[0];!u||(m=1,t="padding:0;margin:0;border:",r="position:absolute;top:0;left:0;width:1px;height:1px;",s=t+"0;visibility:hidden;",n="style='"+r+t+"5px solid #000;",q="<div "+n+"display:block;'><div style='"+t+"0;display:block;overflow:hidden;'></div></div>"+"<table "+n+"' cellpadding='0' cellspacing='0'>"+"<tr><td></td></tr></table>",d=c.createElement("div"),d.style.cssText=s+"width:0;height:0;position:static;top:0;margin-top:"+m+"px",u.insertBefore(d,u.firstChild),p=c.createElement("div"),d.appendChild(p),p.innerHTML="<table><tr><td style='"+t+"0;display:none'></td><td>t</td></tr></table>",k=p.getElementsByTagName("td"),o=k[0].offsetHeight===0,k[0].style.display="",k[1].style.display="none",b.reliableHiddenOffsets=o&&k[0].offsetHeight===0,a.getComputedStyle&&(p.innerHTML="",l=c.createElement("div"),l.style.width="0",l.style.marginRight="0",p.style.width="2px",p.appendChild(l),b.reliableMarginRight=(parseInt((a.getComputedStyle(l,null)||{marginRight:0}).marginRight,10)||0)===0),typeof p.style.zoom!="undefined"&&(p.innerHTML="",p.style.width=p.style.padding="1px",p.style.border=0,p.style.overflow="hidden",p.style.display="inline",p.style.zoom=1,b.inlineBlockNeedsLayout=p.offsetWidth===3,p.style.display="block",p.style.overflow="visible",p.innerHTML="<div style='width:5px;'></div>",b.shrinkWrapBlocks=p.offsetWidth!==3),p.style.cssText=r+s,p.innerHTML=q,e=p.firstChild,g=e.firstChild,i=e.nextSibling.firstChild.firstChild,j={doesNotAddBorder:g.offsetTop!==5,doesAddBorderForTableAndCells:i.offsetTop===5},g.style.position="fixed",g.style.top="20px",j.fixedPosition=g.offsetTop===20||g.offsetTop===15,g.style.position=g.style.top="",e.style.overflow="hidden",e.style.position="relative",j.subtractsBorderForOverflowNotVisible=g.offsetTop===-5,j.doesNotIncludeMarginInBodyOffset=u.offsetTop!==m,a.getComputedStyle&&(p.style.marginTop="1%",b.pixelMargin=(a.getComputedStyle(p,null)||{marginTop:0}).marginTop!=="1%"),typeof d.style.zoom!="undefined"&&(d.style.zoom=1),u.removeChild(d),l=p=d=null,f.extend(b,j))});return b}();var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[j]:a[j]&&j,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[j]=n=++f.uuid:n=j),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[h]:h;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)||(b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,g=b.length;e<g;e++)delete d[b[e]];if(!(c?m:f.isEmptyObject)(d))return}}if(!c){delete j[k].data;if(!m(j[k]))return}f.support.deleteExpando||!j.setInterval?delete j[k]:j[k]=null,i&&(f.support.deleteExpando?delete a[h]:a.removeAttribute?a.removeAttribute(h):a[h]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d,e,g,h,i,j=this[0],k=0,m=null;if(a===b){if(this.length){m=f.data(j);if(j.nodeType===1&&!f._data(j,"parsedAttrs")){g=j.attributes;for(i=g.length;k<i;k++)h=g[k].name,h.indexOf("data-")===0&&(h=f.camelCase(h.substring(5)),l(j,h,m[h]));f._data(j,"parsedAttrs",!0)}}return m}if(typeof a=="object")return this.each(function(){f.data(this,a)});d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!";return f.access(this,function(c){if(c===b){m=this.triggerHandler("getData"+e,[d[0]]),m===b&&j&&(m=f.data(j,a),m=l(j,a,m));return m===b&&d[1]?this.data(d[0]):m}d[1]=c,this.each(function(){var b=f(this);b.triggerHandler("setData"+e,d),f.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1)},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,b){a&&(b=(b||"fx")+"mark",f._data(a,b,(f._data(a,b)||0)+1))},_unmark:function(a,b,c){a!==!0&&(c=b,b=a,a=!1);if(b){c=c||"fx";var d=c+"mark",e=a?0:(f._data(b,d)||1)-1;e?f._data(b,d,e):(f.removeData(b,d,!0),n(b,c,"mark"))}},queue:function(a,b,c){var d;if(a){b=(b||"fx")+"queue",d=f._data(a,b),c&&(!d||f.isArray(c)?d=f._data(a,b,f.makeArray(c)):d.push(c));return d||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e={};d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),f._data(a,b+".run",e),d.call(a,function(){f.dequeue(a,b)},e)),c.length||(f.removeData(a,b+"queue "+b+".run",!0),n(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){var d=2;typeof a!="string"&&(c=a,a="fx",d--);if(arguments.length<d)return f.queue(this[0],a);return c===b?this:this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f.Callbacks("once memory"),!0))h++,l.add(m);m();return d.promise(c)}});var o=/[\n\t\r]/g,p=/\s+/,q=/\r/g,r=/^(?:button|input)$/i,s=/^(?:button|input|object|select|textarea)$/i,t=/^a(?:rea)?$/i,u=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,v=f.support.getSetAttribute,w,x,y;f.fn.extend({attr:function(a,b){return f.access(this,f.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,f.prop,a,b,arguments.length>1)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(p);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(p);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(o," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(p);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(o," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];{if(!!arguments.length){e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.type]||f.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}if(g){c=f.valHooks[g.type]||f.valHooks[g.nodeName.toLowerCase()];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}}}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c<d;c++){e=i[c];if(e.selected&&(f.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!f.nodeName(e.parentNode,"optgroup"))){b=f(e).val();if(j)return b;h.push(b)}}if(j&&!h.length&&i.length)return f(i[g]).val();return h},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!!a&&j!==3&&j!==8&&j!==2){if(e&&c in f.attrFn)return f(a)[c](d);if(typeof a.getAttribute=="undefined")return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g}},removeAttr:function(a,b){var c,d,e,g,h,i=0;if(b&&a.nodeType===1){d=b.toLowerCase().split(p),g=d.length;for(;i<g;i++)e=d[i],e&&(c=f.propFix[e]||e,h=u.test(e),h||f.attr(a,e,""),a.removeAttribute(v?e:c),h&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(r.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},value:{get:function(a,b){if(w&&f.nodeName(a,"button"))return w.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(w&&f.nodeName(a,"button"))return w.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,g,h,i=a.nodeType;if(!!a&&i!==3&&i!==8&&i!==2){h=i!==1||!f.isXMLDoc(a),h&&(c=f.propFix[c]||c,g=f.propHooks[c]);return d!==b?g&&"set"in g&&(e=g.set(a,d,c))!==b?e:a[c]=d:g&&"get"in g&&(e=g.get(a,c))!==null?e:a[c]}},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):s.test(a.nodeName)||t.test(a.nodeName)&&a.href?0:b}}}}),f.attrHooks.tabindex=f.propHooks.tabIndex,x={get:function(a,c){var d,e=f.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},v||(y={name:!0,id:!0,coords:!0},w=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&(y[c]?d.nodeValue!=="":d.specified)?d.nodeValue:b},set:function(a,b,d){var e=a.getAttributeNode(d);e||(e=c.createAttribute(d),a.setAttributeNode(e));return e.nodeValue=b+""}},f.attrHooks.tabindex.set=w.set,f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})}),f.attrHooks.contenteditable={get:w.get,set:function(a,b,c){b===""&&(b="false"),w.set(a,b,c)}}),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex);return null}})),f.support.enctype||(f.propFix.enctype="encoding"),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var z=/^(?:textarea|input|select)$/i,A=/^([^\.]*)?(?:\.(.+))?$/,B=/(?:^|\s)hover(\.\S+)?\b/,C=/^key/,D=/^(?:mouse|contextmenu)|click/,E=/^(?:focusinfocus|focusoutblur)$/,F=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,G=function(
+a){var b=F.exec(a);b&&(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},H=function(a,b){var c=a.attributes||{};return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||(c.id||{}).value===b[2])&&(!b[3]||b[3].test((c["class"]||{}).value))},I=function(a){return f.event.special.hover?a:a.replace(B,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler,g=p.selector),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=f.trim(I(c)).split(" ");for(k=0;k<c.length;k++){l=A.exec(c[k])||[],m=l[1],n=(l[2]||"").split(".").sort(),s=f.event.special[m]||{},m=(g?s.delegateType:s.bindType)||m,s=f.event.special[m]||{},o=f.extend({type:m,origType:l[1],data:e,handler:d,guid:d.guid,selector:g,quick:g&&G(g),namespace:n.join(".")},p),r=j[m];if(!r){r=j[m]=[],r.delegateCount=0;if(!s.setup||s.setup.call(a,e,n,i)===!1)a.addEventListener?a.addEventListener(m,i,!1):a.attachEvent&&a.attachEvent("on"+m,i)}s.add&&(s.add.call(a,o),o.handler.guid||(o.handler.guid=d.guid)),g?r.splice(r.delegateCount++,0,o):r.push(o),f.event.global[m]=!0}a=null}},global:{},remove:function(a,b,c,d,e){var g=f.hasData(a)&&f._data(a),h,i,j,k,l,m,n,o,p,q,r,s;if(!!g&&!!(o=g.events)){b=f.trim(I(b||"")).split(" ");for(h=0;h<b.length;h++){i=A.exec(b[h])||[],j=k=i[1],l=i[2];if(!j){for(j in o)f.event.remove(a,j+b[h],c,d,!0);continue}p=f.event.special[j]||{},j=(d?p.delegateType:p.bindType)||j,r=o[j]||[],m=r.length,l=l?new RegExp("(^|\\.)"+l.split(".").sort().join("\\.(?:.*\\.)?")+"(\\.|$)"):null;for(n=0;n<r.length;n++)s=r[n],(e||k===s.origType)&&(!c||c.guid===s.guid)&&(!l||l.test(s.namespace))&&(!d||d===s.selector||d==="**"&&s.selector)&&(r.splice(n--,1),s.selector&&r.delegateCount--,p.remove&&p.remove.call(a,s));r.length===0&&m!==r.length&&((!p.teardown||p.teardown.call(a,l)===!1)&&f.removeEvent(a,j,g.handle),delete o[j])}f.isEmptyObject(o)&&(q=g.handle,q&&(q.elem=null),f.removeData(a,["events","handle"],!0))}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){if(!e||e.nodeType!==3&&e.nodeType!==8){var h=c.type||c,i=[],j,k,l,m,n,o,p,q,r,s;if(E.test(h+f.event.triggered))return;h.indexOf("!")>=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"";if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,m=E.test(s+h)?e:e.parentNode,n=null;for(;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l<r.length&&!c.isPropagationStopped();l++)m=r[l][0],c.type=r[l][1],q=(f._data(m,"events")||{})[c.type]&&f._data(m,"handle"),q&&q.apply(m,d),q=o&&m[o],q&&f.acceptData(m)&&q.apply(m,d)===!1&&c.preventDefault();c.type=h,!g&&!c.isDefaultPrevented()&&(!p._default||p._default.apply(e.ownerDocument,d)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)&&o&&e[h]&&(h!=="focus"&&h!=="blur"||c.target.offsetWidth!==0)&&!f.isWindow(e)&&(n=e[o],n&&(e[o]=null),f.event.triggered=h,e[h](),f.event.triggered=b,n&&(e[o]=n));return c.result}},dispatch:function(c){c=f.event.fix(c||a.event);var d=(f._data(this,"events")||{})[c.type]||[],e=d.delegateCount,g=[].slice.call(arguments,0),h=!c.exclusive&&!c.namespace,i=f.event.special[c.type]||{},j=[],k,l,m,n,o,p,q,r,s,t,u;g[0]=c,c.delegateTarget=this;if(!i.preDispatch||i.preDispatch.call(this,c)!==!1){if(e&&(!c.button||c.type!=="click")){n=f(this),n.context=this.ownerDocument||this;for(m=c.target;m!=this;m=m.parentNode||this)if(m.disabled!==!0){p={},r=[],n[0]=m;for(k=0;k<e;k++)s=d[k],t=s.selector,p[t]===b&&(p[t]=s.quick?H(m,s.quick):n.is(t)),p[t]&&r.push(s);r.length&&j.push({elem:m,matches:r})}}d.length>e&&j.push({elem:this,matches:d.slice(e)});for(k=0;k<j.length&&!c.isPropagationStopped();k++){q=j[k],c.currentTarget=q.elem;for(l=0;l<q.matches.length&&!c.isImmediatePropagationStopped();l++){s=q.matches[l];if(h||!c.namespace&&!s.namespace||c.namespace_re&&c.namespace_re.test(s.namespace))c.data=s.data,c.handleObj=s,o=((f.event.special[s.origType]||{}).handle||s.handler).apply(q.elem,g),o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()))}}i.postDispatch&&i.postDispatch.call(this,c);return c.result}},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode);return a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,d){var e,f,g,h=d.button,i=d.fromElement;a.pageX==null&&d.clientX!=null&&(e=a.target.ownerDocument||c,f=e.documentElement,g=e.body,a.pageX=d.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=d.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?d.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0);return a}},fix:function(a){if(a[f.expando])return a;var d,e,g=a,h=f.event.fixHooks[a.type]||{},i=h.props?this.props.concat(h.props):this.props;a=f.Event(g);for(d=i.length;d;)e=i[--d],a[e]=g[e];a.target||(a.target=g.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey===b&&(a.metaKey=a.ctrlKey);return h.filter?h.filter(a,g):a},special:{ready:{setup:f.bindReady},load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=f.extend(new f.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?f.event.trigger(e,null,b):f.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},f.event.handle=f.event.dispatch,f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!(this instanceof f.Event))return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?K:J):this.type=a,b&&f.extend(this,b),this.timeStamp=a&&a.timeStamp||f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=K;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=K;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=K,this.stopPropagation()},isDefaultPrevented:J,isPropagationStopped:J,isImmediatePropagationStopped:J},f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c=this,d=a.relatedTarget,e=a.handleObj,g=e.selector,h;if(!d||d!==c&&!f.contains(c,d))a.type=e.origType,h=e.handler.apply(this,arguments),a.type=b;return h}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(){if(f.nodeName(this,"form"))return!1;f.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=f.nodeName(c,"input")||f.nodeName(c,"button")?c.form:b;d&&!d._submit_attached&&(f.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),d._submit_attached=!0)})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&f.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(f.nodeName(this,"form"))return!1;f.event.remove(this,"._submit")}}),f.support.changeBubbles||(f.event.special.change={setup:function(){if(z.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")f.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),f.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1,f.event.simulate("change",this,a,!0))});return!1}f.event.add(this,"beforeactivate._change",function(a){var b=a.target;z.test(b.nodeName)&&!b._change_attached&&(f.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&f.event.simulate("change",this.parentNode,a,!0)}),b._change_attached=!0)})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){f.event.remove(this,"._change");return z.test(this.nodeName)}}),f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){var d=0,e=function(a){f.event.simulate(b,a.target,f.event.fix(a),!0)};f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.fn.extend({on:function(a,c,d,e,g){var h,i;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(i in a)this.on(i,c,d,a[i],g);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=J;else if(!e)return this;g===1&&(h=e,e=function(a){f().off(a);return h.apply(this,arguments)},e.guid=h.guid||(h.guid=f.guid++));return this.each(function(){f.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){if(a&&a.preventDefault&&a.handleObj){var e=a.handleObj;f(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler);return this}if(typeof a=="object"){for(var g in a)this.off(g,c,a[g]);return this}if(c===!1||typeof c=="function")d=c,c=b;d===!1&&(d=J);return this.each(function(){f.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){f(this.context).on(a,this.selector,b,c);return this},die:function(a,b){f(this.context).off(a,this.selector||"**",b);return this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length==1?this.off(a,"**"):this.off(b,a,c)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f._data(this,"lastToggle"+a.guid)||0)%d;f._data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.on(b,null,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),C.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),D.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}if(j.nodeType===1){g||(j[d]=c,j.sizset=h);if(typeof b!="string"){if(j===b){k=!0;break}}else if(m.filter(b,[j]).length>0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h<i;h++){var j=e[h];if(j){var k=!1;j=j[a];while(j){if(j[d]===c){k=e[j.sizset];break}j.nodeType===1&&!g&&(j[d]=c,j.sizset=h);if(j.nodeName.toLowerCase()===b){k=j;break}j=j[a]}e[h]=k}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},m.matches=function(a,b){return m(a,null,null,b)},m.matchesSelector=function(a,b){return m(b,null,null,[a]).length>0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e<f;e++){h=o.order[e];if(g=o.leftMatch[h].exec(a)){i=g[1],g.splice(1,1);if(i.substr(i.length-1)!=="\\"){g[1]=(g[1]||"").replace(j,""),d=o.find[h](g,b,c);if(d!=null){a=a.replace(o.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},m.filter=function(a,c,d,e){var f,g,h,i,j,k,l,n,p,q=a,r=[],s=c,t=c&&c[0]&&m.isXML(c[0]);while(a&&c.length){for(h in o.filter)if((f=o.leftMatch[h].exec(a))!=null&&f[2]){k=o.filter[h],l=f[1],g=!1,f.splice(1,1);if(l.substr(l.length-1)==="\\")continue;s===r&&(r=[]);if(o.preFilter[h]){f=o.preFilter[h](f,s,d,r,e,t);if(!f)g=i=!0;else if(f===!0)continue}if(f)for(n=0;(j=s[n])!=null;n++)j&&(i=k(j,f,n,s),p=e^i,d&&i!=null?p?g=!0:s[n]=!1:p&&(r.push(j),g=!0));if(i!==b){d||(s=r),a=a.replace(o.match[h],"");if(!g)return[];break}}if(a===q)if(g==null)m.error(a);else break;q=a}return s},m.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)};var n=m.getText=function(a){var b,c,d=a.nodeType,e="";if(d){if(d===1||d===9||d===11){if(typeof a.textContent=="string")return a.textContent;if(typeof a.innerText=="string")return a.innerText.replace(k,"");for(a=a.firstChild;a;a=a.nextSibling)e+=n(a)}else if(d===3||d===4)return a.nodeValue}else for(b=0;c=a[b];b++)c.nodeType!==8&&(e+=n(c));return e},o=m.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!l.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&m.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&m.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=x;typeof b=="string"&&!l.test(b)&&(b=b.toLowerCase(),d=b,g=w),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(j,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}m.error(e)},CHILD:function(a,b){var c,e,f,g,h,i,j,k=b[1],l=a;switch(k){case"only":case"first":while(l=l.previousSibling)if(l.nodeType===1)return!1;if(k==="first")return!0;l=a;case"last":while(l=l.nextSibling)if(l.nodeType===1)return!1;return!0;case"nth":c=b[2],e=b[3];if(c===1&&e===0)return!0;f=b[0],g=a.parentNode;if(g&&(g[d]!==f||!a.nodeIndex)){i=0;for(l=g.firstChild;l;l=l.nextSibling)l.nodeType===1&&(l.nodeIndex=++i);g[d]=f}j=a.nodeIndex-e;return c===0?j===0:j%c===0&&j/c>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));o.match.globalPOS=p;var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var u,v;c.documentElement.compareDocumentPosition?u=function(a,b){if(a===b){h=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(u=function(a,b){if(a===b){h=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,i=b.parentNode,j=g;if(g===i)return v(a,b);if(!g)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return v(e[k],f[k]);return k===c?v(a,f[k],-1):v(e[k],b,1)},v=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(o.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},o.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(o.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(o.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=m,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h<i;h++)m(a,g[h],e,c);return m.filter(f,e)};m.attr=f.attr,m.selectors.attrMap={},f.find=m,f.expr=m.selectors,f.expr[":"]=f.expr.filters,f.unique=m.uniqueSort,f.text=m.getText,f.isXMLDoc=m.isXML,f.contains=m.contains}();var L=/Until$/,M=/^(?:parents|prevUntil|prevAll)/,N=/,/,O=/^.[^:#\[\.,]*$/,P=Array.prototype.slice,Q=f.expr.match.globalPOS,R={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(T(this,a,!1),"not",a)},filter:function(a){return this.pushStack(T(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?Q.test(a)?f(a,this.context).index(this[0])>=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d<a.length;d++)f(g).is(a[d])&&c.push({selector:a[d],elem:g,level:h});g=g.parentNode,h++}return c}var i=Q.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(i?i.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(S(c[0])||S(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c);L.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!R[a]?f.unique(e):e,(this.length>1||N.test(d))&&M.test(a)&&(e=e.reverse());return this.pushStack(e,a,P.call(arguments).join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var V="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",W=/ jQuery\d+="(?:\d+|null)"/g,X=/^\s+/,Y=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Z=/<([\w:]+)/,$=/<tbody/i,_=/<|&#?\w+;/,ba=/<(?:script|style)/i,bb=/<(?:script|object|embed|option|style)/i,bc=new RegExp("<(?:"+V+")[\\s/>]","i"),bd=/checked\s*(?:[^=]|=\s*.checked.)/i,be=/\/(java|ecma)script/i,bf=/^\s*<!(?:\[CDATA\[|\-\-)/,bg={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bh=U(c);bg.optgroup=bg.option,bg.tbody=bg.tfoot=bg.colgroup=bg.caption=bg.thead,bg.th=bg.td,f.support.htmlSerialize||(bg._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){return f.access(this,function(a){return a===b?f.text(this):this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=f.isFunction(a);return this.each(function(c){f(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f
+.clean(arguments);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f.clean(arguments));return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){return f.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(W,""):null;if(typeof a=="string"&&!ba.test(a)&&(f.support.leadingWhitespace||!X.test(a))&&!bg[(Z.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Y,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(f.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(g){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bd.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bi(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,function(a,b){b.src?f.ajax({type:"GET",global:!1,url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bf,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i,j=a[0];b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof j=="string"&&j.length<512&&i===c&&j.charAt(0)==="<"&&!bb.test(j)&&(f.support.checkClone||!bd.test(j))&&(f.support.html5Clone||!bc.test(j))&&(g=!0,h=f.fragments[j],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[j]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d,e,g,h=f.support.html5Clone||f.isXMLDoc(a)||!bc.test("<"+a.nodeName+">")?a.cloneNode(!0):bo(a);if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bk(a,h),d=bl(a),e=bl(h);for(g=0;d[g];++g)e[g]&&bk(d[g],e[g])}if(b){bj(a,h);if(c){d=bl(a),e=bl(h);for(g=0;d[g];++g)bj(d[g],e[g])}}d=e=null;return h},clean:function(a,b,d,e){var g,h,i,j=[];b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);for(var k=0,l;(l=a[k])!=null;k++){typeof l=="number"&&(l+="");if(!l)continue;if(typeof l=="string")if(!_.test(l))l=b.createTextNode(l);else{l=l.replace(Y,"<$1></$2>");var m=(Z.exec(l)||["",""])[1].toLowerCase(),n=bg[m]||bg._default,o=n[0],p=b.createElement("div"),q=bh.childNodes,r;b===c?bh.appendChild(p):U(b).appendChild(p),p.innerHTML=n[1]+l+n[2];while(o--)p=p.lastChild;if(!f.support.tbody){var s=$.test(l),t=m==="table"&&!s?p.firstChild&&p.firstChild.childNodes:n[1]==="<table>"&&!s?p.childNodes:[];for(i=t.length-1;i>=0;--i)f.nodeName(t[i],"tbody")&&!t[i].childNodes.length&&t[i].parentNode.removeChild(t[i])}!f.support.leadingWhitespace&&X.test(l)&&p.insertBefore(b.createTextNode(X.exec(l)[0]),p.firstChild),l=p.childNodes,p&&(p.parentNode.removeChild(p),q.length>0&&(r=q[q.length-1],r&&r.parentNode&&r.parentNode.removeChild(r)))}var u;if(!f.support.appendChecked)if(l[0]&&typeof (u=l.length)=="number")for(i=0;i<u;i++)bn(l[i]);else bn(l);l.nodeType?j.push(l):j=f.merge(j,l)}if(d){g=function(a){return!a.type||be.test(a.type)};for(k=0;j[k];k++){h=j[k];if(e&&f.nodeName(h,"script")&&(!h.type||be.test(h.type)))e.push(h.parentNode?h.parentNode.removeChild(h):h);else{if(h.nodeType===1){var v=f.grep(h.getElementsByTagName("script"),g);j.splice.apply(j,[k+1,0].concat(v))}d.appendChild(h)}}}return j},cleanData:function(a){var b,c,d=f.cache,e=f.event.special,g=f.support.deleteExpando;for(var h=0,i;(i=a[h])!=null;h++){if(i.nodeName&&f.noData[i.nodeName.toLowerCase()])continue;c=i[f.expando];if(c){b=d[c];if(b&&b.events){for(var j in b.events)e[j]?f.event.remove(i,j):f.removeEvent(i,j,b.handle);b.handle&&(b.handle.elem=null)}g?delete i[f.expando]:i.removeAttribute&&i.removeAttribute(f.expando),delete d[c]}}}});var bp=/alpha\([^)]*\)/i,bq=/opacity=([^)]*)/,br=/([A-Z]|^ms)/g,bs=/^[\-+]?(?:\d*\.)?\d+$/i,bt=/^-?(?:\d*\.)?\d+(?!px)[^\d\s]+$/i,bu=/^([\-+])=([\-+.\de]+)/,bv=/^margin/,bw={position:"absolute",visibility:"hidden",display:"block"},bx=["Top","Right","Bottom","Left"],by,bz,bA;f.fn.css=function(a,c){return f.access(this,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)},a,c,arguments.length>1)},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=by(a,"opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d,h==="string"&&(g=bu.exec(d))&&(d=+(g[1]+1)*+g[2]+parseFloat(f.css(a,c)),h="number");if(d==null||h==="number"&&isNaN(d))return;h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(by)return by(a,c)},swap:function(a,b,c){var d={},e,f;for(f in b)d[f]=a.style[f],a.style[f]=b[f];e=c.call(a);for(f in b)a.style[f]=d[f];return e}}),f.curCSS=f.css,c.defaultView&&c.defaultView.getComputedStyle&&(bz=function(a,b){var c,d,e,g,h=a.style;b=b.replace(br,"-$1").toLowerCase(),(d=a.ownerDocument.defaultView)&&(e=d.getComputedStyle(a,null))&&(c=e.getPropertyValue(b),c===""&&!f.contains(a.ownerDocument.documentElement,a)&&(c=f.style(a,b))),!f.support.pixelMargin&&e&&bv.test(b)&&bt.test(c)&&(g=h.width,h.width=c,c=e.width,h.width=g);return c}),c.documentElement.currentStyle&&(bA=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f==null&&g&&(e=g[b])&&(f=e),bt.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),by=bz||bA,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth!==0?bB(a,b,d):f.swap(a,bw,function(){return bB(a,b,d)})},set:function(a,b){return bs.test(b)?b+"px":b}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bq.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bp,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bp.test(g)?g.replace(bp,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){return f.swap(a,{display:"inline-block"},function(){return b?by(a,"margin-right"):a.style.marginRight})}})}),f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)}),f.each({margin:"",padding:"",border:"Width"},function(a,b){f.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bx[d]+b]=e[d]||e[d-2]||e[0];return f}}});var bC=/%20/g,bD=/\[\]$/,bE=/\r?\n/g,bF=/#.*$/,bG=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bH=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bI=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bJ=/^(?:GET|HEAD)$/,bK=/^\/\//,bL=/\?/,bM=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bN=/^(?:select|textarea)/i,bO=/\s+/,bP=/([?&])_=[^&]*/,bQ=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bR=f.fn.load,bS={},bT={},bU,bV,bW=["*/"]+["*"];try{bU=e.href}catch(bX){bU=c.createElement("a"),bU.href="",bU=bU.href}bV=bQ.exec(bU.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bR)return bR.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bM,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bN.test(this.nodeName)||bH.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bE,"\r\n")}}):{name:b.name,value:c.replace(bE,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.on(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?b$(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),b$(a,b);return a},ajaxSettings:{url:bU,isLocal:bI.test(bV[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bW},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:bY(bS),ajaxTransport:bY(bT),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?ca(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=cb(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bG.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bF,"").replace(bK,bV[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bO),d.crossDomain==null&&(r=bQ.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bV[1]&&r[2]==bV[2]&&(r[3]||(r[1]==="http:"?80:443))==(bV[3]||(bV[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bZ(bS,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bJ.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bL.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bP,"$1_="+x);d.url=y+(y===d.url?(bL.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bW+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bZ(bT,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){if(s<2)w(-1,z);else throw z}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)b_(g,a[g],c,e);return d.join("&").replace(bC,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cc=f.now(),cd=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cc++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=typeof b.data=="string"&&/^application\/x\-www\-form\-urlencoded/.test(b.contentType);if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cd.test(b.url)||e&&cd.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cd,l),b.url===j&&(e&&(k=k.replace(cd,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ce=a.ActiveXObject?function(){for(var a in cg)cg[a](0,1)}:!1,cf=0,cg;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ch()||ci()}:ch,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ce&&delete cg[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n);try{m.text=h.responseText}catch(a){}try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cf,ce&&(cg||(cg={},f(a).unload(ce)),cg[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cj={},ck,cl,cm=/^(?:toggle|show|hide)$/,cn=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,co,cp=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cq;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(ct("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),(e===""&&f.css(d,"display")==="none"||!f.contains(d.ownerDocument.documentElement,d))&&f._data(d,"olddisplay",cu(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ct("hide",3),a,b,c);var d,e,g=0,h=this.length;for(;g<h;g++)d=this[g],d.style&&(e=f.css(d,"display"),e!=="none"&&!f._data(d,"olddisplay")&&f._data(d,"olddisplay",e));for(g=0;g<h;g++)this[g].style&&(this[g].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(ct("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){function g(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o,p,q;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]);if((k=f.cssHooks[g])&&"expand"in k){l=k.expand(a[g]),delete a[g];for(i in l)i in a||(a[i]=l[i])}}for(g in a){h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(!f.support.inlineBlockNeedsLayout||cu(this.nodeName)==="inline"?this.style.display="inline-block":this.style.zoom=1))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)j=new f.fx(this,b,i),h=a[i],cm.test(h)?(q=f._data(this,"toggle"+i)||(h==="toggle"?d?"show":"hide":0),q?(f._data(this,"toggle"+i,q==="show"?"hide":"show"),j[q]()):j[h]()):(m=cn.exec(h),n=j.cur(),m?(o=parseFloat(m[2]),p=m[3]||(f.cssNumber[i]?"":"px"),p!=="px"&&(f.style(this,i,(o||1)+p),n=(o||1)/j.cur()*n,f.style(this,i,n+p)),m[1]&&(o=(m[1]==="-="?-1:1)*o+n),j.custom(n,o,p)):j.custom(n,h,""));return!0}var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return e.queue===!1?this.each(g):this.queue(e.queue,g)},stop:function(a,c,d){typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]);return this.each(function(){function h(a,b,c){var e=b[c];f.removeData(a,c,!0),e.stop(d)}var b,c=!1,e=f.timers,g=f._data(this);d||f._unmark(!0,this);if(a==null)for(b in g)g[b]&&g[b].stop&&b.indexOf(".run")===b.length-4&&h(this,g,b);else g[b=a+".run"]&&g[b].stop&&h(this,g,b);for(b=e.length;b--;)e[b].elem===this&&(a==null||e[b].queue===a)&&(d?e[b](!0):e[b].saveState(),c=!0,e.splice(b,1));(!d||!c)&&f.dequeue(this,a)})}}),f.each({slideDown:ct("show",1),slideUp:ct("hide",1),slideToggle:ct("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue?f.dequeue(this,d.queue):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a){return a},swing:function(a){return-Math.cos(a*Math.PI)/2+.5}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,c,d){function h(a){return e.step(a)}var e=this,g=f.fx;this.startTime=cq||cr(),this.end=c,this.now=this.start=a,this.pos=this.state=0,this.unit=d||this.unit||(f.cssNumber[this.prop]?"":"px"),h.queue=this.options.queue,h.elem=this.elem,h.saveState=function(){f._data(e.elem,"fxshow"+e.prop)===b&&(e.options.hide?f._data(e.elem,"fxshow"+e.prop,e.start):e.options.show&&f._data(e.elem,"fxshow"+e.prop,e.end))},h()&&f.timers.push(h)&&!co&&(co=setInterval(g.tick,g.interval))},show:function(){var a=f._data(this.elem,"fxshow"+this.prop);this.options.orig[this.prop]=a||f.style(this.elem,this.prop),this.options.show=!0,a!==b?this.custom(this.cur(),a):this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f._data(this.elem,"fxshow"+this.prop)||f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b,c,d,e=cq||cr(),g=!0,h=this.elem,i=this.options;if(a||e>=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||f.fx.stop()},interval:13,stop:function(){clearInterval(co),co=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=a.now+a.unit:a.elem[a.prop]=a.now}}}),f.each(cp.concat.apply([],cp),function(a,b){b.indexOf("margin")&&(f.fx.step[b]=function(a){f.style(a.elem,b,Math.max(0,a.now)+a.unit)})}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var cv,cw=/^t(?:able|d|h)$/i,cx=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?cv=function(a,b,c,d){try{d=a.getBoundingClientRect()}catch(e){}if(!d||!f.contains(c,a))return d?{top:d.top,left:d.left}:{top:0,left:0};var g=b.body,h=cy(b),i=c.clientTop||g.clientTop||0,j=c.clientLeft||g.clientLeft||0,k=h.pageYOffset||f.support.boxModel&&c.scrollTop||g.scrollTop,l=h.pageXOffset||f.support.boxModel&&c.scrollLeft||g.scrollLeft,m=d.top+k-i,n=d.left+l-j;return{top:m,left:n}}:cv=function(a,b,c){var d,e=a.offsetParent,g=a,h=b.body,i=b.defaultView,j=i?i.getComputedStyle(a,null):a.currentStyle,k=a.offsetTop,l=a.offsetLeft;while((a=a.parentNode)&&a!==h&&a!==c){if(f.support.fixedPosition&&j.position==="fixed")break;d=i?i.getComputedStyle(a,null):a.currentStyle,k-=a.scrollTop,l-=a.scrollLeft,a===e&&(k+=a.offsetTop,l+=a.offsetLeft,f.support.doesNotAddBorder&&(!f.support.doesAddBorderForTableAndCells||!cw.test(a.nodeName))&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),g=e,e=a.offsetParent),f.support.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"&&(k+=parseFloat(d.borderTopWidth)||0,l+=parseFloat(d.borderLeftWidth)||0),j=d}if(j.position==="relative"||j.position==="static")k+=h.offsetTop,l+=h.offsetLeft;f.support.fixedPosition&&j.position==="fixed"&&(k+=Math.max(c.scrollTop,h.scrollTop),l+=Math.max(c.scrollLeft,h.scrollLeft));return{top:k,left:l}},f.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){f.offset.setOffset(this,a,b)});var c=this[0],d=c&&c.ownerDocument;if(!d)return null;if(c===d.body)return f.offset.bodyOffset(c);return cv(c,d,d.documentElement)},f.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cx.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cx.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);f.fn[a]=function(e){return f.access(this,function(a,e,g){var h=cy(a);if(g===b)return h?c in h?h[c]:f.support.boxModel&&h.document.documentElement[e]||h.document.body[e]:a[e];h?h.scrollTo(d?f(h).scrollLeft():g,d?g:f(h).scrollTop()):a[e]=g},a,e,arguments.length,null)}}),f.each({Height:"height",Width:"width"},function(a,c){var d="client"+a,e="scroll"+a,g="offset"+a;f.fn["inner"+a]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,c,"padding")):this[c]():null},f.fn["outer"+a]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,c,a?"margin":"border")):this[c]():null},f.fn[c]=function(a){return f.access(this,function(a,c,h){var i,j,k,l;if(f.isWindow(a)){i=a.document,j=i.documentElement[d];return f.support.boxModel&&j||i.body&&i.body[d]||j}if(a.nodeType===9){i=a.documentElement;if(i[d]>=i[e])return i[d];return Math.max(a.body[e],i[e],a.body[g],i[g])}if(h===b){k=f.css(a,c),l=parseFloat(k);return f.isNumeric(l)?l:k}f(a).css(c,h)},c,a,arguments.length,null)}}),a.jQuery=a.$=f,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return f})})(window);
\ No newline at end of file
diff --git a/samples/Todo/TodoWeb/Scripts/jquery.tmpl.js b/samples/Todo/TodoWeb/Scripts/jquery.tmpl.js
new file mode 100644
index 000000000..1c5b2d62f
--- /dev/null
+++ b/samples/Todo/TodoWeb/Scripts/jquery.tmpl.js
@@ -0,0 +1,486 @@
+/*
+ * jQuery Templating Plugin
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ */
+(function( jQuery, undefined ){
+	var oldManip = jQuery.fn.domManip, tmplItmAtt = "_tmplitem", htmlExpr = /^[^<]*(<[\w\W]+>)[^>]*$|\{\{\! /,
+		newTmplItems = {}, wrappedItems = {}, appendToTmplItems, topTmplItem = { key: 0, data: {} }, itemKey = 0, cloneIndex = 0, stack = [];
+
+	function newTmplItem( options, parentItem, fn, data ) {
+		// Returns a template item data structure for a new rendered instance of a template (a 'template item').
+		// The content field is a hierarchical array of strings and nested items (to be
+		// removed and replaced by nodes field of dom elements, once inserted in DOM).
+		var newItem = {
+			data: data || (parentItem ? parentItem.data : {}),
+			_wrap: parentItem ? parentItem._wrap : null,
+			tmpl: null,
+			parent: parentItem || null,
+			nodes: [],
+			calls: tiCalls,
+			nest: tiNest,
+			wrap: tiWrap,
+			html: tiHtml,
+			update: tiUpdate
+		};
+		if ( options ) {
+			jQuery.extend( newItem, options, { nodes: [], parent: parentItem } );
+		}
+		if ( fn ) {
+			// Build the hierarchical content to be used during insertion into DOM
+			newItem.tmpl = fn;
+			newItem._ctnt = newItem._ctnt || newItem.tmpl( jQuery, newItem );
+			newItem.key = ++itemKey;
+			// Keep track of new template item, until it is stored as jQuery Data on DOM element
+			(stack.length ? wrappedItems : newTmplItems)[itemKey] = newItem;
+		}
+		return newItem;
+	}
+
+	// Override appendTo etc., in order to provide support for targeting multiple elements. (This code would disappear if integrated in jquery core).
+	jQuery.each({
+		appendTo: "append",
+		prependTo: "prepend",
+		insertBefore: "before",
+		insertAfter: "after",
+		replaceAll: "replaceWith"
+	}, function( name, original ) {
+		jQuery.fn[ name ] = function( selector ) {
+			var ret = [], insert = jQuery( selector ), elems, i, l, tmplItems,
+				parent = this.length === 1 && this[0].parentNode;
+
+			appendToTmplItems = newTmplItems || {};
+			if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
+				insert[ original ]( this[0] );
+				ret = this;
+			} else {
+				for ( i = 0, l = insert.length; i < l; i++ ) {
+					cloneIndex = i;
+					elems = (i > 0 ? this.clone(true) : this).get();
+					jQuery.fn[ original ].apply( jQuery(insert[i]), elems );
+					ret = ret.concat( elems );
+				}
+				cloneIndex = 0;
+				ret = this.pushStack( ret, name, insert.selector );
+			}
+			tmplItems = appendToTmplItems;
+			appendToTmplItems = null;
+			jQuery.tmpl.complete( tmplItems );
+			return ret;
+		};
+	});
+
+	jQuery.fn.extend({
+		// Use first wrapped element as template markup.
+		// Return wrapped set of template items, obtained by rendering template against data.
+		tmpl: function( data, options, parentItem ) {
+			return jQuery.tmpl( this[0], data, options, parentItem );
+		},
+
+		// Find which rendered template item the first wrapped DOM element belongs to
+		tmplItem: function() {
+			return jQuery.tmplItem( this[0] );
+		},
+
+		// Consider the first wrapped element as a template declaration, and get the compiled template or store it as a named template.
+		template: function( name ) {
+			return jQuery.template( name, this[0] );
+		},
+
+		domManip: function( args, table, callback, options ) {
+			// This appears to be a bug in the appendTo, etc. implementation
+			// it should be doing .call() instead of .apply(). See #6227
+			if ( args[0] && args[0].nodeType ) {
+				var dmArgs = jQuery.makeArray( arguments ), argsLength = args.length, i = 0, tmplItem;
+				while ( i < argsLength && !(tmplItem = jQuery.data( args[i++], "tmplItem" ))) {}
+				if ( argsLength > 1 ) {
+					dmArgs[0] = [jQuery.makeArray( args )];
+				}
+				if ( tmplItem && cloneIndex ) {
+					dmArgs[2] = function( fragClone ) {
+						// Handler called by oldManip when rendered template has been inserted into DOM.
+						jQuery.tmpl.afterManip( this, fragClone, callback );
+					};
+				}
+				oldManip.apply( this, dmArgs );
+			} else {
+				oldManip.apply( this, arguments );
+			}
+			cloneIndex = 0;
+			if ( !appendToTmplItems ) {
+				jQuery.tmpl.complete( newTmplItems );
+			}
+			return this;
+		}
+	});
+
+	jQuery.extend({
+		// Return wrapped set of template items, obtained by rendering template against data.
+		tmpl: function( tmpl, data, options, parentItem ) {
+			var ret, topLevel = !parentItem;
+			if ( topLevel ) {
+				// This is a top-level tmpl call (not from a nested template using {{tmpl}})
+				parentItem = topTmplItem;
+				tmpl = jQuery.template[tmpl] || jQuery.template( null, tmpl );
+				wrappedItems = {}; // Any wrapped items will be rebuilt, since this is top level
+			} else if ( !tmpl ) {
+				// The template item is already associated with DOM - this is a refresh.
+				// Re-evaluate rendered template for the parentItem
+				tmpl = parentItem.tmpl;
+				newTmplItems[parentItem.key] = parentItem;
+				parentItem.nodes = [];
+				if ( parentItem.wrapped ) {
+					updateWrapped( parentItem, parentItem.wrapped );
+				}
+				// Rebuild, without creating a new template item
+				return jQuery( build( parentItem, null, parentItem.tmpl( jQuery, parentItem ) ));
+			}
+			if ( !tmpl ) {
+				return []; // Could throw...
+			}
+			if ( typeof data === "function" ) {
+				data = data.call( parentItem || {} );
+			}
+			if ( options && options.wrapped ) {
+				updateWrapped( options, options.wrapped );
+			}
+			ret = jQuery.isArray( data ) ? 
+				jQuery.map( data, function( dataItem ) {
+					return dataItem ? newTmplItem( options, parentItem, tmpl, dataItem ) : null;
+				}) :
+				[ newTmplItem( options, parentItem, tmpl, data ) ];
+			return topLevel ? jQuery( build( parentItem, null, ret ) ) : ret;
+		},
+
+		// Return rendered template item for an element.
+		tmplItem: function( elem ) {
+			var tmplItem;
+			if ( elem instanceof jQuery ) {
+				elem = elem[0];
+			}
+			while ( elem && elem.nodeType === 1 && !(tmplItem = jQuery.data( elem, "tmplItem" )) && (elem = elem.parentNode) ) {}
+			return tmplItem || topTmplItem;
+		},
+
+		// Set:
+		// Use $.template( name, tmpl ) to cache a named template,
+		// where tmpl is a template string, a script element or a jQuery instance wrapping a script element, etc.
+		// Use $( "selector" ).template( name ) to provide access by name to a script block template declaration.
+
+		// Get:
+		// Use $.template( name ) to access a cached template.
+		// Also $( selectorToScriptBlock ).template(), or $.template( null, templateString )
+		// will return the compiled template, without adding a name reference.
+		// If templateString includes at least one HTML tag, $.template( templateString ) is equivalent
+		// to $.template( null, templateString )
+		template: function( name, tmpl ) {
+			if (tmpl) {
+				// Compile template and associate with name
+				if ( typeof tmpl === "string" ) {
+					// This is an HTML string being passed directly in.
+					tmpl = buildTmplFn( tmpl )
+				} else if ( tmpl instanceof jQuery ) {
+					tmpl = tmpl[0] || {};
+				}
+				if ( tmpl.nodeType ) {
+					// If this is a template block, use cached copy, or generate tmpl function and cache.
+					tmpl = jQuery.data( tmpl, "tmpl" ) || jQuery.data( tmpl, "tmpl", buildTmplFn( tmpl.innerHTML ));
+				}
+				return typeof name === "string" ? (jQuery.template[name] = tmpl) : tmpl;
+			}
+			// Return named compiled template
+			return name ? (typeof name !== "string" ? jQuery.template( null, name ): 
+				(jQuery.template[name] || 
+					// If not in map, treat as a selector. (If integrated with core, use quickExpr.exec) 
+					jQuery.template( null, htmlExpr.test( name ) ? name : jQuery( name )))) : null; 
+		},
+
+		encode: function( text ) {
+			// Do HTML encoding replacing < > & and ' and " by corresponding entities.
+			return ("" + text).split("<").join("&lt;").split(">").join("&gt;").split('"').join("&#34;").split("'").join("&#39;");
+		}
+	});
+
+	jQuery.extend( jQuery.tmpl, {
+		tag: {
+			"tmpl": {
+				_default: { $2: "null" },
+				open: "if($notnull_1){_=_.concat($item.nest($1,$2));}"
+				// tmpl target parameter can be of type function, so use $1, not $1a (so not auto detection of functions)
+				// This means that {{tmpl foo}} treats foo as a template (which IS a function). 
+				// Explicit parens can be used if foo is a function that returns a template: {{tmpl foo()}}.
+			},
+			"wrap": {
+				_default: { $2: "null" },
+				open: "$item.calls(_,$1,$2);_=[];",
+				close: "call=$item.calls();_=call._.concat($item.wrap(call,_));"
+			},
+			"each": {
+				_default: { $2: "$index, $value" },
+				open: "if($notnull_1){$.each($1a,function($2){with(this){",
+				close: "}});}"
+			},
+			"if": {
+				open: "if(($notnull_1) && $1a){",
+				close: "}"
+			},
+			"else": {
+				_default: { $1: "true" },
+				open: "}else if(($notnull_1) && $1a){"
+			},
+			"html": {
+				// Unecoded expression evaluation. 
+				open: "if($notnull_1){_.push($1a);}"
+			},
+			"=": {
+				// Encoded expression evaluation. Abbreviated form is ${}.
+				_default: { $1: "$data" },
+				open: "if($notnull_1){_.push($.encode($1a));}"
+			},
+			"!": {
+				// Comment tag. Skipped by parser
+				open: ""
+			}
+		},
+
+		// This stub can be overridden, e.g. in jquery.tmplPlus for providing rendered events
+		complete: function( items ) {
+			newTmplItems = {};
+		},
+
+		// Call this from code which overrides domManip, or equivalent
+		// Manage cloning/storing template items etc.
+		afterManip: function afterManip( elem, fragClone, callback ) {
+			// Provides cloned fragment ready for fixup prior to and after insertion into DOM
+			var content = fragClone.nodeType === 11 ?
+				jQuery.makeArray(fragClone.childNodes) :
+				fragClone.nodeType === 1 ? [fragClone] : [];
+
+			// Return fragment to original caller (e.g. append) for DOM insertion
+			callback.call( elem, fragClone );
+
+			// Fragment has been inserted:- Add inserted nodes to tmplItem data structure. Replace inserted element annotations by jQuery.data.
+			storeTmplItems( content );
+			cloneIndex++;
+		}
+	});
+
+	//========================== Private helper functions, used by code above ==========================
+
+	function build( tmplItem, nested, content ) {
+		// Convert hierarchical content into flat string array 
+		// and finally return array of fragments ready for DOM insertion
+		var frag, ret = content ? jQuery.map( content, function( item ) {
+			return (typeof item === "string") ? 
+				// Insert template item annotations, to be converted to jQuery.data( "tmplItem" ) when elems are inserted into DOM.
+				(tmplItem.key ? item.replace( /(<\w+)(?=[\s>])(?![^>]*_tmplitem)([^>]*)/g, "$1 " + tmplItmAtt + "=\"" + tmplItem.key + "\" $2" ) : item) :
+				// This is a child template item. Build nested template.
+				build( item, tmplItem, item._ctnt );
+		}) : 
+		// If content is not defined, insert tmplItem directly. Not a template item. May be a string, or a string array, e.g. from {{html $item.html()}}. 
+		tmplItem;
+		if ( nested ) {
+			return ret;
+		}
+
+		// top-level template
+		ret = ret.join("");
+
+		// Support templates which have initial or final text nodes, or consist only of text
+		// Also support HTML entities within the HTML markup.
+		ret.replace( /^\s*([^<\s][^<]*)?(<[\w\W]+>)([^>]*[^>\s])?\s*$/, function( all, before, middle, after) {
+			frag = jQuery( middle ).get();
+
+			storeTmplItems( frag );
+			if ( before ) {
+				frag = unencode( before ).concat(frag);
+			}
+			if ( after ) {
+				frag = frag.concat(unencode( after ));
+			}
+		});
+		return frag ? frag : unencode( ret );
+	}
+
+	function unencode( text ) {
+		// Use createElement, since createTextNode will not render HTML entities correctly
+		var el = document.createElement( "div" );
+		el.innerHTML = text;
+		return jQuery.makeArray(el.childNodes);
+	}
+
+	// Generate a reusable function that will serve to render a template against data
+	function buildTmplFn( markup ) {
+		return new Function("jQuery","$item",
+			"var $=jQuery,call,_=[],$data=$item.data;" +
+
+			// Introduce the data as local variables using with(){}
+			"with($data){_.push('" +
+
+			// Convert the template into pure JavaScript
+			jQuery.trim(markup)
+				.replace( /([\\'])/g, "\\$1" )
+				.replace( /[\r\t\n]/g, " " )
+				.replace( /\$\{([^\}]*)\}/g, "{{= $1}}" )
+				.replace( /\{\{(\/?)(\w+|.)(?:\(((?:[^\}]|\}(?!\}))*?)?\))?(?:\s+(.*?)?)?(\(((?:[^\}]|\}(?!\}))*?)\))?\s*\}\}/g,
+				function( all, slash, type, fnargs, target, parens, args ) {
+					var tag = jQuery.tmpl.tag[ type ], def, expr, exprAutoFnDetect;
+					if ( !tag ) {
+						throw "Template command not found: " + type;
+					}
+					def = tag._default || [];
+					if ( parens && !/\w$/.test(target)) {
+						target += parens;
+						parens = "";
+					}
+					if ( target ) {
+						target = unescape( target ); 
+						args = args ? ("," + unescape( args ) + ")") : (parens ? ")" : "");
+						// Support for target being things like a.toLowerCase();
+						// In that case don't call with template item as 'this' pointer. Just evaluate...
+						expr = parens ? (target.indexOf(".") > -1 ? target + parens : ("(" + target + ").call($item" + args)) : target;
+						exprAutoFnDetect = parens ? expr : "(typeof(" + target + ")==='function'?(" + target + ").call($item):(" + target + "))";
+					} else {
+						exprAutoFnDetect = expr = def.$1 || "null";
+					}
+					fnargs = unescape( fnargs );
+					return "');" + 
+						tag[ slash ? "close" : "open" ]
+							.split( "$notnull_1" ).join( target ? "typeof(" + target + ")!=='undefined' && (" + target + ")!=null" : "true" )
+							.split( "$1a" ).join( exprAutoFnDetect )
+							.split( "$1" ).join( expr )
+							.split( "$2" ).join( fnargs ?
+								fnargs.replace( /\s*([^\(]+)\s*(\((.*?)\))?/g, function( all, name, parens, params ) {
+									params = params ? ("," + params + ")") : (parens ? ")" : "");
+									return params ? ("(" + name + ").call($item" + params) : all;
+								})
+								: (def.$2||"")
+							) +
+						"_.push('";
+				}) +
+			"');}return _;"
+		);
+	}
+	function updateWrapped( options, wrapped ) {
+		// Build the wrapped content. 
+		options._wrap = build( options, true, 
+			// Suport imperative scenario in which options.wrapped can be set to a selector or an HTML string.
+			jQuery.isArray( wrapped ) ? wrapped : [htmlExpr.test( wrapped ) ? wrapped : jQuery( wrapped ).html()]
+		).join("");
+	}
+
+	function unescape( args ) {
+		return args ? args.replace( /\\'/g, "'").replace(/\\\\/g, "\\" ) : null;
+	}
+	function outerHtml( elem ) {
+		var div = document.createElement("div");
+		div.appendChild( elem.cloneNode(true) );
+		return div.innerHTML;
+	}
+
+	// Store template items in jQuery.data(), ensuring a unique tmplItem data data structure for each rendered template instance.
+	function storeTmplItems( content ) {
+		var keySuffix = "_" + cloneIndex, elem, elems, newClonedItems = {}, i, l, m;
+		for ( i = 0, l = content.length; i < l; i++ ) {
+			if ( (elem = content[i]).nodeType !== 1 ) {
+				continue;
+			}
+			elems = elem.getElementsByTagName("*");
+			for ( m = elems.length - 1; m >= 0; m-- ) {
+				processItemKey( elems[m] );
+			}
+			processItemKey( elem );
+		}
+		function processItemKey( el ) {
+			var pntKey, pntNode = el, pntItem, tmplItem, key;
+			// Ensure that each rendered template inserted into the DOM has its own template item,
+			if ( (key = el.getAttribute( tmplItmAtt ))) {
+				while ( pntNode.parentNode && (pntNode = pntNode.parentNode).nodeType === 1 && !(pntKey = pntNode.getAttribute( tmplItmAtt ))) { }
+				if ( pntKey !== key ) {
+					// The next ancestor with a _tmplitem expando is on a different key than this one.
+					// So this is a top-level element within this template item
+					// Set pntNode to the key of the parentNode, or to 0 if pntNode.parentNode is null, or pntNode is a fragment.
+					pntNode = pntNode.parentNode ? (pntNode.nodeType === 11 ? 0 : (pntNode.getAttribute( tmplItmAtt ) || 0)) : 0;
+					if ( !(tmplItem = newTmplItems[key]) ) {
+						// The item is for wrapped content, and was copied from the temporary parent wrappedItem.
+						tmplItem = wrappedItems[key];
+						tmplItem = newTmplItem( tmplItem, newTmplItems[pntNode]||wrappedItems[pntNode], null, true );
+						tmplItem.key = ++itemKey;
+						newTmplItems[itemKey] = tmplItem;
+					}
+					if ( cloneIndex ) {
+						cloneTmplItem( key );
+					}
+				}
+				el.removeAttribute( tmplItmAtt );
+			} else if ( cloneIndex && (tmplItem = jQuery.data( el, "tmplItem" )) ) {
+				// This was a rendered element, cloned during append or appendTo etc.
+				// TmplItem stored in jQuery data has already been cloned in cloneCopyEvent. We must replace it with a fresh cloned tmplItem.
+				cloneTmplItem( tmplItem.key );
+				newTmplItems[tmplItem.key] = tmplItem;
+				pntNode = jQuery.data( el.parentNode, "tmplItem" );
+				pntNode = pntNode ? pntNode.key : 0;
+			}
+			if ( tmplItem ) {
+				pntItem = tmplItem;
+				// Find the template item of the parent element. 
+				// (Using !=, not !==, since pntItem.key is number, and pntNode may be a string)
+				while ( pntItem && pntItem.key != pntNode ) { 
+					// Add this element as a top-level node for this rendered template item, as well as for any
+					// ancestor items between this item and the item of its parent element
+					pntItem.nodes.push( el );
+					pntItem = pntItem.parent;
+				}
+				// Delete content built during rendering - reduce API surface area and memory use, and avoid exposing of stale data after rendering...
+				delete tmplItem._ctnt;
+				delete tmplItem._wrap;
+				// Store template item as jQuery data on the element
+				jQuery.data( el, "tmplItem", tmplItem );
+			}
+			function cloneTmplItem( key ) {
+				key = key + keySuffix;
+				tmplItem = newClonedItems[key] = 
+					(newClonedItems[key] || newTmplItem( tmplItem, newTmplItems[tmplItem.parent.key + keySuffix] || tmplItem.parent, null, true ));
+			}
+		}
+	}
+
+	//---- Helper functions for template item ----
+
+	function tiCalls( content, tmpl, data, options ) {
+		if ( !content ) {
+			return stack.pop();
+		}
+		stack.push({ _: content, tmpl: tmpl, item:this, data: data, options: options });
+	}
+
+	function tiNest( tmpl, data, options ) {
+		// nested template, using {{tmpl}} tag
+		return jQuery.tmpl( jQuery.template( tmpl ), data, options, this );
+	}
+
+	function tiWrap( call, wrapped ) {
+		// nested template, using {{wrap}} tag
+		var options = call.options || {};
+		options.wrapped = wrapped;
+		// Apply the template, which may incorporate wrapped content, 
+		return jQuery.tmpl( jQuery.template( call.tmpl ), call.data, options, call.item );
+	}
+
+	function tiHtml( filter, textOnly ) {
+		var wrapped = this._wrap;
+		return jQuery.map(
+			jQuery( jQuery.isArray( wrapped ) ? wrapped.join("") : wrapped ).filter( filter || "*" ),
+			function(e) {
+				return textOnly ?
+					e.innerText || e.textContent :
+					e.outerHTML || outerHtml(e);
+			});
+	}
+
+	function tiUpdate() {
+		var coll = this.nodes;
+		jQuery.tmpl( null, null, null, this).insertBefore( coll[0] );
+		jQuery( coll ).remove();
+	}
+})( jQuery );
diff --git a/samples/Todo/TodoWeb/TodoWeb.csproj b/samples/Todo/TodoWeb/TodoWeb.csproj
new file mode 100644
index 000000000..70d996aad
--- /dev/null
+++ b/samples/Todo/TodoWeb/TodoWeb.csproj
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>
+    </ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6B543006-1D4E-42A9-8679-4F43CA91DD4F}</ProjectGuid>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>TodoWeb</RootNamespace>
+    <AssemblyName>TodoWeb</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <UseIISExpress>true</UseIISExpress>
+    <IISExpressSSLPort />
+    <IISExpressAnonymousAuthentication />
+    <IISExpressWindowsAuthentication />
+    <IISExpressUseClassicPipelineMode />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Scripts\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Assets\Background.png" />
+    <Content Include="Assets\Todo.css" />
+    <Content Include="Default.htm" />
+    <Content Include="favicon.ico" />
+  </ItemGroup>
+  <PropertyGroup>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
+    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
+  <ProjectExtensions>
+    <VisualStudio>
+      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
+        <WebProjectProperties>
+          <UseIIS>True</UseIIS>
+          <AutoAssignPort>True</AutoAssignPort>
+          <DevelopmentServerPort>0</DevelopmentServerPort>
+          <DevelopmentServerVPath>/</DevelopmentServerVPath>
+          <IISUrl>http://localhost:53850/</IISUrl>
+          <NTLMAuthentication>False</NTLMAuthentication>
+          <UseCustomServer>False</UseCustomServer>
+          <CustomServerUrl>
+          </CustomServerUrl>
+          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
+        </WebProjectProperties>
+      </FlavorProperties>
+    </VisualStudio>
+  </ProjectExtensions>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/samples/Todo/TodoWeb/favicon.ico b/samples/Todo/TodoWeb/favicon.ico
new file mode 100644
index 000000000..96d3eb672
Binary files /dev/null and b/samples/Todo/TodoWeb/favicon.ico differ
diff --git a/samples/Todo/packages/nuget.exe b/samples/Todo/packages/nuget.exe
new file mode 100644
index 000000000..e313ff958
Binary files /dev/null and b/samples/Todo/packages/nuget.exe differ
diff --git a/samples/Todo/packages/nuget.targets b/samples/Todo/packages/nuget.targets
new file mode 100644
index 000000000..51fc72bd2
--- /dev/null
+++ b/samples/Todo/packages/nuget.targets
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <RestoreNugetPackages Condition="'$(RestoreNugetPackages)' == ''">false</RestoreNugetPackages>
+    <PackagesDir>$([System.IO.Directory]::GetParent($(MSBuildThisFileDirectory)))</PackagesDir>
+    <RestoreCommand>$(MSBuildThisFileDirectory)nuget.exe install "$(MSBuildProjectDirectory)\packages.config" -o "$(PackagesDir)"</RestoreCommand>
+    <BuildDependsOn Condition="$(RestoreNugetPackages) == 'true'">
+      RestorePackages;
+      $(BuildDependsOn);
+    </BuildDependsOn>
+  </PropertyGroup>
+
+  <Target Name="RestorePackages">
+    <Exec Command="$(RestoreCommand)" LogStandardErrorAsError="true" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/samples/Todo/packages/repositories.config b/samples/Todo/packages/repositories.config
new file mode 100644
index 000000000..9f3521892
--- /dev/null
+++ b/samples/Todo/packages/repositories.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<repositories>
+  <repository path="..\Todo\packages.config" />
+</repositories>
\ No newline at end of file
diff --git a/src/Core/App/App.csproj b/src/Core/App/App.csproj
new file mode 100644
index 000000000..86b0342e8
--- /dev/null
+++ b/src/Core/App/App.csproj
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{1772A38C-7204-42DC-B81D-6C74D17A4F66}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ScriptSharp</RootNamespace>
+    <AssemblyName>ssc</AssemblyName>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>false</DelaySign>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="Microsoft.Build.Utilities" />
+    <ProjectReference Include="..\Compiler\Compiler.csproj">
+      <Project>{9f14036f-673f-418e-b817-7e2289d7f3f6}</Project>
+      <Name>Compiler</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\FileInputStreamSource.cs">
+      <Link>FileInputStreamSource.cs</Link>
+    </Compile>
+    <Compile Include="..\FileOutputStreamSource.cs">
+      <Link>FileOutputStreamSource.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
+    </Compile>
+    <Compile Include="Application.cs" />
+    <Compile Include="CommandLine.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Core/App/Application.cs b/src/Core/App/Application.cs
new file mode 100644
index 000000000..b614c6b2d
--- /dev/null
+++ b/src/Core/App/Application.cs
@@ -0,0 +1,242 @@
+// Application.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO;
+
+namespace ScriptSharp {
+
+    internal static class Application {
+
+        private static readonly string AboutTextFormat = @"
+Script# Compiler v{0} (C# to JavaScript compiler)
+Written by Nikhil Kothari.
+More information at http://projects.nikhilk.net/ScriptSharp.
+";
+
+        private static readonly string UsageText = @"
+Usage:
+  ssc [/nologo] [/?]
+      [/debug]
+      [/tests]
+      [/minimize]
+      [/D:<variable>]
+      [/template:<template text file>]
+      [/doc:<file>]
+      [/res:<resource file>]
+      /ref:<assembly path>
+      /out:<script file>
+      <C# source files>
+
+/nologo     Hides the about information.
+/?          Displays usage information.
+/debug      Turns on debug mode. Automatically defines the 'DEBUG'
+            variable.
+/tests      Includes test classes defined in the sources into the
+            generated script.
+/minimize   Minimizes the whitespace in the generated script file.
+            This is only used in non-debug builds.
+/D          Defines one or more variables that are used to conditionally
+            compile code.
+/template   This can be used to provide a template file for the generated
+            script. The template can be used to include static content
+            such as copyright information. It can be used to #include
+            other script files. It can be used for conditional compilation
+            via #if etc. Finally #include[as-is] ""%code%"" can be used
+            to specify where the generated code appears in the template.
+/ref        One or more references to C# assemblies to be used
+            to import metadata corresponding to dependency script files.
+            (Note you must include a reference to mscorlib.dll)
+/doc        XML Documentation to embed into the resulting script file.
+/res        The set of one or more resources to compile in. These should be
+            .resx files. You should pass in both the language-neutral
+            resources and the locale specific resources for the locale
+            associated with the output script.
+/out        The resulting script file. Typically this is a .js file.
+";
+
+        private static CompilerOptions CreateCompilerOptions(CommandLine commandLine) {
+            List<string> references = new List<string>();
+            List<IStreamSource> sources = new List<IStreamSource>();
+            List<IStreamSource> resources = new List<IStreamSource>();
+            List<string> defines = new List<string>();
+            List<string> scripts = new List<string>();
+            bool debug = false;
+            bool includeTests = false;
+            bool minimize = true;
+            IStreamSource scriptFile = null;
+            IStreamSource templateFile = null;
+            IStreamSource docCommentFile = null;
+
+            foreach (string fileName in commandLine.Arguments) {
+                // TODO: This is a hack... something in the .net 4 build system causes
+                //       generation of an AssemblyAttributes.cs file with fully-qualified
+                //       type names, that we can't handle (this comes from multitargeting),
+                //       and there doesn't seem like a way to turn it off.
+                if (fileName.EndsWith(".AssemblyAttributes.cs", StringComparison.OrdinalIgnoreCase)) {
+                    continue;
+                }
+                sources.Add(new FileInputStreamSource(fileName));
+            }
+
+            object referencesObject = commandLine.Options["ref"];
+            if (referencesObject is string) {
+                references.Add((string)referencesObject);
+            }
+            else if (referencesObject is ArrayList) {
+                ArrayList referenceList = (ArrayList)referencesObject;
+
+                foreach (string reference in referenceList) {
+                    // TODO: This is a hack... something in the .net 4 build system causes
+                    //       System.Core.dll to get included [sometimes].
+                    //       That shouldn't happen... so filter it out here.
+                    if (reference.EndsWith("System.Core.dll", StringComparison.OrdinalIgnoreCase)) {
+                        continue;
+                    }
+                    references.Add(reference);
+                }
+            }
+
+            object resourcesObject = commandLine.Options["res"];
+            if (resourcesObject is string) {
+                resources.Add(new FileInputStreamSource((string)resourcesObject));
+            }
+            else if (resourcesObject is ArrayList) {
+                ArrayList resourceList = (ArrayList)resourcesObject;
+
+                foreach (string resource in resourceList) {
+                    resources.Add(new FileInputStreamSource(resource));
+                }
+            }
+
+            object definesObject = commandLine.Options["D"];
+            if (definesObject is string) {
+                defines.Add((string)definesObject);
+            }
+            else if (definesObject is ArrayList) {
+                ArrayList definesList = (ArrayList)definesObject;
+
+                foreach (string definedVariable in definesList) {
+                    defines.Add(definedVariable);
+                }
+            }
+
+            string scriptFilePath = null;
+            if (commandLine.Options.Contains("out")) {
+                scriptFilePath = (string)commandLine.Options["out"];
+                if (scriptFilePath.IndexOfAny(Path.GetInvalidPathChars()) < 0) {
+                    scriptFile = new FileOutputStreamSource(scriptFilePath);
+                }
+            }
+
+            if (commandLine.Options.Contains("template")) {
+                templateFile = new FileInputStreamSource((string)commandLine.Options["template"], "Template");
+            }
+
+            if (commandLine.Options.Contains("doc")) {
+                docCommentFile = new FileInputStreamSource((string)commandLine.Options["doc"], "DocComment");
+            }
+
+            debug = commandLine.Options.Contains("debug");
+            if (debug && !defines.Contains("DEBUG")) {
+                defines.Add("DEBUG");
+            }
+
+            includeTests = commandLine.Options.Contains("tests");
+            minimize = commandLine.Options.Contains("minimize");
+
+            CompilerOptions compilerOptions = new CompilerOptions();
+            compilerOptions.DebugFlavor = debug;
+            compilerOptions.IncludeTests = includeTests;
+            compilerOptions.Defines = defines;
+            compilerOptions.Minimize = minimize;
+            compilerOptions.References = references;
+            compilerOptions.Sources = sources;
+            compilerOptions.Resources = resources;
+            compilerOptions.ScriptFile = scriptFile;
+            compilerOptions.TemplateFile = templateFile;
+            compilerOptions.DocCommentFile = docCommentFile;
+
+            compilerOptions.InternalTestMode = commandLine.Options.Contains("test");
+            if (compilerOptions.InternalTestMode) {
+                compilerOptions.InternalTestType = (string)commandLine.Options["test"];
+            }
+
+            return compilerOptions;
+        }
+
+        public static bool Execute(string[] args) {
+            CommandLine commandLine = new CommandLine(args);
+            if (commandLine.Options.Contains("attach")) {
+                Debug.Fail("Attach");
+            }
+
+            if (commandLine.ShowHelp) {
+                ShowUsage(/* message */ String.Empty);
+                return true;
+            }
+
+            CompilerOptions compilerOptions = CreateCompilerOptions(commandLine);
+
+#if DEBUG
+            if (compilerOptions.InternalTestMode) {
+                // HACK: Our tests are currently in the Tests subnamespace, which is now
+                //       used as a pattern for writing unit tests. This hack allows postponing
+                //       modifying all tests and baselines.
+                compilerOptions.TestsSubnamespace = ".UnitTests";
+            }
+#endif // DEBUG
+
+            string errorMessage;
+            if (compilerOptions.Validate(out errorMessage) == false) {
+                ShowUsage(errorMessage);
+                return false;
+            }
+
+            if (commandLine.HideAbout == false) {
+                ShowAbout();
+            }
+
+            ScriptCompiler compiler = new ScriptCompiler();
+            bool success = compiler.Compile(compilerOptions);
+#if DEBUG
+            return true;
+#else
+            return success;
+#endif // DEBUG
+        }
+
+        private static string GetVersion() {
+            string exePath = typeof(Application).Assembly.GetModules()[0].FullyQualifiedName;
+            FileVersionInfo versionInfo = FileVersionInfo.GetVersionInfo(exePath);
+
+            return versionInfo.FileVersion;
+        }
+
+        [STAThread]
+        public static int Main(string[] args) {
+            bool success = Application.Execute(args);
+            return success ? 0 : 1;
+        }
+
+        private static void ShowAbout() {
+            string version = GetVersion();
+            string aboutText = String.Format(AboutTextFormat, version);
+
+            Console.WriteLine(aboutText);
+        }
+
+        private static void ShowUsage(string message) {
+            if (String.IsNullOrEmpty(message) == false) {
+                Console.WriteLine(message);
+            }
+            Console.WriteLine(UsageText);
+        }
+    }
+}
diff --git a/src/Core/App/CommandLine.cs b/src/Core/App/CommandLine.cs
new file mode 100644
index 000000000..64595e5b2
--- /dev/null
+++ b/src/Core/App/CommandLine.cs
@@ -0,0 +1,134 @@
+// CommandLine.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+
+namespace ScriptSharp {
+
+    internal sealed class CommandLine {
+
+        private string[] _arguments;
+        private IDictionary _options;
+        private bool _showHelp;
+        private bool _hideAbout;
+
+        public CommandLine(string[] args) {
+            if (args == null) {
+                throw new ArgumentNullException("args");
+            }
+            args = ExpandResponseFileArguments(args);
+
+            ArrayList argList = new ArrayList();
+
+            for (int i = 0; i < args.Length; i++) {
+                char c = args[i][0];
+                if ((c != '/') && (c != '-')) {
+                    argList.Add(args[i]);
+                }
+                else {
+                    int index = args[i].IndexOf(':');
+                    if (index == -1) {
+                        string option = args[i].Substring(1);
+                        if ((String.Compare(option, "help", StringComparison.OrdinalIgnoreCase) == 0) ||
+                            (String.Compare(option, "?", StringComparison.Ordinal) == 0)) {
+                            _showHelp = true;
+                        }
+                        else if (String.Compare(option, "nologo", StringComparison.OrdinalIgnoreCase) == 0) {
+                            _hideAbout = true;
+                        }
+                        else {
+                            Options[option] = String.Empty;
+                        }
+                    }
+                    else {
+                        string optionName = args[i].Substring(1, index - 1);
+                        string optionValue = args[i].Substring(index + 1);
+
+                        if (Options.Contains(optionName)) {
+                            object existingValue = Options[optionName];
+                            if (existingValue is string) {
+                                ArrayList valueList = new ArrayList();
+                                valueList.Add(existingValue);
+                                valueList.Add(optionValue);
+
+                                Options[optionName] = valueList;
+                            }
+                            else {
+                                Debug.Assert(existingValue is ArrayList);
+
+                                ArrayList valueList = (ArrayList)existingValue;
+                                valueList.Add(optionValue);
+                            }
+                        }
+                        else {
+                            Options[optionName] = optionValue;
+                        }
+                    }
+                }
+            }
+            _arguments = (string[])argList.ToArray(typeof(string));
+        }
+
+        public string[] Arguments {
+            get {
+                return _arguments;
+            }
+        }
+
+        public bool HideAbout {
+            get {
+                return _hideAbout;
+            }
+        }
+
+        public IDictionary Options {
+            get {
+                if (_options == null) {
+                    _options = new HybridDictionary(true);
+                }
+                return _options;
+            }
+        }
+
+        public bool ShowHelp {
+            get {
+                return _showHelp;
+            }
+        }
+
+        private string[] ExpandResponseFileArguments(string[] args) {
+            List<string> expandedArgs = new List<string>();
+
+            for (int i = 0; i < args.Length; i++) {
+                if ((args[i].Length > 1) && args[i].StartsWith("@")) {
+                    string responseFile = args[i].Substring(1);
+
+                    if (File.Exists(responseFile)) {
+                        using (TextReader reader = File.OpenText(responseFile)) {
+                            string line;
+                            while ((line = reader.ReadLine()) != null) {
+                                line = line.Trim();
+                                if (line.Length > 0) {
+                                    expandedArgs.Add(line);
+                                }
+                            }
+                        }
+                    }
+                }
+                else {
+                    expandedArgs.Add(args[i]);
+                }
+            }
+
+            return expandedArgs.ToArray();
+        }
+    }
+}
diff --git a/src/Core/App/Properties/AssemblyInfo.cs b/src/Core/App/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..9026df293
--- /dev/null
+++ b/src/Core/App/Properties/AssemblyInfo.cs
@@ -0,0 +1,11 @@
+// AssemblyInfo.cs
+// Script#/Tools/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("ssc")]
+[assembly: AssemblyDescription("Script# Compiler")]
diff --git a/src/Core/Build/Build.csproj b/src/Core/Build/Build.csproj
new file mode 100644
index 000000000..03d7854a9
--- /dev/null
+++ b/src/Core/Build/Build.csproj
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ScriptSharp</RootNamespace>
+    <AssemblyName>ScriptSharp.Build</AssemblyName>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>false</DelaySign>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.XML" />
+    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="Microsoft.Build.Utilities" />
+    <ProjectReference Include="..\Compiler\Compiler.csproj">
+      <Project>{9f14036f-673f-418e-b817-7e2289d7f3f6}</Project>
+      <Name>Compiler</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
+    </Compile>
+    <Compile Include="..\FileInputStreamSource.cs">
+      <Link>FileInputStreamSource.cs</Link>
+    </Compile>
+    <Compile Include="..\FileOutputStreamSource.cs">
+      <Link>FileOutputStreamSource.cs</Link>
+    </Compile>
+    <Compile Include="..\ResourceFile.cs">
+      <Link>ResourceFile.cs</Link>
+    </Compile>
+    <Compile Include="..\ResXItem.cs">
+      <Link>ResXItem.cs</Link>
+    </Compile>
+    <Compile Include="..\ResXParser.cs">
+      <Link>ResXParser.cs</Link>
+    </Compile>
+    <Compile Include="Generators\ResXCodeBuilder.cs" />
+    <Compile Include="Tasks\ResXCodeGeneratorTask.cs" />
+    <Compile Include="Tasks\ScriptCompilerExecTask.cs" />
+    <Compile Include="Tasks\ScriptCompilerTask.cs" />
+    <Compile Include="Tasks\ScriptPreprocessorTask.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="ScriptSharp.targets">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Core/Build/Generators/ResXCodeBuilder.cs b/src/Core/Build/Generators/ResXCodeBuilder.cs
new file mode 100644
index 000000000..8f4f5ccfd
--- /dev/null
+++ b/src/Core/Build/Generators/ResXCodeBuilder.cs
@@ -0,0 +1,90 @@
+// ResXCodeBuilder.cs
+// Script#/Core/Build
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace ScriptSharp.Generators {
+
+    public sealed class ResXCodeBuilder {
+
+        private static readonly string ResourcesHeader =
+@"//------------------------------------------------------------------------------
+// <auto-generated>
+// Resources.g.cs
+// Do not edit directly. This file has been auto-generated from .resx resources.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.CodeDom.Compiler;
+using System.Runtime.CompilerServices;
+
+namespace {0} {{
+";
+
+        private static readonly string ResourcesFooter =
+@"}";
+
+        private StringBuilder _codeBuilder;
+
+        public void Start(string namespaceName) {
+            _codeBuilder = new StringBuilder();
+            _codeBuilder.AppendFormat(ResourcesHeader, namespaceName);
+        }
+
+        public string End() {
+            _codeBuilder.AppendLine(ResourcesFooter);
+            return _codeBuilder.ToString();
+        }
+
+        public void GenerateCode(string resourceFileName, string resourceFileContent, string resourceGenerator) {
+            if (IsLocalizedResourceFile(resourceFileName)) {
+                return;
+            }
+
+            List<ResXItem> resourceItems = ResXParser.ParseResxMarkup(resourceFileContent);
+            if (resourceItems.Count == 0) {
+                return;
+            }
+
+            string className = Path.GetFileNameWithoutExtension(resourceFileName);
+            string accessModifier = "internal";
+            if (String.Compare(resourceGenerator, "PublicResxScriptGenerator", StringComparison.OrdinalIgnoreCase) == 0) {
+                accessModifier = "public";
+            }
+
+            _codeBuilder.AppendLine();
+            _codeBuilder.AppendFormat("    /// <summary>{0} resources class</summary>", className);
+            _codeBuilder.AppendLine();
+            _codeBuilder.AppendLine("    [Resources]");
+            _codeBuilder.AppendFormat("    [GeneratedCodeAttribute(\"{0}\", \"{1}\")]",
+                                     this.GetType().Name,
+                                     typeof(ResXCodeBuilder).Assembly.GetName().Version.ToString());
+            _codeBuilder.AppendLine();
+            _codeBuilder.AppendFormat("    {0} static class {1} {{", accessModifier, className);
+            _codeBuilder.AppendLine();
+
+            foreach (ResXItem resourceItem in resourceItems) {
+                _codeBuilder.AppendLine();
+                if (resourceItem.Comment.Length != 0) {
+                    _codeBuilder.AppendFormat("        /// <summary>{0}</summary>", resourceItem.Comment);
+                    _codeBuilder.AppendLine();
+                }
+                _codeBuilder.AppendFormat("        public static readonly string {0} = null;", resourceItem.Name);
+                _codeBuilder.AppendLine();
+            }
+
+            _codeBuilder.AppendLine("    }");
+        }
+
+        private static bool IsLocalizedResourceFile(string resourceFileName) {
+            string locale = ResourceFile.GetLocale(resourceFileName);
+            return (String.IsNullOrEmpty(locale) == false);
+        }
+    }
+}
diff --git a/src/Core/Build/Properties/AssemblyInfo.cs b/src/Core/Build/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..b65e1f721
--- /dev/null
+++ b/src/Core/Build/Properties/AssemblyInfo.cs
@@ -0,0 +1,11 @@
+// AssemblyInfo.cs
+// Script#/Tools/Build
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("ScriptSharp.Build")]
+[assembly: AssemblyDescription("Script# MSBuild Integration")]
diff --git a/src/Core/Build/ScriptSharp.targets b/src/Core/Build/ScriptSharp.targets
new file mode 100644
index 000000000..bc79c2d90
--- /dev/null
+++ b/src/Core/Build/ScriptSharp.targets
@@ -0,0 +1,67 @@
+<!--
+*******************************************************************************
+ScriptSharp.targets
+Defines the steps in the standard build process specific for Script# projects.
+
+Copyright (C) 2012. Script# Project. All rights reserved.
+*******************************************************************************
+-->
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <UsingTask TaskName="ScriptCompilerTask" AssemblyFile="ScriptSharp.Build.dll" />
+  <UsingTask TaskName="ResXCodeGeneratorTask" AssemblyFile="ScriptSharp.Build.dll" />
+
+  <PropertyGroup>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>false</Optimize>
+    <AutoUnifyAssemblyReferences>false</AutoUnifyAssemblyReferences>
+    <BuildingProject>true</BuildingProject>
+    <UseHostCompilerIfAvailable>false</UseHostCompilerIfAvailable>
+    <LangVersion Condition="'$(GenerateScript)' == 'True'">ISO-2</LangVersion>
+    <NoStdLib>True</NoStdLib>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="mscorlib, Version=0.7.0.0, Culture=neutral, PublicKeyToken=8fc0e3af5abcb6c4, processorArchitecture=MSIL">
+      <HintPath>$(MSBuildThisFileDirectory)mscorlib.dll</HintPath>
+    </Reference>
+    <GeneratedResourceCode Include="$(IntermediateOutputPath)Resources.g.cs" />
+  </ItemGroup>
+
+  <Target Name="BuildScript">
+    <ScriptCompilerTask
+      Sources="@(Compile)"
+      Resources="@(EmbeddedResource)"
+      References="@(ReferencePath);@(ReferenceDependencyPaths)"
+      Defines="$(DefineConstants)"
+      OutputPath="$(OutputPath)"
+      DeploymentPath="$(DeploymentPath)"
+      LocaleSubFolders="$(LocaleSubFolders)"
+      ConfigSubFolders="$(ConfigSubFolders)"
+      Template="$(ScriptTemplate)"
+      CSharpAssembly="@(IntermediateAssembly)"
+      DocumentationFile="$(DocumentationFile)"
+      SuppressDocumentation="$(SuppressDocumentation)"
+      ProjectPath="$(MSBuildProjectFullPath)">
+      <Output TaskParameter="Scripts" ItemName="Scripts" />
+    </ScriptCompilerTask>
+  </Target>
+
+  <Target Name="GenerateResourcesCode" Inputs="@(EmbeddedResource)" Outputs="@(GeneratedResourceCode)">
+    <ResXCodeGeneratorTask
+      Resources="@(EmbeddedResource)"
+      GeneratedCode="@(GeneratedResourceCode)"
+      Namespace="$(RootNamespace)" />
+    <ItemGroup>
+      <Compile Include="@(GeneratedResourceCode)" />
+    </ItemGroup>
+  </Target>
+
+  <PropertyGroup>
+    <BuildDependsOn Condition="'$(GenerateScript)' == 'True'">$(BuildDependsOn);BuildScript</BuildDependsOn>
+    <CompileDependsOn Condition="'$(GenerateResources)' == 'True'">GenerateResourcesCode;$(CompileDependsOn)</CompileDependsOn>
+  </PropertyGroup>
+</Project>
diff --git a/src/Core/Build/Tasks/ResXCodeGeneratorTask.cs b/src/Core/Build/Tasks/ResXCodeGeneratorTask.cs
new file mode 100644
index 000000000..86ef32eaf
--- /dev/null
+++ b/src/Core/Build/Tasks/ResXCodeGeneratorTask.cs
@@ -0,0 +1,84 @@
+// ResXCodeGeneratorTask.cs
+// Script#/Core/Build
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using ScriptSharp.Generators;
+
+namespace ScriptSharp.Tasks {
+
+    public sealed class ResXCodeGeneratorTask : Task {
+
+        private ITaskItem[] _resources;
+        private ITaskItem _generatedCode;
+
+        private string _namespace;
+
+        [Required]
+        public ITaskItem GeneratedCode {
+            get {
+                return _generatedCode;
+            }
+            set {
+                _generatedCode = value;
+            }
+        }
+
+        [Required]
+        public string Namespace {
+            get {
+                return _namespace;
+            }
+            set {
+                _namespace = value;
+            }
+        }
+
+        [Required]
+        public ITaskItem[] Resources {
+            get {
+                return _resources;
+            }
+            set {
+                _resources = value;
+            }
+        }
+
+        public override bool Execute() {
+            try {
+                if ((_resources != null) && (_resources.Length != 0)) {
+                    ExecuteCore();
+                }
+            }
+            catch (Exception e) {
+                Debug.Fail(e.ToString());
+
+                return false;
+            }
+
+            return true;
+        }
+
+        private void ExecuteCore() {
+            ResXCodeBuilder codeBuilder = new ResXCodeBuilder();
+
+            codeBuilder.Start(_namespace);
+            foreach (ITaskItem resourceItem in _resources) {
+                string resourceFileName = resourceItem.ItemSpec;
+                string resourceGenerator = resourceItem.GetMetadata("Generator");
+                string resourceContent = File.ReadAllText(resourceFileName);
+
+                codeBuilder.GenerateCode(resourceFileName, resourceContent, resourceGenerator);
+            }
+
+            string code = codeBuilder.End();
+
+            File.WriteAllText(_generatedCode.ItemSpec, code);
+        }
+    }
+}
diff --git a/src/Core/Build/Tasks/ScriptCompilerExecTask.cs b/src/Core/Build/Tasks/ScriptCompilerExecTask.cs
new file mode 100644
index 000000000..17f094a05
--- /dev/null
+++ b/src/Core/Build/Tasks/ScriptCompilerExecTask.cs
@@ -0,0 +1,352 @@
+// ScriptCompilerExecTask.cs
+// Script#/Core/Build
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO;
+using Microsoft.Build;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace ScriptSharp.Tasks {
+
+    /// <summary>
+    /// The Script# MSBuild task corresponding exactly to functionality exposed
+    /// by the command-line tool.
+    /// </summary>
+    public sealed class ScriptCompilerExecTask : Task, IErrorHandler {
+
+        private string _projectPath;
+        private ITaskItem[] _references;
+        private ITaskItem[] _sources;
+        private ITaskItem[] _resources;
+        private ITaskItem _template;
+        private ITaskItem _docCommentFile;
+
+        private bool _debug;
+        private bool _minimize;
+        private bool _tests;
+        private string _defines;
+        private string _locale;
+
+        private string _outputPath;
+        private ITaskItem _script;
+
+        private bool _hasErrors;
+
+        public bool DebugFlavor {
+            get {
+                return _debug;
+            }
+            set {
+                _debug = value;
+            }
+        }
+
+        public string Defines {
+            get {
+                if (_defines == null) {
+                    return String.Empty;
+                }
+                return _defines;
+            }
+            set {
+                _defines = value;
+            }
+        }
+
+        public ITaskItem DocumentationFile {
+            get {
+                return _docCommentFile;
+            }
+            set {
+                _docCommentFile = value;
+            }
+        }
+
+        public bool IncludeTests {
+            get {
+                return _tests;
+            }
+            set {
+                _tests = value;
+            }
+        }
+
+        public string Locale {
+            get {
+                if (_locale == null) {
+                    return String.Empty;
+                }
+                return _locale;
+            }
+            set {
+                _locale = value;
+            }
+        }
+
+        public bool Minimize {
+            get {
+                return _minimize;
+            }
+            set {
+                _minimize = value;
+            }
+        }
+
+        [Required]
+        public string OutputPath {
+            get {
+                if (_outputPath == null) {
+                    return String.Empty;
+                }
+                return _outputPath;
+            }
+            set {
+                _outputPath = value;
+            }
+        }
+
+        public string ProjectPath {
+            get {
+                return _projectPath;
+            }
+            set {
+                _projectPath = value;
+            }
+        }
+
+        [Required]
+        public ITaskItem[] References {
+            get {
+                return _references;
+            }
+            set {
+                _references = value;
+            }
+        }
+
+        public ITaskItem[] Resources {
+            get {
+                return _resources;
+            }
+            set {
+                _resources = value;
+            }
+        }
+
+        [Output]
+        public ITaskItem Script {
+            get {
+                return _script;
+            }
+        }
+
+        [Required]
+        public ITaskItem[] Sources {
+            get {
+                return _sources;
+            }
+            set {
+                _sources = value;
+            }
+        }
+
+        public ITaskItem Template {
+            get {
+                return _template;
+            }
+            set {
+                _template = value;
+            }
+        }
+
+        private bool Compile() {
+            CompilerOptions options = new CompilerOptions();
+            options.DebugFlavor = DebugFlavor;
+            if (DebugFlavor) {
+                options.IncludeTests = IncludeTests;
+            }
+            else {
+                options.Minimize = Minimize;
+            }
+            options.Defines = GetDefines();
+            options.References = GetReferences();
+            options.Sources = GetSources(_sources);
+            options.Resources = GetResources(_resources);
+            if (_template != null) {
+                options.TemplateFile = new TaskItemInputStreamSource(_template, "Template");
+            }
+            if (_docCommentFile != null) {
+                options.DocCommentFile = new TaskItemInputStreamSource(_docCommentFile, "DocComment");
+            }
+
+            ITaskItem scriptTaskItem = new TaskItem(OutputPath);
+            options.ScriptFile = new TaskItemOutputStreamSource(scriptTaskItem);
+
+            string errorMessage = String.Empty;
+            if (options.Validate(out errorMessage) == false) {
+                Log.LogError(errorMessage);
+                return false;
+            }
+
+            ScriptCompiler compiler = new ScriptCompiler(this);
+            compiler.Compile(options);
+            if (_hasErrors == false) {
+                _script = scriptTaskItem;
+
+                string projectName = (_projectPath != null) ? Path.GetFileNameWithoutExtension(_projectPath) : String.Empty;
+                string scriptFileName = Path.GetFileName(scriptTaskItem.ItemSpec);
+                string scriptPath = Path.GetFullPath(scriptTaskItem.ItemSpec);
+
+                Log.LogMessage(MessageImportance.High, "{0} -> {1} ({2})", projectName, scriptFileName, scriptPath);
+            }
+            else {
+                return false;
+            }
+
+            return true;
+        }
+
+        public override bool Execute() {
+            bool success = false;
+
+            try {
+                success = Compile();
+            }
+            catch {
+            }
+
+            return success;
+        }
+
+        private ICollection<string> GetDefines() {
+            if (Defines.Length == 0) {
+                return new string[0];
+            }
+
+            return Defines.Split(';');
+        }
+
+        private ICollection<string> GetReferences() {
+            if (_references == null) {
+                return new string[0];
+            }
+
+            List<string> references = new List<string>(_references.Length);
+            foreach (ITaskItem reference in _references) {
+                // TODO: This is a hack... something in the .net 4 build system causes
+                //       System.Core.dll to get included [sometimes].
+                //       That shouldn't happen... so filter it out here.
+                if (reference.ItemSpec.EndsWith("System.Core.dll", StringComparison.OrdinalIgnoreCase)) {
+                    continue;
+                }
+                references.Add(reference.ItemSpec);
+            }
+
+            return references;
+        }
+
+        private ICollection<IStreamSource> GetResources(IEnumerable<ITaskItem> allResources) {
+            if (allResources == null) {
+                return new TaskItemInputStreamSource[0];
+            }
+
+            string locale = Locale;
+            List<IStreamSource> resources = new List<IStreamSource>();
+            foreach (ITaskItem resource in allResources) {
+                string itemLocale = ResourceFile.GetLocale(resource.ItemSpec);
+
+                if (String.IsNullOrEmpty(locale) && String.IsNullOrEmpty(itemLocale)) {
+                    resources.Add(new TaskItemInputStreamSource(resource));
+                }
+                else if ((String.Compare(locale, itemLocale, StringComparison.OrdinalIgnoreCase) == 0) ||
+                         locale.StartsWith(itemLocale, StringComparison.OrdinalIgnoreCase)) {
+                    // Either the item locale matches, or the item locale is a prefix
+                    // of the locale (eg. we want to include "fr" if the locale specified
+                    // is fr-FR)
+                    resources.Add(new TaskItemInputStreamSource(resource));
+                }
+            }
+
+            return resources;
+        }
+
+        private ICollection<IStreamSource> GetSources(IEnumerable<ITaskItem> sourceItems) {
+            if (sourceItems == null) {
+                return new TaskItemInputStreamSource[0];
+            }
+
+            List<IStreamSource> sources = new List<IStreamSource>();
+            foreach (ITaskItem sourceItem in sourceItems) {
+                // TODO: This is a hack... something in the .net 4 build system causes
+                //       generation of an AssemblyAttributes.cs file with fully-qualified
+                //       type names, that we can't handle (this comes from multitargeting),
+                //       and there doesn't seem like a way to turn it off.
+                if (sourceItem.ItemSpec.EndsWith(".AssemblyAttributes.cs", StringComparison.OrdinalIgnoreCase)) {
+                    continue;
+                }
+
+                sources.Add(new TaskItemInputStreamSource(sourceItem));
+            }
+
+            return sources;
+        }
+
+        #region Implementation of IErrorHandler
+        void IErrorHandler.ReportError(string errorMessage, string location) {
+            _hasErrors = true;
+
+            int line = 0;
+            int column = 0;
+
+            if (String.IsNullOrEmpty(location) == false) {
+                if (location.EndsWith(")", StringComparison.Ordinal)) {
+                    int index = location.LastIndexOf("(", StringComparison.Ordinal);
+                    Debug.Assert(index > 0);
+
+                    string position = location.Substring(index + 1, location.Length - index - 2);
+                    string[] positionParts = position.Split(new char[] { ' ', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                    Debug.Assert(positionParts.Length == 2);
+
+                    Int32.TryParse(positionParts[0], out line);
+                    Int32.TryParse(positionParts[1], out column);
+
+                    location = location.Substring(0, index);
+                }
+            }
+
+            Log.LogError(String.Empty, String.Empty, String.Empty, location, line, column, 0, 0, errorMessage);
+        }
+        #endregion
+
+
+        private sealed class TaskItemInputStreamSource : FileInputStreamSource {
+
+            public TaskItemInputStreamSource(ITaskItem taskItem)
+                : base(taskItem.ItemSpec) {
+            }
+
+            public TaskItemInputStreamSource(ITaskItem taskItem, string name)
+                : base(taskItem.ItemSpec, name) {
+            }
+        }
+
+
+        private sealed class TaskItemOutputStreamSource : FileOutputStreamSource {
+
+            public TaskItemOutputStreamSource(ITaskItem taskItem)
+                : base(taskItem.ItemSpec) {
+            }
+
+            public TaskItemOutputStreamSource(ITaskItem taskItem, string name)
+                : base(taskItem.ItemSpec, name) {
+            }
+        }
+    }
+}
diff --git a/src/Core/Build/Tasks/ScriptCompilerTask.cs b/src/Core/Build/Tasks/ScriptCompilerTask.cs
new file mode 100644
index 000000000..b15015889
--- /dev/null
+++ b/src/Core/Build/Tasks/ScriptCompilerTask.cs
@@ -0,0 +1,692 @@
+// ScriptCompilerTask.cs
+// Script#/Core/Build
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO;
+using Microsoft.Build;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace ScriptSharp.Tasks {
+
+    /// <summary>
+    /// The Script# MSBuild task.
+    /// </summary>
+    public sealed class ScriptCompilerTask : Task, IErrorHandler {
+
+        private string _projectPath;
+        private ITaskItem[] _references;
+        private ITaskItem[] _sources;
+        private ITaskItem[] _resources;
+        private ITaskItem _template;
+        private ITaskItem _docCommentFile;
+        private ITaskItem _csharpAssembly;
+
+        private string _defines;
+        private bool _copyReferences;
+        private bool _suppressDocumentation;
+
+        private string _outputPath;
+        private string _deploymentPath;
+        private bool _localeSubFolders;
+        private bool _configSubFolders;
+        private List<ITaskItem> _scripts;
+
+        private bool _hasErrors;
+
+        public ScriptCompilerTask() {
+            _copyReferences = true;
+        }
+
+        public bool CopyReferences {
+            get {
+                return _copyReferences;
+            }
+            set {
+                _copyReferences = value;
+            }
+        }
+
+        [Required]
+        public ITaskItem CSharpAssembly {
+            get {
+                return _csharpAssembly;
+            }
+            set {
+                _csharpAssembly = value;
+            }
+        }
+
+        public string Defines {
+            get {
+                if (_defines == null) {
+                    return String.Empty;
+                }
+                return _defines;
+            }
+            set {
+                _defines = value;
+            }
+        }
+
+        public string DeploymentPath {
+            get {
+                if (_deploymentPath == null) {
+                    return String.Empty;
+                }
+                return _deploymentPath;
+            }
+            set {
+                _deploymentPath = value;
+            }
+        }
+
+        public bool LocaleSubFolders {
+            get {
+                return _localeSubFolders;
+            }
+            set {
+                _localeSubFolders = value;
+            }
+        }
+
+        public bool ConfigSubFolders {
+            get {
+                return _configSubFolders;
+            }
+            set {
+                _configSubFolders = value;
+            }
+        }
+
+        public ITaskItem Template {
+            get {
+                return _template;
+            }
+            set {
+                _template = value;
+            }
+        }
+
+        public ITaskItem DocumentationFile {
+            get {
+                return _docCommentFile;
+            }
+            set {
+                _docCommentFile = value;
+            }
+        }
+
+        [Required]
+        public string OutputPath {
+            get {
+                if (_outputPath == null) {
+                    return String.Empty;
+                }
+                return _outputPath;
+            }
+            set {
+                _outputPath = value;
+            }
+        }
+
+        public string ProjectPath {
+            get {
+                return _projectPath;
+            }
+            set {
+                _projectPath = value;
+            }
+        }
+
+        [Required]
+        public ITaskItem[] References {
+            get {
+                return _references;
+            }
+            set {
+                _references = value;
+            }
+        }
+
+        public ITaskItem[] Resources {
+            get {
+                return _resources;
+            }
+            set {
+                _resources = value;
+            }
+        }
+
+        [Output]
+        public ITaskItem[] Scripts {
+            get {
+                if (_scripts == null) {
+                    return new ITaskItem[0];
+                }
+                return _scripts.ToArray();
+            }
+        }
+
+        [Required]
+        public ITaskItem[] Sources {
+            get {
+                return _sources;
+            }
+            set {
+                _sources = value;
+            }
+        }
+
+        public bool SuppressDocumentation {
+            get {
+                return _suppressDocumentation;
+            }
+            set {
+                _suppressDocumentation = value;
+            }
+        }
+
+        private bool Compile(string name, IEnumerable<ITaskItem> sourceItems, IEnumerable<ITaskItem> resourceItems, string locale) {
+            ITaskItem scriptTaskItem;
+
+            CompilerOptions debugOptions =
+                CreateOptions(name, sourceItems, resourceItems, locale,
+                              /* debug */ true, /* includeTests */ false, /* minimize */ false,
+                              out scriptTaskItem);
+
+            string errorMessage = String.Empty;
+            if (debugOptions.Validate(out errorMessage) == false) {
+                Log.LogError(errorMessage);
+                return false;
+            }
+
+            ScriptCompiler debugCompiler = new ScriptCompiler(this);
+            debugCompiler.Compile(debugOptions);
+            if (_hasErrors == false) {
+                // Only copy references once (when building language neutral scripts)
+                bool copyReferences = String.IsNullOrEmpty(locale) && CopyReferences;
+
+                OnScriptFileGenerated(scriptTaskItem, debugOptions, copyReferences);
+                if (_hasErrors) {
+                    return false;
+                }
+            }
+            else {
+                return false;
+            }
+
+            if (debugOptions.HasTestTypes) {
+                CompilerOptions testOptions =
+                    CreateOptions(name, sourceItems, resourceItems, locale,
+                                  /* debug */ true, /* includeTests */ true, /* minimize */ false,
+                                  out scriptTaskItem);
+                ScriptCompiler testCompiler = new ScriptCompiler(this);
+                testCompiler.Compile(testOptions);
+                if (_hasErrors == false) {
+                    OnScriptFileGenerated(scriptTaskItem, testOptions, /* copyReferences */ false);
+                }
+                else {
+                    return false;
+                }
+            }
+
+            CompilerOptions releaseOptions =
+                CreateOptions(name, sourceItems, resourceItems, locale,
+                              /* debug */ false, /* includeTests */ false, /* minimize */ true,
+                              out scriptTaskItem);
+            ScriptCompiler releaseCompiler = new ScriptCompiler(this);
+            releaseCompiler.Compile(releaseOptions);
+            if (_hasErrors == false) {
+                OnScriptFileGenerated(scriptTaskItem, releaseOptions, /* copyReferences */ false);
+            }
+            else {
+                return false;
+            }
+
+            return true;
+        }
+
+        private CompilerOptions CreateOptions(string name, IEnumerable<ITaskItem> sourceItems, IEnumerable<ITaskItem> resourceItems,
+                                              string locale,
+                                              bool debug, bool includeTests, bool minimize,
+                                              out ITaskItem outputScriptItem) {
+            CompilerOptions options = new CompilerOptions();
+            options.DebugFlavor = debug;
+            options.IncludeTests = includeTests;
+            options.Minimize = minimize;
+            options.ScriptNameSuffix = name;
+            options.Defines = GetDefines(name, !debug);
+            options.References = GetReferences();
+            options.Sources = GetSources(sourceItems);
+            options.Resources = GetResources(resourceItems, locale);
+            if (_template != null) {
+                options.TemplateFile = new TaskItemInputStreamSource(_template, "Template");
+            }
+            if ((_docCommentFile != null) && (_suppressDocumentation == false)) {
+                options.DocCommentFile = new TaskItemInputStreamSource(_docCommentFile, "DocComment");
+            }
+
+            string scriptFilePath = GetScriptFilePath(name, locale, debug, includeTests);
+            outputScriptItem = new TaskItem(scriptFilePath);
+            options.ScriptFile = new TaskItemOutputStreamSource(outputScriptItem);
+
+            return options;
+        }
+
+        public override bool Execute() {
+            _scripts = new List<ITaskItem>();
+
+#if PARTITIONING
+            if (_webAppPartitioning == false) {
+#endif
+                return ExecuteCore(String.Empty, _sources, _resources);
+#if PARTITIONING
+            }
+            else {
+                CompilationGroup sharedGroup = new CompilationGroup();
+                Dictionary<string, CompilationGroup> compilationGroups =
+                    new Dictionary<string, CompilationGroup>(StringComparer.OrdinalIgnoreCase);
+
+                if (_sources != null) {
+                    foreach (ITaskItem sourceItem in _sources) {
+                        string groupName = CompilationGroup.GetGroupName(sourceItem);
+
+                        CompilationGroup group;
+                        if (groupName == CompilationGroup.SharedGroupName) {
+                            group = sharedGroup;
+                        }
+                        else if (compilationGroups.TryGetValue(groupName, out group) == false) {
+                            group = new CompilationGroup();
+                            compilationGroups[groupName] = group;
+                        }
+
+                        group.Sources.Add(sourceItem);
+                    }
+                }
+
+                if (_resources != null) {
+                    foreach (ITaskItem resourceItem in _resources) {
+                        string groupName = CompilationGroup.GetGroupName(resourceItem);
+
+                        CompilationGroup group;
+                        if (groupName == CompilationGroup.SharedGroupName) {
+                            group = sharedGroup;
+                        }
+                        else if (compilationGroups.TryGetValue(groupName, out group) == false) {
+                            group = new CompilationGroup();
+                            compilationGroups[groupName] = group;
+                        }
+
+                        group.Resources.Add(resourceItem);
+                    }
+                }
+
+                foreach (KeyValuePair<string, CompilationGroup> group in compilationGroups) {
+                    group.Value.Sources.AddRange(sharedGroup.Sources);
+                    group.Value.Resources.AddRange(sharedGroup.Resources);
+
+                    bool success = ExecuteCore(group.Key, group.Value.Sources, group.Value.Resources);
+                    if (success == false) {
+                        return false;
+                    }
+                }
+
+                return true;
+            }
+#endif // PARTITIONING
+        }
+
+        private bool ExecuteCore(string name, IEnumerable<ITaskItem> sources, IEnumerable<ITaskItem> resources) {
+            bool success = false;
+
+            try {
+                // Create the neutral culture scripts first
+                success = Compile(name, sources, resources, /* locale */ String.Empty);
+
+                if (success) {
+                    ICollection<string> locales = GetLocales(resources);
+                    foreach (string locale in locales) {
+                        success = Compile(name, sources, resources, locale);
+                        if (success == false) {
+                            break;
+                        }
+                    }
+                }
+            }
+            catch {
+                success = false;
+            }
+
+            return success;
+        }
+
+        private ICollection<string> GetDefines(string name, bool removeDebug) {
+            if ((Defines.Length == 0) && String.IsNullOrEmpty(name)) {
+                return new string[0];
+            }
+            string[] defines = Defines.Split(';');
+            if (String.IsNullOrEmpty(name) && (removeDebug == false)) {
+                return defines;
+            }
+
+            List<string> definesList = new List<string>(defines);
+            definesList.Add(name);
+
+            if (removeDebug) {
+                definesList.Remove("DEBUG");
+            }
+
+            return definesList;
+        }
+
+        private ICollection<string> GetLocales(IEnumerable<ITaskItem> resourceItems) {
+            List<string> locales = new List<string>();
+
+            // Inspect the list of resources to create the list of unique locales
+            if (resourceItems != null) {
+                foreach (ITaskItem resourceItem in resourceItems) {
+                    string locale = ResourceFile.GetLocale(resourceItem.ItemSpec);
+
+                    if (locales.Contains(locale) == false) {
+                        locales.Add(locale);
+                    }
+                }
+            }
+
+            return locales;
+        }
+
+        private ICollection<string> GetReferences() {
+            if (_references == null) {
+                return new string[0];
+            }
+
+            List<string> references = new List<string>(_references.Length);
+            foreach (ITaskItem reference in _references) {
+                // TODO: This is a hack... something in the .net 4 build system causes
+                //       System.Core.dll to get included [sometimes].
+                //       That shouldn't happen... so filter it out here.
+                if (reference.ItemSpec.EndsWith("System.Core.dll", StringComparison.OrdinalIgnoreCase)) {
+                    continue;
+                }
+                references.Add(reference.ItemSpec);
+            }
+
+            return references;
+        }
+
+        private ICollection<IStreamSource> GetResources(IEnumerable<ITaskItem> allResources, string locale) {
+            if (allResources == null) {
+                return new TaskItemInputStreamSource[0];
+            }
+
+            List<IStreamSource> resources = new List<IStreamSource>();
+            foreach (ITaskItem resource in allResources) {
+                string itemLocale = ResourceFile.GetLocale(resource.ItemSpec);
+
+                if (String.IsNullOrEmpty(locale) && String.IsNullOrEmpty(itemLocale)) {
+                    resources.Add(new TaskItemInputStreamSource(resource));
+                }
+                else if ((String.Compare(locale, itemLocale, StringComparison.OrdinalIgnoreCase) == 0) ||
+                         locale.StartsWith(itemLocale, StringComparison.OrdinalIgnoreCase)) {
+                    // Either the item locale matches, or the item locale is a prefix
+                    // of the locale (eg. we want to include "fr" if the locale specified
+                    // is fr-FR)
+                    resources.Add(new TaskItemInputStreamSource(resource));
+                }
+            }
+
+            return resources;
+        }
+
+        private string GetScriptFilePath(string name, string locale, bool debug, bool includeTests) {
+            if ((_csharpAssembly != null) && (OutputPath.Length != 0)) {
+                string assemblyPath = _csharpAssembly.ItemSpec;
+                string assemblyFile = Path.GetFileName(assemblyPath);
+                string outputPath = OutputPath;
+                string extension = "js";
+
+                if ((assemblyFile.Length > 7) && assemblyFile.StartsWith("Script.", StringComparison.OrdinalIgnoreCase)) {
+                    // Resulting script files don't need a "Script." prefix, since that
+                    // is mostly a naming convention used to separate out script# managed binaries.
+
+                    assemblyFile = assemblyFile.Substring(7);
+                }
+
+                if (_configSubFolders == false) {
+                    extension = includeTests ? "test.js" : (debug ? "debug.js" : "js");
+                }
+                else {
+                    outputPath = Path.Combine(outputPath, includeTests ? "test" : (debug ? "debug" : "release"));
+                }
+
+                if (String.IsNullOrEmpty(locale) == false) {
+                    if (_localeSubFolders == false) {
+                        extension = locale + "." + extension;
+                    }
+                    else {
+                        outputPath = Path.Combine(outputPath, locale);
+                    }
+                }
+
+                if (String.IsNullOrEmpty(name) == false) {
+                    extension = name + "." + extension;
+                }
+
+                if (Directory.Exists(outputPath) == false) {
+                    Directory.CreateDirectory(outputPath);
+                }
+
+                return Path.Combine(outputPath, Path.ChangeExtension(assemblyFile, extension));
+            }
+
+            return null;
+        }
+
+        private ICollection<IStreamSource> GetSources(IEnumerable<ITaskItem> sourceItems) {
+            if (sourceItems == null) {
+                return new TaskItemInputStreamSource[0];
+            }
+
+            List<IStreamSource> sources = new List<IStreamSource>();
+            foreach (ITaskItem sourceItem in sourceItems) {
+                // TODO: This is a hack... something in the .net 4 build system causes
+                //       generation of an AssemblyAttributes.cs file with fully-qualified
+                //       type names, that we can't handle (this comes from multitargeting),
+                //       and there doesn't seem like a way to turn it off.
+                if (sourceItem.ItemSpec.EndsWith(".AssemblyAttributes.cs", StringComparison.OrdinalIgnoreCase)) {
+                    continue;
+                }
+
+                sources.Add(new TaskItemInputStreamSource(sourceItem));
+            }
+
+            return sources;
+        }
+
+        private void OnScriptFileGenerated(ITaskItem scriptItem, CompilerOptions options, bool copyReferences) {
+            _scripts.Add(scriptItem);
+
+            Func<string, bool, string> getScriptFile = delegate(string reference, bool debug) {
+                string scriptFile = Path.ChangeExtension(reference, debug ? ".debug.js" : ".js");
+                if (File.Exists(scriptFile)) {
+                    return scriptFile;
+                }
+
+                string fileName = Path.GetFileName(scriptFile);
+                if ((fileName.Length > 7) && fileName.StartsWith("Script.", StringComparison.OrdinalIgnoreCase)) {
+                    fileName = fileName.Substring(7);
+                    scriptFile = Path.Combine(Path.GetDirectoryName(scriptFile), fileName);
+
+                    if (File.Exists(scriptFile)) {
+                        return scriptFile;
+                    }
+                }
+
+                return null;
+            };
+
+            Action<string, string> safeCopyFile = delegate(string sourceFilePath, string targetFilePath) {
+                try {
+                    if (File.Exists(targetFilePath)) {
+                        // If the file already exists, make sure it is not read-only, so
+                        // it can be overrwritten.
+                        File.SetAttributes(targetFilePath, FileAttributes.Normal);
+                    }
+
+                    File.Copy(sourceFilePath, targetFilePath, /* overwrite */ true);
+
+                    // Copy the file, and then make sure it is not read-only (for example, if the
+                    // source file for a referenced script is read-only).
+                    File.SetAttributes(targetFilePath, FileAttributes.Normal);
+                }
+                catch (Exception e) {
+                    Log.LogError("Unable to copy referenced script '" + sourceFilePath + "' as '" + targetFilePath + "' (" + e.Message + ")");
+                    _hasErrors = true;
+                }
+            };
+
+            string projectName = (_projectPath != null) ? Path.GetFileNameWithoutExtension(_projectPath) : String.Empty;
+            string scriptFileName = Path.GetFileName(scriptItem.ItemSpec);
+            string scriptPath = Path.GetFullPath(scriptItem.ItemSpec);
+            string scriptFolder = Path.GetDirectoryName(scriptItem.ItemSpec);
+
+            Log.LogMessage(MessageImportance.High, "{0} -> {1} ({2})", projectName, scriptFileName, scriptPath);
+
+            if (copyReferences) {
+                foreach (string reference in options.References) {
+                    string releaseScriptFile = getScriptFile(reference, /* debug */ false);
+                    if (releaseScriptFile != null) {
+                        string path = Path.Combine(scriptFolder, Path.GetFileName(releaseScriptFile));
+                        safeCopyFile(releaseScriptFile, path);
+                    }
+
+                    string debugScriptFile = getScriptFile(reference, /* debug */ true);
+                    if (debugScriptFile != null) {
+                        string path = Path.Combine(scriptFolder, Path.GetFileName(debugScriptFile));
+                        safeCopyFile(debugScriptFile, path);
+                    }
+                }
+            }
+
+            string deploymentPath = DeploymentPath;
+            if (DeploymentPath.Length != 0) {
+                string deployedScriptPath = Path.Combine(deploymentPath, scriptFileName);
+                safeCopyFile(scriptPath, deployedScriptPath);
+
+                if (copyReferences) {
+                    foreach (string reference in options.References) {
+                        string releaseScriptFile = getScriptFile(reference, /* debug */ false);
+                        if (releaseScriptFile != null) {
+                            string path = Path.Combine(deploymentPath, Path.GetFileName(releaseScriptFile));
+                            safeCopyFile(releaseScriptFile, path);
+                        }
+
+                        string debugScriptFile = getScriptFile(reference, /* debug */ true);
+                        if (debugScriptFile != null) {
+                            string path = Path.Combine(deploymentPath, Path.GetFileName(debugScriptFile));
+                            safeCopyFile(debugScriptFile, path);
+                        }
+                    }
+                }
+            }
+        }
+
+        #region Implementation of IErrorHandler
+        void IErrorHandler.ReportError(string errorMessage, string location) {
+            _hasErrors = true;
+
+            int line = 0;
+            int column = 0;
+
+            if (String.IsNullOrEmpty(location) == false) {
+                if (location.EndsWith(")", StringComparison.Ordinal)) {
+                    int index = location.LastIndexOf("(", StringComparison.Ordinal);
+                    Debug.Assert(index > 0);
+
+                    string position = location.Substring(index + 1, location.Length - index - 2);
+                    string[] positionParts = position.Split(new char[] { ' ', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                    Debug.Assert(positionParts.Length == 2);
+
+                    Int32.TryParse(positionParts[0], out line);
+                    Int32.TryParse(positionParts[1], out column);
+
+                    location = location.Substring(0, index);
+                }
+            }
+
+            Log.LogError(String.Empty, String.Empty, String.Empty, location, line, column, 0, 0, errorMessage);
+        }
+        #endregion
+
+
+        private sealed class CompilationGroup {
+
+            public static readonly string SharedGroupName = "Shared";
+
+            public List<ITaskItem> Sources;
+            public List<ITaskItem> Resources;
+
+            public CompilationGroup() {
+                Sources = new List<ITaskItem>();
+                Resources = new List<ITaskItem>();
+            }
+
+            public static string GetGroupName(ITaskItem taskItem) {
+                string groupName = null;
+
+                string itemPath = taskItem.GetMetadata("Link");
+                if (String.IsNullOrEmpty(itemPath)) {
+                    itemPath = taskItem.ItemSpec;
+                }
+
+                if (Path.IsPathRooted(itemPath) ||
+                    (itemPath.IndexOf(Path.DirectorySeparatorChar) < 0)) {
+                    groupName = SharedGroupName;
+                }
+                else {
+                    string path = itemPath;
+                    while (String.IsNullOrEmpty(path) == false) {
+                        groupName = path;
+                        path = Path.GetDirectoryName(path);
+                    }
+                }
+
+                if (groupName.Equals("Properties", StringComparison.Ordinal)) {
+                    groupName = CompilationGroup.SharedGroupName;
+                }
+
+                return groupName;
+            }
+        }
+
+        private sealed class TaskItemInputStreamSource : FileInputStreamSource {
+
+            public TaskItemInputStreamSource(ITaskItem taskItem)
+                : base(taskItem.ItemSpec) {
+            }
+
+            public TaskItemInputStreamSource(ITaskItem taskItem, string name)
+                : base(taskItem.ItemSpec, name) {
+            }
+        }
+
+        private sealed class TaskItemOutputStreamSource : FileOutputStreamSource {
+
+            public TaskItemOutputStreamSource(ITaskItem taskItem)
+                : base(taskItem.ItemSpec) {
+            }
+
+            public TaskItemOutputStreamSource(ITaskItem taskItem, string name)
+                : base(taskItem.ItemSpec, name) {
+            }
+        }
+    }
+}
diff --git a/src/Core/Build/Tasks/ScriptPreprocessorTask.cs b/src/Core/Build/Tasks/ScriptPreprocessorTask.cs
new file mode 100644
index 000000000..7c6c36618
--- /dev/null
+++ b/src/Core/Build/Tasks/ScriptPreprocessorTask.cs
@@ -0,0 +1,292 @@
+// ScriptPreprocessorTask.cs
+// Script#/Core/Build
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using Microsoft.Build;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace ScriptSharp.Tasks {
+
+    public sealed class ScriptPreprocessorTask : Task, IErrorHandler, IStreamResolver {
+
+        private bool _debug;
+        private bool _minimize;
+        private bool _stripCommentsOnly;
+        private bool _windowsLineBreaks;
+        private string _defines;
+        private string _outputDirectory;
+
+        private string[] _preprocessorVariables;
+
+        private ITaskItem[] _sources;
+        private ITaskItem[] _scripts;
+
+        private bool _hasErrors;
+
+        public ScriptPreprocessorTask() {
+            _minimize = true;
+        }
+
+        public bool Debug {
+            get {
+                return _debug;
+            }
+            set {
+                _debug = value;
+            }
+        }
+
+        public string Defines {
+            get {
+                return _defines;
+            }
+            set {
+                _defines = value;
+            }
+        }
+
+        public bool Minimize {
+            get {
+                return _minimize;
+            }
+            set {
+                _minimize = value;
+            }
+        }
+
+        [Required]
+        public string OutputDirectory {
+            get {
+                return _outputDirectory;
+            }
+            set {
+                _outputDirectory = value;
+            }
+        }
+
+        [Output]
+        public ITaskItem[] Scripts {
+            get {
+                return _scripts;
+            }
+            set {
+                _scripts = value;
+            }
+        }
+
+        public ITaskItem[] Sources {
+            get {
+                return _sources;
+            }
+            set {
+                _sources = value;
+            }
+        }
+
+        public bool StripCommentsOnly {
+            get {
+                return _stripCommentsOnly;
+            }
+            set {
+                _stripCommentsOnly = value;
+            }
+        }
+
+        public bool WindowsLineBreaks {
+            get {
+                return _windowsLineBreaks;
+            }
+            set {
+                _windowsLineBreaks = value;
+            }
+        }
+
+        private string ConvertScriptFile(BuildType type, string inputPath) {
+            string result = null;
+            string outputPath = null;
+            try {
+                outputPath = Path.Combine(OutputDirectory, Path.ChangeExtension(Path.GetFileName(inputPath), ".js"));
+
+                PreprocessorOptions options = new PreprocessorOptions();
+                options.SourceFile = new FileInputStreamSource(inputPath);
+                options.TargetFile = new FileOutputStreamSource(outputPath);
+                options.DebugFlavor = Debug;
+                options.Minimize = Minimize;
+                options.StripCommentsOnly = StripCommentsOnly;
+                options.UseWindowsLineBreaks = WindowsLineBreaks;
+                options.PreprocessorVariables = _preprocessorVariables;
+
+                ScriptPreprocessor preprocessor;
+                if (type == BuildType.ScriptAssembly) {
+                    preprocessor = new ScriptPreprocessor(this, this);
+                }
+                else {
+                    preprocessor = new ScriptPreprocessor();
+                }
+
+                preprocessor.Preprocess(options);
+                result = outputPath;
+            }
+            catch (Exception e) {
+#if DEBUG
+                Log.LogErrorFromException(e, /* showStackTrace */ true);
+#else
+                Log.LogErrorFromException(e, /* showStackTrace */ false);
+#endif // DEBUG
+            }
+
+            if ((result == null) && File.Exists(outputPath)) {
+                try {
+                    File.Delete(outputPath);
+                }
+                catch {
+                }
+            }
+            return result;
+        }
+
+        private string CopyStandardScriptFile(string inputPath) {
+            string result = null;
+            string outputPath = null;
+
+            try {
+                outputPath = Path.Combine(OutputDirectory, Path.GetFileName(inputPath));
+
+                File.Copy(inputPath, outputPath, /* overwrite */ true);
+                File.SetAttributes(outputPath, FileAttributes.Normal);
+                result = outputPath;
+            }
+            catch {
+                Log.LogError("'" + outputPath + "' could not be opened for writing.");
+            }
+
+            return result;
+        }
+
+        public override bool Execute() {
+            if ((_sources == null) || (_sources.Length == 0)) {
+                Log.LogError("No source files were specified");
+                return false;
+            }
+
+            for (int i = 0; i < _sources.Length; i++) {
+                ITaskItem source = _sources[i];
+                if (File.Exists(source.ItemSpec) == false) {
+                    Log.LogError("'" + source.ItemSpec + "' was not found.");
+                    _hasErrors = true;
+                }
+            }
+
+            if (_hasErrors) {
+                return false;
+            }
+
+            if (String.IsNullOrEmpty(Defines) == false) {
+                _preprocessorVariables = Defines.Split(',', ';', ' ');
+            }
+
+            Log.LogMessage(MessageImportance.Low,
+                           String.Format("Parameters: Debug={0}, Minimize={1}, StripCommentsOnly={2}, WindowsLineBreaks={3}\r\n            Defines={4}",
+                                         Debug, Minimize, StripCommentsOnly, WindowsLineBreaks, Defines));
+
+            ArrayList scripts = new ArrayList(_sources.Length);
+            for (int i = 0; i < _sources.Length; i++) {
+                ITaskItem source = _sources[i];
+
+                string sourcePath = source.ItemSpec;
+                string outputPath = null;
+                BuildType type = BuildType.Unknown;
+
+                string extension = Path.GetExtension(sourcePath);
+                if (String.Compare(extension, ".jsa", StringComparison.OrdinalIgnoreCase) == 0) {
+                    type = BuildType.ScriptAssembly;
+                }
+                else if (String.Compare(extension, ".jsx", StringComparison.OrdinalIgnoreCase) == 0) {
+                    type = BuildType.ExtendedScript;
+                }
+                else if (String.Compare(extension, ".js", StringComparison.OrdinalIgnoreCase) == 0) {
+                    type = BuildType.StandardScript;
+                }
+                else {
+                    Log.LogError("'" + sourcePath + "' is an unknown file type.");
+                    _hasErrors = true;
+                }
+
+                if (type != BuildType.Unknown) {
+                    Log.LogMessage(MessageImportance.Low, "Building '" + sourcePath + "'");
+                    if (type == BuildType.StandardScript) {
+                        outputPath = CopyStandardScriptFile(sourcePath);
+                    }
+                    else {
+                        outputPath = ConvertScriptFile(type, sourcePath);
+                    }
+
+                    if (String.IsNullOrEmpty(outputPath) == false) {
+                        scripts.Add(new TaskItem(outputPath));
+                    }
+                    else {
+                        _hasErrors = true;
+                    }
+                }
+            }
+
+            if (_hasErrors == false) {
+                _scripts = (ITaskItem[])scripts.ToArray(typeof(ITaskItem));
+                return true;
+            }
+            return false;
+        }
+
+        #region Implementation of IErrorHandler
+        void IErrorHandler.ReportError(string errorMessage, string location) {
+            _hasErrors = true;
+
+            int line = 0;
+            int column = 0;
+
+            if (String.IsNullOrEmpty(location) == false) {
+                if (location.EndsWith(")", StringComparison.Ordinal)) {
+                    int index = location.LastIndexOf("(", StringComparison.Ordinal);
+                    System.Diagnostics.Debug.Assert(index > 0);
+
+                    string position = location.Substring(index + 1, location.Length - index - 2);
+                    string[] positionParts = position.Split(new char[] { ' ', ',' }, StringSplitOptions.RemoveEmptyEntries);
+                    System.Diagnostics.Debug.Assert(positionParts.Length == 2);
+
+                    Int32.TryParse(positionParts[0], out line);
+                    Int32.TryParse(positionParts[1], out column);
+
+                    location = location.Substring(0, index);
+                }
+            }
+
+            Log.LogError(String.Empty, String.Empty, String.Empty, location, line, column, 0, 0, errorMessage);
+        }
+        #endregion
+
+        #region Implementation of IStreamResolver
+        IStreamSource IStreamResolver.ResolveInclude(IStreamSource baseStream, string includePath) {
+            string resolvedPath = Path.Combine(Path.GetDirectoryName(Path.GetFullPath(baseStream.FullName)), includePath);
+            return new FileInputStreamSource(resolvedPath);
+        }
+        #endregion
+
+        private enum BuildType {
+
+            Unknown = 0,
+
+            StandardScript = 1,
+
+            ExtendedScript = 2,
+
+            ScriptAssembly = 3
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Attributes/AttributeBlockNode.cs b/src/Core/Compiler/CodeModel/Attributes/AttributeBlockNode.cs
new file mode 100644
index 000000000..602cb6215
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Attributes/AttributeBlockNode.cs
@@ -0,0 +1,30 @@
+// AttributeBlockNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class AttributeBlockNode : ParseNode {
+
+        private AttributeTargets _location;
+        private ParseNodeList _attributes;
+
+        public AttributeBlockNode(Token token,
+                                  AttributeTargets location,
+                                  ParseNodeList attributes)
+            : base(ParseNodeType.AttributeBlock, token) {
+            _location = location;
+            _attributes = GetParentedNodeList(attributes);
+        }
+
+        public ParseNodeList Attributes {
+            get {
+                return _attributes;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Attributes/AttributeNode.cs b/src/Core/Compiler/CodeModel/Attributes/AttributeNode.cs
new file mode 100644
index 000000000..59fc50ec5
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Attributes/AttributeNode.cs
@@ -0,0 +1,67 @@
+// AttributeNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class AttributeNode : ParseNode {
+
+        private NameNode _typeName;
+        private ParseNode _arguments;
+
+        public AttributeNode(NameNode typeName, ParseNode arguments)
+            : base(ParseNodeType.Attribute, typeName.token) {
+            _typeName = (NameNode)GetParentedNode(typeName);
+            _arguments = GetParentedNode(arguments);
+        }
+
+        public ParseNodeList Arguments {
+            get {
+                if (_arguments != null) {
+                    return ((ExpressionListNode)_arguments).Expressions;
+                }
+                return null;
+            }
+        }
+
+        public string TypeName {
+            get {
+                return _typeName.Name;
+            }
+        }
+
+        public static AttributeNode FindAttribute(ParseNodeList attributeNodes, string attributeName) {
+            if ((attributeNodes == null) || (attributeNodes.Count == 0)) {
+                return null;
+            }
+
+            foreach (AttributeNode attrNode in attributeNodes) {
+                if (attrNode.TypeName.Equals(attributeName, StringComparison.Ordinal)) {
+                    return attrNode;
+                }
+            }
+
+            return null;
+        }
+
+        public static ParseNodeList GetAttributeList(ParseNodeList attributeBlocks) {
+            if ((attributeBlocks == null)  || (attributeBlocks.Count == 0)) {
+                return attributeBlocks;
+            }
+
+            ParseNodeList attributes = new ParseNodeList();
+            foreach (AttributeBlockNode attributeBlock in attributeBlocks) {
+                ParseNodeList localAttributes = attributeBlock.Attributes;
+                if (localAttributes.Count != 0) {
+                    attributes.Append(localAttributes);
+                }
+            }
+
+            return attributes;
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Attributes/AttributeTargets.cs b/src/Core/Compiler/CodeModel/Attributes/AttributeTargets.cs
new file mode 100644
index 000000000..8cceb1540
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Attributes/AttributeTargets.cs
@@ -0,0 +1,33 @@
+// AttributeTargets.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.CodeModel {
+
+    /// <summary>
+    /// Locations which an attribute section can target.
+    /// </summary>
+    internal enum AttributeTargets {
+
+        Assembly,
+
+        Field,
+
+        Event,
+
+        Method,
+
+        Module,
+
+        Param,
+
+        Property,
+
+        Return,
+
+        Type
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/CodeModelBuilder.cs b/src/Core/Compiler/CodeModel/CodeModelBuilder.cs
new file mode 100644
index 000000000..b11df5e7a
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/CodeModelBuilder.cs
@@ -0,0 +1,101 @@
+// CodeModelBuilder.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using ScriptSharp;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class CodeModelBuilder {
+
+        private CompilerOptions _options;
+        private IErrorHandler _errorHandler;
+
+        private bool _hasErrors;
+
+        public CodeModelBuilder(CompilerOptions options, IErrorHandler errorHandler) {
+            _options = options;
+            _errorHandler = errorHandler;
+        }
+
+        public CompilationUnitNode BuildCodeModel(IStreamSource source) {
+            _hasErrors = false;
+
+            string filePath = source.FullName;
+#if DEBUG
+            if (_options.InternalTestMode) {
+                // This ensures in file paths are just file names in test output.
+                filePath = Path.GetFileName(filePath);
+            }
+#endif // DEBUG
+            char[] buffer = GetBuffer(source);
+            if (buffer == null) {
+                _errorHandler.ReportError("Unable to read from file " + filePath, filePath);
+                return null;
+            }
+
+            IDictionary definesTable = new Hashtable();
+            if ((_options.Defines != null) && (_options.Defines.Count != 0)) {
+                foreach (string s in _options.Defines) {
+                    definesTable[s] = null;
+                }
+            }
+
+            NameTable nameTable = new NameTable();
+            LineMap lineMap = new LineMap(filePath);
+
+            FileLexer lexer = new FileLexer(nameTable, filePath);
+            lexer.OnError += new FileErrorEventHandler(OnError);
+            Token[] tokens = lexer.Lex(buffer, definesTable, lineMap, /* includeComments */ false);
+
+            if (_hasErrors == false) {
+                FileParser parser = new FileParser(nameTable, filePath);
+                parser.OnError += new FileErrorEventHandler(OnError);
+
+                CompilationUnitNode compilationUnit = parser.Parse(tokens, lineMap);
+                foreach (ParseNode node in compilationUnit.Members) {
+                    NamespaceNode namespaceNode = node as NamespaceNode;
+                    if (namespaceNode != null) {
+                        namespaceNode.IncludeCompilationUnitUsingClauses();
+                    }
+                }
+
+                if (_hasErrors == false) {
+                    return compilationUnit;
+                }
+            }
+
+            return null;
+        }
+
+        private char[] GetBuffer(IStreamSource source) {
+            char[] buffer = null;
+
+            Stream stream = source.GetStream();
+            if (stream != null) {
+                StreamReader reader = new StreamReader(stream);
+                string text = reader.ReadToEnd();
+
+                buffer = text.ToCharArray();
+                source.CloseStream(stream);
+            }
+            return buffer;
+        }
+
+        private void OnError(object sender, FileErrorEventArgs e) {
+            _hasErrors = true;
+
+            string location = e.Position.ToString();
+            string message = String.Format(e.Error.Message, e.Args);
+
+            _errorHandler.ReportError(message, location);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/CodeModelProcessor.cs b/src/Core/Compiler/CodeModel/CodeModelProcessor.cs
new file mode 100644
index 000000000..038854ee8
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/CodeModelProcessor.cs
@@ -0,0 +1,117 @@
+// CodeModelProcessor.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class CodeModelProcessor {
+
+        private IParseNodeHandler _nodeHandler;
+        private object _context;
+        private bool _notifyChildren;
+
+        public CodeModelProcessor(IParseNodeHandler nodeHandler, object context) {
+            _nodeHandler = nodeHandler;
+            _context = context;
+            _notifyChildren = nodeHandler.RequiresChildrenGrouping;
+        }
+
+        private void EndChildren() {
+            if (_notifyChildren) {
+                _nodeHandler.EndChildren();
+            }
+        }
+
+        public void Process(ParseNode node) {
+            Visit(node);
+        }
+
+        private bool ProcessNode(ParseNode node) {
+            return _nodeHandler.HandleNode(node, _context);
+        }
+
+        private void StartChildren(string identifier) {
+            if (_notifyChildren) {
+                _nodeHandler.StartChildren(identifier);
+            }
+        }
+
+        private void Visit(ParseNode node) {
+            bool recurse = ProcessNode(node);
+
+            if (recurse) {
+                StartChildren(String.Empty);
+
+                Type nodeType = node.GetType();
+                foreach (PropertyInfo propertyInfo in nodeType.GetProperties()) {
+                    string propertyName = propertyInfo.Name;
+                    if (propertyName.Equals("NodeType")) {
+                        continue;
+                    }
+                    if (propertyName.Equals("Parent")) {
+                        continue;
+                    }
+                    if (propertyName.Equals("Token")) {
+                        continue;
+                    }
+
+                    Visit(node, propertyInfo);
+                }
+
+                EndChildren();
+            }
+        }
+
+        private void Visit(ParseNode node, PropertyInfo propertyInfo) {
+            string name = propertyInfo.Name;
+            object value = propertyInfo.GetValue(node, null);
+
+            string text = name + " (" + propertyInfo.PropertyType.Name + ")";
+
+            if (value != null) {
+                if (value is ParseNodeList) {
+                    ParseNodeList nodeList = (ParseNodeList)value;
+
+                    if (nodeList.Count == 0) {
+                        text += " : Empty";
+                    }
+                    else {
+                        text += " : " + nodeList.Count.ToString();
+                    }
+
+                    StartChildren(text);
+                    foreach (ParseNode nodeItem in nodeList) {
+                        Visit(nodeItem);
+                    }
+                    EndChildren();
+                }
+                else if (value is ParseNode) {
+                    StartChildren(text);
+                    Visit((ParseNode)value);
+                    EndChildren();
+                }
+                else {
+                    if (value is string) {
+                        text += " : \"" + (string)value + "\"";
+                    }
+                    else {
+                        text += " : " + value.ToString();
+                    }
+
+                    StartChildren(text);
+                    EndChildren();
+                }
+            }
+            else {
+                text += " : null";
+                StartChildren(text);
+                EndChildren();
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/AnonymousMethodNode.cs b/src/Core/Compiler/CodeModel/Expressions/AnonymousMethodNode.cs
new file mode 100644
index 000000000..92057baac
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/AnonymousMethodNode.cs
@@ -0,0 +1,35 @@
+// AnonymousMethodNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class AnonymousMethodNode : ExpressionNode {
+
+        private ParseNodeList _parameterList;
+        private BlockStatementNode _block;
+
+        public AnonymousMethodNode(Token token, ParseNodeList parameterList, BlockStatementNode block)
+            : base(ParseNodeType.AnonymousMethod, token) {
+            _parameterList = GetParentedNodeList(parameterList);
+            _block = (BlockStatementNode)GetParentedNode(block);
+        }
+
+        public BlockStatementNode Implementation {
+            get {
+                return _block;
+            }
+        }
+
+        public ParseNodeList Parameters {
+            get {
+                return _parameterList;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/ArrayInitializerNode.cs b/src/Core/Compiler/CodeModel/Expressions/ArrayInitializerNode.cs
new file mode 100644
index 000000000..bf6bc3cc9
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/ArrayInitializerNode.cs
@@ -0,0 +1,27 @@
+// ArrayInitializerNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class ArrayInitializerNode : ExpressionNode {
+
+        private ParseNodeList _values;
+
+        public ArrayInitializerNode(Token token,
+                                    ParseNodeList values)
+            : base(ParseNodeType.ArrayInitializer, token) {
+            _values = GetParentedNodeList(values);
+        }
+
+        public ParseNodeList Values {
+            get {
+                return _values;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/ArrayNewNode.cs b/src/Core/Compiler/CodeModel/Expressions/ArrayNewNode.cs
new file mode 100644
index 000000000..6ed6b8fae
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/ArrayNewNode.cs
@@ -0,0 +1,45 @@
+// ArrayNewNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class ArrayNewNode : ExpressionNode {
+
+        private ParseNode _typeReference;
+        private ParseNode _expressionList;
+        private ParseNode _initializerExpression;
+
+        public ArrayNewNode(Token token,
+                            ParseNode typeReference,
+                            ParseNode expressionList,
+                            ParseNode initializerExpression)
+            : base(ParseNodeType.ArrayNew, token) {
+            _typeReference = GetParentedNode(typeReference);
+            _expressionList = GetParentedNode(expressionList);
+            _initializerExpression = GetParentedNode(initializerExpression);
+        }
+
+        public ParseNode ExpressionList {
+            get {
+                return _expressionList;
+            }
+        }
+
+        public ParseNode InitializerExpression {
+            get {
+                return _initializerExpression;
+            }
+        }
+
+        public ParseNode TypeReference {
+            get {
+                return _typeReference;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/BaseNode.cs b/src/Core/Compiler/CodeModel/Expressions/BaseNode.cs
new file mode 100644
index 000000000..cd4640a65
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/BaseNode.cs
@@ -0,0 +1,17 @@
+// BaseNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class BaseNode : ExpressionNode {
+
+        public BaseNode(Token token)
+            : base(ParseNodeType.Base, token) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/BinaryExpressionNode.cs b/src/Core/Compiler/CodeModel/Expressions/BinaryExpressionNode.cs
new file mode 100644
index 000000000..79ed949a5
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/BinaryExpressionNode.cs
@@ -0,0 +1,42 @@
+// ExpressionNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class BinaryExpressionNode : ExpressionNode {
+
+        private TokenType _operatorType;
+        private ParseNode _leftChild;
+        private ParseNode _rightChild;
+
+        public BinaryExpressionNode(ParseNode leftChild, TokenType operatorType, ParseNode rightChild)
+            : base(ParseNodeType.BinaryExpression, leftChild.token) {
+            _leftChild = GetParentedNode(leftChild);
+            _operatorType = operatorType;
+            _rightChild = GetParentedNode(rightChild);
+        }
+
+        public ParseNode LeftChild {
+            get {
+                return _leftChild;
+            }
+        }
+
+        public TokenType Operator {
+            get {
+                return _operatorType;
+            }
+        }
+
+        public ParseNode RightChild {
+            get {
+                return _rightChild;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/CastNode.cs b/src/Core/Compiler/CodeModel/Expressions/CastNode.cs
new file mode 100644
index 000000000..2e39d8e7e
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/CastNode.cs
@@ -0,0 +1,34 @@
+// CastNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class CastNode : ExpressionNode {
+
+        private ParseNode _typeReference;
+        private ParseNode _child;
+
+        public CastNode(Token token, ParseNode typeReference, ParseNode child)
+            : base(ParseNodeType.Cast, token) {
+            _typeReference = GetParentedNode(typeReference);
+            _child = GetParentedNode(child);
+        }
+
+        public ParseNode Child {
+            get {
+                return _child;
+            }
+        }
+
+        public ParseNode TypeReference {
+            get {
+                return _typeReference;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/ConditionalNode.cs b/src/Core/Compiler/CodeModel/Expressions/ConditionalNode.cs
new file mode 100644
index 000000000..f0fbf3670
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/ConditionalNode.cs
@@ -0,0 +1,42 @@
+// ConditionalNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class ConditionalNode : ExpressionNode {
+
+        private ParseNode _condition;
+        private ParseNode _trueValue;
+        private ParseNode _falseValue;
+
+        public ConditionalNode(ParseNode condition, ParseNode trueValue, ParseNode falseValue)
+            : base(ParseNodeType.Conditional, condition.token) {
+            _condition = GetParentedNode(condition);
+            _trueValue = GetParentedNode(trueValue);
+            _falseValue = GetParentedNode(falseValue);
+        }
+
+        public ParseNode Condition {
+            get {
+                return _condition;
+            }
+        }
+
+        public ParseNode FalseValue {
+            get {
+                return _falseValue;
+            }
+        }
+
+        public ParseNode TrueValue {
+            get {
+                return _trueValue;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/DefaultValueNode.cs b/src/Core/Compiler/CodeModel/Expressions/DefaultValueNode.cs
new file mode 100644
index 000000000..d9bfcb95a
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/DefaultValueNode.cs
@@ -0,0 +1,21 @@
+// ExpressionNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class DefaultValueNode : ExpressionNode {
+
+        public ParseNode _expression;
+
+        public DefaultValueNode(ParseNode expression)
+            : base(ParseNodeType.DefaultValueExpression, expression.token) {
+            _expression = expression;
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/ExpressionListNode.cs b/src/Core/Compiler/CodeModel/Expressions/ExpressionListNode.cs
new file mode 100644
index 000000000..b1f1a0c1d
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/ExpressionListNode.cs
@@ -0,0 +1,26 @@
+// ExpressionListNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class ExpressionListNode : ParseNode {
+
+        private ParseNodeList _expressions;
+
+        public ExpressionListNode(Token token, ParseNodeList expressions)
+            : base(ParseNodeType.ExpressionList, token) {
+            _expressions = GetParentedNodeList(expressions);
+        }
+
+        public ParseNodeList Expressions {
+            get {
+                return _expressions;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/ExpressionNode.cs b/src/Core/Compiler/CodeModel/Expressions/ExpressionNode.cs
new file mode 100644
index 000000000..b8feef843
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/ExpressionNode.cs
@@ -0,0 +1,29 @@
+// ExpressionNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal abstract class ExpressionNode : ParseNode {
+
+        private bool _parenthesized;
+
+        protected ExpressionNode(ParseNodeType nodeType, Token token)
+            : base(nodeType, token) {
+        }
+
+        public bool Parenthesized {
+            get {
+                return _parenthesized;
+            }
+        }
+
+        public void AddParenthesisHint() {
+            _parenthesized = true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/LiteralNode.cs b/src/Core/Compiler/CodeModel/Expressions/LiteralNode.cs
new file mode 100644
index 000000000..d39ce8f39
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/LiteralNode.cs
@@ -0,0 +1,45 @@
+// LiteralNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class LiteralNode : ExpressionNode {
+
+        public LiteralNode(Token token)
+            : base(ParseNodeType.Literal, CreateLiteralToken(token)) {
+        }
+
+        public LiteralToken Literal {
+            get {
+                return (LiteralToken)Token;
+            }
+        }
+
+        public object Value {
+            get {
+                return ((LiteralToken)Token).LiteralValue;
+            }
+        }
+
+        private static LiteralToken CreateLiteralToken(Token token) {
+            if (token.Type == TokenType.Null) {
+                return new NullToken(token.SourcePath, token.Position);
+            }
+            else if (token.Type == TokenType.True) {
+                return new BooleanToken(true, token.SourcePath, token.Position);
+            }
+            else if (token.Type == TokenType.False) {
+                return new BooleanToken(false, token.SourcePath, token.Position);
+            }
+            else {
+                Debug.Assert(token is LiteralToken);
+                return (LiteralToken)token;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/NewNode.cs b/src/Core/Compiler/CodeModel/Expressions/NewNode.cs
new file mode 100644
index 000000000..59d7f3d29
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/NewNode.cs
@@ -0,0 +1,37 @@
+// NewNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class NewNode : ExpressionNode {
+
+        private ParseNode _typeReference;
+        private ParseNode _arguments;
+
+        public NewNode(Token token, ParseNode typeReference, ParseNode arguments)
+            : base(ParseNodeType.New, token) {
+            _typeReference = GetParentedNode(typeReference);
+            _arguments = GetParentedNode(arguments);
+        }
+
+        public ParseNode Arguments {
+            get {
+                return _arguments;
+            }
+        }
+
+        public ParseNode TypeReference {
+            get {
+                return _typeReference;
+            }
+            set {
+                _typeReference = value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/SizeofNode.cs b/src/Core/Compiler/CodeModel/Expressions/SizeofNode.cs
new file mode 100644
index 000000000..48a1b10dd
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/SizeofNode.cs
@@ -0,0 +1,21 @@
+// ExpressionNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal class SizeofNode : ExpressionNode {
+
+        private ParseNode _typeNode;
+
+        public SizeofNode(Token op, ParseNode typeNode)
+            : base(ParseNodeType.Sizeof, op) {
+            _typeNode = GetParentedNode(typeNode);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/StackAllocNode.cs b/src/Core/Compiler/CodeModel/Expressions/StackAllocNode.cs
new file mode 100644
index 000000000..e7a04c752
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/StackAllocNode.cs
@@ -0,0 +1,23 @@
+// StackAllocNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class StackAllocNode : ExpressionNode {
+
+        private ParseNode _type;
+        private ParseNode _numberOfElements;
+
+        public StackAllocNode(Token token, ParseNode type, ParseNode numberOfElements)
+            : base(ParseNodeType.StackAlloc, token) {
+            _type = GetParentedNode(type);
+            _numberOfElements = GetParentedNode(numberOfElements);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/ThisNode.cs b/src/Core/Compiler/CodeModel/Expressions/ThisNode.cs
new file mode 100644
index 000000000..775e20c5f
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/ThisNode.cs
@@ -0,0 +1,17 @@
+// ThisNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class ThisNode : ExpressionNode {
+
+        public ThisNode(Token token)
+            : base(ParseNodeType.This, token) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/TypeofNode.cs b/src/Core/Compiler/CodeModel/Expressions/TypeofNode.cs
new file mode 100644
index 000000000..93c712982
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/TypeofNode.cs
@@ -0,0 +1,26 @@
+// TypeofNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class TypeofNode : ExpressionNode {
+
+        private ParseNode _typeReference;
+
+        public TypeofNode(Token op, ParseNode typeReference)
+            : base(ParseNodeType.Typeof, op) {
+            _typeReference = GetParentedNode(typeReference);
+        }
+
+        public ParseNode TypeReference {
+            get {
+                return _typeReference;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/UnaryExpressionNode.cs b/src/Core/Compiler/CodeModel/Expressions/UnaryExpressionNode.cs
new file mode 100644
index 000000000..c45f4c3b0
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/UnaryExpressionNode.cs
@@ -0,0 +1,32 @@
+// UnaryExpressionNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class UnaryExpressionNode : ExpressionNode {
+
+        private ParseNode _child;
+
+        public UnaryExpressionNode(Token op, ParseNode child)
+            : base(ParseNodeType.UnaryExpression, op) {
+            _child = GetParentedNode(child);
+        }
+
+        public ParseNode Child {
+            get {
+                return _child;
+            }
+        }
+
+        public TokenType Operator {
+            get {
+                return Token.Type;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Expressions/VariableInitializerNode.cs b/src/Core/Compiler/CodeModel/Expressions/VariableInitializerNode.cs
new file mode 100644
index 000000000..20ca37883
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Expressions/VariableInitializerNode.cs
@@ -0,0 +1,34 @@
+// VariableInitializerNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class VariableInitializerNode : ExpressionNode {
+
+        private AtomicNameNode _name;
+        private ParseNode _value;
+
+        public VariableInitializerNode(AtomicNameNode name, ParseNode value)
+            : base(ParseNodeType.VariableDeclarator, name.token) {
+            _name = (AtomicNameNode)GetParentedNode(name);
+            _value = GetParentedNode(value);
+        }
+
+        public AtomicNameNode Name {
+            get {
+                return _name;
+            }
+        }
+
+        public ParseNode Value {
+            get {
+                return _value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/IParseNodeHandler.cs b/src/Core/Compiler/CodeModel/IParseNodeHandler.cs
new file mode 100644
index 000000000..849add56e
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/IParseNodeHandler.cs
@@ -0,0 +1,22 @@
+// IParseNodeHandler.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.CodeModel {
+
+    internal interface IParseNodeHandler {
+
+        bool RequiresChildrenGrouping {
+            get;
+        }
+
+        bool HandleNode(ParseNode node, object context);
+
+        void StartChildren(string identifier);
+
+        void EndChildren();
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/AccessorNode.cs b/src/Core/Compiler/CodeModel/Members/AccessorNode.cs
new file mode 100644
index 000000000..fc7c12174
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/AccessorNode.cs
@@ -0,0 +1,51 @@
+// AccessorNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class AccessorNode : ParseNode {
+
+        private AtomicNameNode _name;
+        private BlockStatementNode _implementation;
+        private ParseNodeList _attributes;
+        private Modifiers _modifiers;
+
+        public AccessorNode(Token token,
+                            ParseNodeList attributes,
+                            AtomicNameNode name,
+                            BlockStatementNode body,
+                            Modifiers modifiers)
+            : base(ParseNodeType.AccessorDeclaration, token) {
+            _name = (AtomicNameNode)GetParentedNode(name);
+            _implementation = (BlockStatementNode)GetParentedNode(body);
+            _attributes = GetParentedNodeList(attributes);
+            _modifiers = modifiers;
+        }
+
+        public BlockStatementNode Implementation {
+            get {
+                return _implementation;
+            }
+        }
+
+        public Modifiers Modifiers {
+            get {
+                return _modifiers;
+            }
+        }
+
+        public AccessorType Type {
+            get {
+                if (_name.Name.Equals("get")) {
+                    return AccessorType.Get;
+                }
+                return AccessorType.Set;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/AccessorType.cs b/src/Core/Compiler/CodeModel/Members/AccessorType.cs
new file mode 100644
index 000000000..12cf67148
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/AccessorType.cs
@@ -0,0 +1,16 @@
+// Accessor.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.CodeModel {
+
+    internal enum AccessorType {
+
+        Get = 0,
+
+        Set = 1
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/ConstantFieldDeclarationNode.cs b/src/Core/Compiler/CodeModel/Members/ConstantFieldDeclarationNode.cs
new file mode 100644
index 000000000..5d2985936
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/ConstantFieldDeclarationNode.cs
@@ -0,0 +1,22 @@
+// ConstantFieldDeclarationNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal class ConstantFieldDeclarationNode : FieldDeclarationNode {
+
+        public ConstantFieldDeclarationNode(Token token,
+                                            ParseNodeList attributes,
+                                            Modifiers modifiers,
+                                            ParseNode type,
+                                            ParseNodeList initializers)
+            : base(ParseNodeType.ConstFieldDeclaration, token, attributes, modifiers, type, initializers, false) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/ConstructorDeclarationNode.cs b/src/Core/Compiler/CodeModel/Members/ConstructorDeclarationNode.cs
new file mode 100644
index 000000000..0986ec71d
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/ConstructorDeclarationNode.cs
@@ -0,0 +1,42 @@
+// ConstructorDeclarationNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class ConstructorDeclarationNode : MethodDeclarationNode {
+
+        private bool _callBase;
+        private ParseNode _baseArguments;
+
+        public ConstructorDeclarationNode(Token token,
+                                          ParseNodeList attributes,
+                                          Modifiers modifiers,
+                                          AtomicNameNode name,
+                                          ParseNodeList formals,
+                                          bool callBase,
+                                          ParseNode baseArguments,
+                                          BlockStatementNode body)
+            : base(ParseNodeType.ConstructorDeclaration, token, attributes, modifiers, /* return type */ null, name, formals, body) {
+            _callBase = callBase;
+            _baseArguments = GetParentedNode(baseArguments);
+        }
+
+        public ParseNode BaseArguments {
+            get {
+                return _baseArguments;
+            }
+        }
+
+        public bool CallBase {
+            get {
+                return _callBase;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/DestructorDeclarationNode.cs b/src/Core/Compiler/CodeModel/Members/DestructorDeclarationNode.cs
new file mode 100644
index 000000000..b798090c8
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/DestructorDeclarationNode.cs
@@ -0,0 +1,23 @@
+// DestructorDeclarationNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class DestructorDeclarationNode : MethodDeclarationNode {
+
+        public DestructorDeclarationNode(Token token,
+                                         ParseNodeList attributes,
+                                         Modifiers modifiers,
+                                         AtomicNameNode name,
+                                         BlockStatementNode body)
+            : base(ParseNodeType.DestructorDeclaration, token, attributes, modifiers, /* return type */ null, name, new ParseNodeList(), body) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/EnumerationFieldNode.cs b/src/Core/Compiler/CodeModel/Members/EnumerationFieldNode.cs
new file mode 100644
index 000000000..695c46ed6
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/EnumerationFieldNode.cs
@@ -0,0 +1,83 @@
+// EnumerationFieldNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal class EnumerationFieldNode : MemberNode {
+
+        private ParseNodeList _attributes;
+        private AtomicNameNode _name;
+        private object _value;
+
+        public EnumerationFieldNode(ParseNodeList attributes, AtomicNameNode name,
+                                    ParseNode value)
+            : base(ParseNodeType.EnumerationFieldDeclaration, name.token) {
+            _attributes = GetParentedNodeList(AttributeNode.GetAttributeList(attributes));
+            _name = (AtomicNameNode)GetParentedNode(name);
+
+            if (value is LiteralNode) {
+                LiteralNode literalNode = (LiteralNode)value;
+                _value = ((LiteralToken)literalNode.Token).LiteralValue;
+            }
+            else {
+                // TODO: Clearly we need something more general...
+                //       C# allows expressions. Likely expressions to be used
+                //       include negative values, binary OR'd values,
+                //       expressions involving other enum members (esp. hard to deal with)
+                // For now, just adding support for negative numbers, as
+                // everything else can be worked around in source code.
+
+                UnaryExpressionNode expressionNode = value as UnaryExpressionNode;
+                if ((expressionNode != null) && (expressionNode.Operator == TokenType.Minus) &&
+                    (expressionNode.Child is LiteralNode)) {
+
+                    try {
+                        LiteralToken literalToken =
+                            (LiteralToken)((LiteralNode)expressionNode.Child).Token;
+                        int numericValue = (int)Convert.ChangeType(literalToken.LiteralValue, typeof(int));
+
+                        _value = -numericValue;
+                    }
+                    catch {
+                    }
+                }
+            }
+        }
+
+        public override ParseNodeList Attributes {
+            get {
+                return _attributes;
+            }
+        }
+
+        public override Modifiers Modifiers {
+            get {
+                return Modifiers.Public;
+            }
+        }
+
+        public override string Name {
+            get {
+                return _name.Name;
+            }
+        }
+
+        public override ParseNode Type {
+            get {
+                return null;
+            }
+        }
+
+        public object Value {
+            get {
+                return _value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/EventDeclarationNode.cs b/src/Core/Compiler/CodeModel/Members/EventDeclarationNode.cs
new file mode 100644
index 000000000..779772f56
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/EventDeclarationNode.cs
@@ -0,0 +1,98 @@
+// EventDeclarationNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class EventDeclarationNode : MemberNode {
+
+        private ParseNodeList _attributes;
+        private ParseNode _implementationMember;
+
+        public EventDeclarationNode(Token token, ParseNodeList attributes, ParseNode backingMember)
+            : base(ParseNodeType.EventDeclaration, token) {
+            _attributes = GetParentedNodeList(AttributeNode.GetAttributeList(attributes));
+            _implementationMember = GetParentedNode(backingMember);
+        }
+
+        public override ParseNodeList Attributes {
+            get {
+                return _attributes;
+            }
+        }
+
+        public bool IsField {
+            get {
+                return (_implementationMember is VariableDeclarationNode);
+            }
+        }
+
+        public FieldDeclarationNode Field {
+            get {
+                VariableDeclarationNode variableNode = _implementationMember as VariableDeclarationNode;
+                if (variableNode != null) {
+                    return new FieldDeclarationNode(variableNode.Token, new ParseNodeList(), variableNode.Modifiers, variableNode.Type, variableNode.Initializers, false);
+                }
+                return null;
+            }
+        }
+
+        public override Modifiers Modifiers {
+            get {
+                if (_implementationMember is VariableDeclarationNode) {
+                    VariableDeclarationNode variableNode = (VariableDeclarationNode)_implementationMember;
+                    return variableNode.Modifiers;
+                }
+                else {
+                    Debug.Assert(_implementationMember is PropertyDeclarationNode);
+
+                    return ((PropertyDeclarationNode)_implementationMember).Modifiers;
+                }
+            }
+        }
+
+        public override string Name {
+            get {
+                if (_implementationMember is VariableDeclarationNode) {
+                    VariableDeclarationNode variableNode = (VariableDeclarationNode)_implementationMember;
+
+                    Debug.Assert(variableNode.Initializers.Count == 1);
+                    Debug.Assert(variableNode.Initializers[0] is VariableInitializerNode);
+                    VariableInitializerNode initializerNode = (VariableInitializerNode)variableNode.Initializers[0];
+
+                    return initializerNode.Name.Name;
+                }
+                else {
+                    Debug.Assert(_implementationMember is PropertyDeclarationNode);
+
+                    return ((PropertyDeclarationNode)_implementationMember).Name;
+                }
+            }
+        }
+
+        public PropertyDeclarationNode Property {
+            get {
+                return _implementationMember as PropertyDeclarationNode;
+            }
+        }
+
+        public override ParseNode Type {
+            get {
+                if (_implementationMember is VariableDeclarationNode) {
+                    VariableDeclarationNode variableNode = (VariableDeclarationNode)_implementationMember;
+                    return variableNode.Type;
+                }
+                else {
+                    Debug.Assert(_implementationMember is PropertyDeclarationNode);
+
+                    return ((PropertyDeclarationNode)_implementationMember).Type;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/FieldDeclarationNode.cs b/src/Core/Compiler/CodeModel/Members/FieldDeclarationNode.cs
new file mode 100644
index 000000000..27a059b1a
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/FieldDeclarationNode.cs
@@ -0,0 +1,82 @@
+// FieldDeclarationNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal class FieldDeclarationNode : MemberNode {
+
+        private ParseNodeList _attributes;
+        private Modifiers _modifiers;
+        private ParseNode _type;
+        private ParseNodeList _initializers;
+        private bool _isFixed;
+
+        public FieldDeclarationNode(Token token,
+                                    ParseNodeList attributes,
+                                    Modifiers modifiers,
+                                    ParseNode type,
+                                    ParseNodeList initializers,
+                                    bool isFixed)
+            : this(ParseNodeType.FieldDeclaration, token, attributes, modifiers, type, initializers, isFixed) {
+        }
+
+        protected FieldDeclarationNode(ParseNodeType nodeType, Token token,
+                                       ParseNodeList attributes,
+                                       Modifiers modifiers,
+                                       ParseNode type,
+                                       ParseNodeList initializers,
+                                       bool isFixed)
+            : base(nodeType, token) {
+            _attributes = GetParentedNodeList(AttributeNode.GetAttributeList(attributes));
+            _modifiers = modifiers;
+            _type = GetParentedNode(type);
+            _initializers = GetParentedNodeList(initializers);
+            _isFixed = isFixed;
+        }
+
+        public override ParseNodeList Attributes {
+            get {
+                return _attributes;
+            }
+        }
+
+        public ParseNodeList Initializers {
+            get {
+                return _initializers;
+            }
+        }
+
+        public bool IsFixed {
+            get {
+                return _isFixed;
+            }
+        }
+
+        public override Modifiers Modifiers {
+            get {
+                return _modifiers;
+            }
+        }
+
+        public override string Name {
+            get {
+                Debug.Assert(_initializers.Count == 1);
+                Debug.Assert(_initializers[0] is VariableInitializerNode);
+
+                VariableInitializerNode variableNode = (VariableInitializerNode)_initializers[0];
+                return variableNode.Name.Name;
+            }
+        }
+
+        public override ParseNode Type {
+            get {
+                return _type;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/IndexerDeclarationNode.cs b/src/Core/Compiler/CodeModel/Members/IndexerDeclarationNode.cs
new file mode 100644
index 000000000..990e6ff3b
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/IndexerDeclarationNode.cs
@@ -0,0 +1,40 @@
+// IndexerDeclarationNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class IndexerDeclarationNode : PropertyDeclarationNode {
+
+        private ParseNodeList _parameters;
+
+        public IndexerDeclarationNode(Token token,
+                                      ParseNodeList attributes,
+                                      Modifiers modifiers,
+                                      ParseNode type,
+                                      NameNode interfaceType,
+                                      ParseNodeList parameters,
+                                      AccessorNode get,
+                                      AccessorNode set)
+            : base(ParseNodeType.IndexerDeclaration, token, attributes, modifiers, type, interfaceType, get, set) {
+
+            _parameters = GetParentedNodeList(parameters);
+        }
+
+        public override string Name {
+            get {
+                return "Item";
+            }
+        }
+
+        public ParseNodeList Parameters {
+            get {
+                return _parameters;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/MemberNode.cs b/src/Core/Compiler/CodeModel/Members/MemberNode.cs
new file mode 100644
index 000000000..83a893c51
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/MemberNode.cs
@@ -0,0 +1,33 @@
+// MemberNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal abstract class MemberNode : ParseNode {
+
+        protected MemberNode(ParseNodeType nodeType, Token token)
+            : base(nodeType, token) {
+        }
+
+        public abstract ParseNodeList Attributes {
+            get;
+        }
+
+        public abstract Modifiers Modifiers {
+            get;
+        }
+
+        public abstract string Name {
+            get;
+        }
+
+        public abstract ParseNode Type {
+            get;
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/MethodDeclarationNode.cs b/src/Core/Compiler/CodeModel/Members/MethodDeclarationNode.cs
new file mode 100644
index 000000000..944e46dc1
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/MethodDeclarationNode.cs
@@ -0,0 +1,98 @@
+// MethodDeclarationNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal class MethodDeclarationNode : MemberNode {
+
+        private ParseNodeList _attributes;
+        private Modifiers _modifiers;
+        private ParseNode _returnType;
+        private NameNode _interfaceType;
+        private AtomicNameNode _name;
+        private ParseNodeList _typeParameters;
+        private ParseNodeList _parameters;
+        private ParseNodeList _constraints;
+        private BlockStatementNode _implementation;
+
+        public MethodDeclarationNode(Token token,
+                                     ParseNodeList attributes,
+                                     Modifiers modifiers,
+                                     ParseNode returnType,
+                                     NameNode interfaceType,
+                                     AtomicNameNode name,
+                                     ParseNodeList typeParameters,
+                                     ParseNodeList formals,
+                                     ParseNodeList constraints,
+                                     BlockStatementNode body)
+            : this(ParseNodeType.MethodDeclaration, token, attributes, modifiers, returnType, name, formals, body) {
+            _interfaceType = (NameNode)GetParentedNode(interfaceType);
+            _typeParameters = GetParentedNodeList(typeParameters);
+            _constraints = GetParentedNodeList(constraints);
+        }
+
+        protected MethodDeclarationNode(ParseNodeType nodeType, Token token,
+                                        ParseNodeList attributes,
+                                        Modifiers modifiers,
+                                        ParseNode returnType,
+                                        AtomicNameNode name,
+                                        ParseNodeList formals,
+                                        BlockStatementNode body)
+            : base(nodeType, token) {
+            _attributes = GetParentedNodeList(AttributeNode.GetAttributeList(attributes));
+            _modifiers = modifiers;
+            _returnType = GetParentedNode(returnType);
+            _name = (AtomicNameNode)GetParentedNode(name);
+            _parameters = GetParentedNodeList(formals);
+            _implementation = (BlockStatementNode)GetParentedNode(body);
+        }
+
+        public override ParseNodeList Attributes {
+            get {
+                return _attributes;
+            }
+        }
+
+        public BlockStatementNode Implementation {
+            get {
+                return _implementation;
+            }
+        }
+
+        public ParseNode InterfaceType {
+            get {
+                return _interfaceType;
+            }
+        }
+
+        public override Modifiers Modifiers {
+            get {
+                return _modifiers;
+            }
+        }
+
+        public override string Name {
+            get {
+                return _name.Name;
+            }
+        }
+
+        public ParseNodeList Parameters {
+            get {
+                return _parameters;
+            }
+        }
+
+        public override ParseNode Type {
+            get {
+                return _returnType;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/OperatorDeclarationNode.cs b/src/Core/Compiler/CodeModel/Members/OperatorDeclarationNode.cs
new file mode 100644
index 000000000..59969e36a
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/OperatorDeclarationNode.cs
@@ -0,0 +1,27 @@
+// OperatorDeclarationNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class OperatorDeclarationNode : MethodDeclarationNode {
+
+        public TokenType operatorTokenType;
+
+        public OperatorDeclarationNode(Token token,
+                                       ParseNodeList attributes,
+                                       Modifiers modifiers,
+                                       TokenType operatorNodeType,
+                                       ParseNode returnType,
+                                       ParseNodeList formals,
+                                       BlockStatementNode body)
+            : base(ParseNodeType.OperatorDeclaration, token, attributes, modifiers, returnType, /* name */ null, formals, body) {
+            this.operatorTokenType = operatorNodeType;
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/ParameterFlags.cs b/src/Core/Compiler/CodeModel/Members/ParameterFlags.cs
new file mode 100644
index 000000000..c22394ac9
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/ParameterFlags.cs
@@ -0,0 +1,23 @@
+// ParameterFlags.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.CodeModel {
+
+    /// <summary>
+    /// Modifiers on a formal parameter.
+    /// </summary>
+    internal enum ParameterFlags {
+
+        None,
+
+        Ref,
+
+        Out,
+
+        Params
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/ParameterNode.cs b/src/Core/Compiler/CodeModel/Members/ParameterNode.cs
new file mode 100644
index 000000000..3200f8feb
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/ParameterNode.cs
@@ -0,0 +1,54 @@
+// ParameterNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class ParameterNode : ParseNode {
+
+        private ParseNodeList _attributes;
+        private ParameterFlags _flags;
+        private ParseNode _type;
+        private AtomicNameNode _name;
+
+        public ParameterNode(Token token,
+                                   ParseNodeList attributes,
+                                   ParameterFlags flags,
+                                   ParseNode type,
+                                   AtomicNameNode name)
+            : base(ParseNodeType.FormalParameter, token) {
+            _attributes = GetParentedNodeList(AttributeNode.GetAttributeList(attributes));
+            _flags = flags;
+            _type = GetParentedNode(type);
+            _name = (AtomicNameNode)GetParentedNode(name);
+        }
+
+        public ParseNodeList Attributes {
+            get {
+                return _attributes;
+            }
+        }
+
+        public ParameterFlags Flags {
+            get {
+                return _flags;
+            }
+        }
+
+        public string Name {
+            get {
+                return _name.Name;
+            }
+        }
+
+        public ParseNode Type {
+            get {
+                return _type;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Members/PropertyDeclarationNode.cs b/src/Core/Compiler/CodeModel/Members/PropertyDeclarationNode.cs
new file mode 100644
index 000000000..d063ee522
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Members/PropertyDeclarationNode.cs
@@ -0,0 +1,99 @@
+// PropertyDeclarationNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal class PropertyDeclarationNode : MemberNode {
+
+        private ParseNodeList _attributes;
+        private Modifiers _modifiers;
+        private ParseNode _type;
+        private NameNode _interfaceType;
+        private NameNode _name;
+        private AccessorNode _getOrRemove;
+        private AccessorNode _setOrAdd;
+
+        public PropertyDeclarationNode(Token token,
+                                       ParseNodeList attributes,
+                                       Modifiers modifiers,
+                                       ParseNode type,
+                                       NameNode interfaceType,
+                                       AtomicNameNode name,
+                                       AccessorNode getOrRemove,
+                                       AccessorNode setOrAdd)
+            : this(ParseNodeType.PropertyDeclaration, token, attributes, modifiers, type, interfaceType, getOrRemove, setOrAdd) {
+            _name = (AtomicNameNode)GetParentedNode(name);
+        }
+
+        protected PropertyDeclarationNode(ParseNodeType nodeType, Token token,
+                                          ParseNodeList attributes,
+                                          Modifiers modifiers,
+                                          ParseNode type,
+                                          NameNode interfaceType,
+                                          AccessorNode getOrRemove,
+                                          AccessorNode setOrAdd)
+            : base(nodeType, token) {
+            _attributes = GetParentedNodeList(AttributeNode.GetAttributeList(attributes));
+            _modifiers = modifiers;
+            _type = GetParentedNode(type);
+            _interfaceType = (NameNode)GetParentedNode(interfaceType);
+            _getOrRemove = (AccessorNode)GetParentedNode(getOrRemove);
+            _setOrAdd = (AccessorNode)GetParentedNode(setOrAdd);
+        }
+
+        public override ParseNodeList Attributes {
+            get {
+                return _attributes;
+            }
+        }
+
+        public AccessorNode GetAccessor {
+            get {
+                return _getOrRemove;
+            }
+        }
+
+        public ParseNode InterfaceType {
+            get {
+                return _interfaceType;
+            }
+        }
+
+        public override Modifiers Modifiers {
+            get {
+                return _modifiers;
+            }
+        }
+
+        public override string Name {
+            get {
+                Debug.Assert(_name != null);
+                return _name.Name;
+            }
+        }
+
+        public NameNode NameNode {
+            get {
+                return _name;
+            }
+        }
+
+        public AccessorNode SetAccessor {
+            get {
+                return _setOrAdd;
+            }
+        }
+
+        public override ParseNode Type {
+            get {
+                return _type;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Modifiers.cs b/src/Core/Compiler/CodeModel/Modifiers.cs
new file mode 100644
index 000000000..0f4634070
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Modifiers.cs
@@ -0,0 +1,54 @@
+// Modifiers.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.CodeModel {
+
+    /// <summary>
+    /// Modifiers for types and their _members.
+    /// </summary>
+    [Flags]
+    internal enum Modifiers {
+        None = 0x0000,
+
+        Abstract = 0x0001,
+        Sealed = 0x0002,
+
+        Public = 0x0004,
+        Internal = 0x0008,
+        Private = 0x0010,
+        Protected = 0x0020,
+        AccessMask = Public | Internal | Protected | Private,
+
+        New = 0x0040,
+        Virtual = 0x0080,
+        Static = 0x0100,
+        Readonly = 0x0200,
+        Extern = 0x0400,
+        Override = 0x0800,
+        Unsafe = 0x1000,
+        Volatile = 0x2000,
+        Partial = 0x4000,
+
+        // valid flags by member type
+        ClassModifiers = New | AccessMask | Abstract | Sealed | Static | Unsafe | Partial,
+        ConstantModifiers = New | AccessMask | Unsafe,
+        FieldModifiers = New | AccessMask | Static | Readonly | Unsafe | Volatile,
+        MethodModifiers = New | AccessMask | Static | Virtual | Sealed | Override | Abstract | Extern | Unsafe,
+        PropertyModifiers = New | AccessMask | Static | Virtual | Sealed | Override | Abstract | Extern | Unsafe,
+        EventModifiers = New | AccessMask | Static | Virtual | Sealed | Override | Abstract | Extern | Unsafe,
+        IndexerModifiers = New | AccessMask | Static | Virtual | Sealed | Override | Abstract | Extern | Unsafe,
+        OperatorModifiers = Public | Static | Extern | Unsafe,
+        ConstructorModifiers = AccessMask | Extern | Unsafe,
+        StaticConstructorModifiers = Static | Extern | Unsafe,
+        DestructorModifiers = Extern | Unsafe,
+        StructModifiers = New | AccessMask | Unsafe | Partial,
+        InterfaceModifiers = New | AccessMask | Unsafe | Partial,
+        EnumModifiers = New | AccessMask,
+        DelegateModifiers = New | AccessMask | Unsafe,
+        PartialModifiers = AccessMask | Abstract | Sealed | Static
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Names/AliasQualifiedNameNode.cs b/src/Core/Compiler/CodeModel/Names/AliasQualifiedNameNode.cs
new file mode 100644
index 000000000..678cb7034
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Names/AliasQualifiedNameNode.cs
@@ -0,0 +1,30 @@
+// AliasQualifiedNameNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Text;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class AliasQualifiedNameNode : NameNode {
+
+        private AtomicNameNode _aliasName;
+        private NameNode _name;
+
+        public AliasQualifiedNameNode(AtomicNameNode left, NameNode right)
+            : base(ParseNodeType.AliasQualifiedName, left.token) {
+            _aliasName = (AtomicNameNode)GetParentedNode(left);
+            _name = (NameNode)GetParentedNode(right);
+        }
+
+        protected sealed override ParseNodeList List {
+            get {
+                return new ParseNodeList(this);
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Names/AtomicNameNode.cs b/src/Core/Compiler/CodeModel/Names/AtomicNameNode.cs
new file mode 100644
index 000000000..022795a8f
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Names/AtomicNameNode.cs
@@ -0,0 +1,37 @@
+// AtomicNameNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal class AtomicNameNode : NameNode {
+
+        private IdentifierToken _identifier;
+
+        public AtomicNameNode(IdentifierToken identifier)
+            : this(ParseNodeType.Name, identifier) {
+        }
+
+        protected AtomicNameNode(ParseNodeType nodeType, IdentifierToken identifier)
+            : base(nodeType, identifier) {
+            _identifier = identifier;
+        }
+
+        public IdentifierToken Identifier {
+            get {
+                return _identifier;
+            }
+        }
+
+        protected sealed override ParseNodeList List {
+            get {
+                return new ParseNodeList(this);
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Names/GenericNameNode.cs b/src/Core/Compiler/CodeModel/Names/GenericNameNode.cs
new file mode 100644
index 000000000..406843c0c
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Names/GenericNameNode.cs
@@ -0,0 +1,27 @@
+// GenericNameNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class GenericNameNode : AtomicNameNode {
+
+        private ParseNodeList _typeArguments;
+
+        public GenericNameNode(IdentifierToken name, ParseNodeList typeArguments)
+            : base(ParseNodeType.GenericName, name) {
+            _typeArguments = typeArguments;
+        }
+
+        public ParseNodeList TypeArguments {
+            get {
+                return _typeArguments;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Names/MultiPartNameNode.cs b/src/Core/Compiler/CodeModel/Names/MultiPartNameNode.cs
new file mode 100644
index 000000000..5d42efabf
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Names/MultiPartNameNode.cs
@@ -0,0 +1,27 @@
+// MultiPartNameNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class MultiPartNameNode : NameNode {
+
+        private ParseNodeList _names;
+
+        public MultiPartNameNode(Token token, ParseNodeList names)
+            : base(ParseNodeType.MultiPartName, token) {
+            _names = GetParentedNodeList(names);
+        }
+
+        protected sealed override ParseNodeList List {
+            get {
+                return _names;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Names/NameNode.cs b/src/Core/Compiler/CodeModel/Names/NameNode.cs
new file mode 100644
index 000000000..5f2ee5ce0
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Names/NameNode.cs
@@ -0,0 +1,42 @@
+// NameNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Text;
+
+namespace ScriptSharp.CodeModel {
+
+    internal abstract class NameNode : ParseNode {
+
+        private string _name;
+
+        protected NameNode(ParseNodeType nodeType, Token token)
+            : base(nodeType, token) {
+        }
+
+        protected abstract ParseNodeList List {
+            get;
+        }
+
+        public string Name {
+            get {
+                if (_name == null) {
+                    StringBuilder sb = new StringBuilder();
+                    foreach (AtomicNameNode symbolNode in List) {
+                        if (sb.Length != 0) {
+                            sb.Append('.');
+                        }
+                        sb.Append(symbolNode.Identifier);
+                    }
+
+                    _name = sb.ToString();
+                }
+                return _name;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/ParseNode.cs b/src/Core/Compiler/CodeModel/ParseNode.cs
new file mode 100644
index 000000000..a91557306
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/ParseNode.cs
@@ -0,0 +1,64 @@
+// ParseNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    /// <summary>
+    /// The root of the parse tree hierarchy.
+    /// Note that any ParseNode can be treated as a ListTree.
+    /// A null value corresponds to an empty list. A non-ListTree
+    /// ParseNode is a list of 1 element. While a ListTree is used
+    /// for lists containing more than 1 element.
+    /// </summary>
+    internal abstract class ParseNode {
+
+        public ParseNodeType nodeType;
+        public Token token;
+        public ParseNode parent;
+
+        protected ParseNode(ParseNodeType nodeType, Token token) {
+            this.nodeType = nodeType;
+            this.token = token;
+        }
+
+        public ParseNodeType NodeType {
+            get {
+                return nodeType;
+            }
+        }
+
+        public ParseNode Parent {
+            get {
+                return parent;
+            }
+        }
+
+        public Token Token {
+            get {
+                return token;
+            }
+        }
+
+        protected ParseNode GetParentedNode(ParseNode child) {
+            if (child != null) {
+                child.SetParent(this);
+            }
+            return child;
+        }
+
+        protected ParseNodeList GetParentedNodeList(ParseNodeList nodeList) {
+            nodeList.SetParent(this);
+            return nodeList;
+        }
+
+        internal void SetParent(ParseNode node) {
+            parent = node;
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/ParseNodeList.cs b/src/Core/Compiler/CodeModel/ParseNodeList.cs
new file mode 100644
index 000000000..d35720329
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/ParseNodeList.cs
@@ -0,0 +1,119 @@
+// ParseNodeList.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class ParseNodeList : IEnumerable {
+
+        private ArrayList _list;
+
+        public ParseNodeList() {
+        }
+
+        public ParseNodeList(ParseNode node) {
+            Append(node);
+        }
+
+        public int Count {
+            get {
+                if (_list == null) {
+                    return 0;
+                }
+                else {
+                    return _list.Count;
+                }
+            }
+        }
+
+        public ParseNode this[int index] {
+            get {
+                return (ParseNode)_list[index];
+            }
+        }
+
+        public void Append(ParseNode node) {
+            if (node != null) {
+                EnsureListCreated();
+                _list.Add(node);
+            }
+        }
+
+        public void Append(ParseNodeList nodes) {
+            EnsureListCreated();
+            _list.AddRange(nodes._list);
+        }
+
+        private void EnsureListCreated() {
+            if (_list == null) {
+                _list = new ArrayList();
+            }
+        }
+
+        public ParseNodeEnumerator GetEnumerator() {
+            return new ParseNodeEnumerator(this);
+        }
+
+        internal void SetParent(ParseNode parent) {
+            if (_list != null) {
+                _list.TrimToSize();
+                foreach (ParseNode child in this) {
+                    child.SetParent(parent);
+                }
+            }
+        }
+
+        #region Implementation of IEnumerable
+        IEnumerator IEnumerable.GetEnumerator() {
+            return GetEnumerator();
+        }
+        #endregion
+
+
+        public sealed class ParseNodeEnumerator : IEnumerator {
+
+            private ArrayList _list;
+            private int _current;
+
+            public ParseNodeEnumerator(ParseNodeList nodes) {
+                _list = nodes._list;
+            }
+
+            public ParseNode Current {
+                get {
+                    return (ParseNode)_list[_current - 1];
+                }
+            }
+
+            public bool MoveNext() {
+                if ((_list != null) && (_current < _list.Count)) {
+                    _current += 1;
+                    return true;
+                }
+
+                return false;
+            }
+
+            #region Implementation of IEnumerator
+            object IEnumerator.Current {
+                get {
+                    return Current;
+                }
+            }
+
+            bool IEnumerator.MoveNext() {
+                return MoveNext();
+            }
+
+            void IEnumerator.Reset() {
+                _current = 0;
+            }
+            #endregion
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/ParseNodeType.cs b/src/Core/Compiler/CodeModel/ParseNodeType.cs
new file mode 100644
index 000000000..f129815ff
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/ParseNodeType.cs
@@ -0,0 +1,92 @@
+// ParseNodeType.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.CodeModel {
+
+    /// <summary>
+    /// List of parse node types.
+    /// </summary>
+    internal enum ParseNodeType {
+        CompilationUnit,
+        Namespace,
+        UsingNamespace,
+        UsingAlias,
+        Name,
+        PredefinedType,
+        Type,
+        Delegate,
+        PointerType,
+        ArrayType,
+        FormalParameter,
+        EnumerationFieldDeclaration,
+        VariableDeclarator,
+        FieldDeclaration,
+        ConstFieldDeclaration,
+        VariableDeclaration,
+        ConstDeclaration,
+        PropertyDeclaration,
+        AccessorDeclaration,
+        IndexerDeclaration,
+        EventDeclaration,
+        MethodDeclaration,
+        OperatorDeclaration,
+        ConstructorDeclaration,
+        DestructorDeclaration,
+        Block,
+        EmptyStatement,
+        IfElse,
+        Switch,
+        CaseLabel,
+        DefaultLabel,
+        SwitchSection,
+        For,
+        While,
+        DoWhile,
+        Foreach,
+        Break,
+        Continue,
+        Goto,
+        Return,
+        Throw,
+        Try,
+        Catch,
+        Checked,
+        Unchecked,
+        Using,
+        Lock,
+        ExpressionStatement,
+        LabeledStatement,
+        Conditional,
+        BinaryExpression,
+        UnaryExpression,
+        Typeof,
+        Cast,
+        New,
+        ArrayNew,
+        This,
+        Base,
+        Sizeof,
+        Literal,
+        AttributeBlock,
+        Attribute,
+        Fixed,
+        StackAlloc,
+        ArrayInitializer,
+        MultiPartName,
+        ExpressionList,
+        UnsafeStatement,
+        YieldReturn,
+        YieldBreak,
+        ExternAlias,
+        AnonymousMethod,
+        AliasQualifiedName,
+        TypeParameter,
+        ConstraintClause,
+        DefaultValueExpression,
+        GenericName,
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/BlockStatementNode.cs b/src/Core/Compiler/CodeModel/Statements/BlockStatementNode.cs
new file mode 100644
index 000000000..3ac3e9540
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/BlockStatementNode.cs
@@ -0,0 +1,26 @@
+// BlockStatementNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class BlockStatementNode : StatementNode {
+
+        private ParseNodeList _statements;
+
+        public BlockStatementNode(Token token, ParseNodeList statements)
+            : base(ParseNodeType.Block, token) {
+            _statements = GetParentedNodeList(statements);
+        }
+
+        public ParseNodeList Statements {
+            get {
+                return _statements;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/BreakNode.cs b/src/Core/Compiler/CodeModel/Statements/BreakNode.cs
new file mode 100644
index 000000000..bfef9ad00
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/BreakNode.cs
@@ -0,0 +1,17 @@
+// BreakNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class BreakNode : StatementNode {
+
+        public BreakNode(Token token)
+            : base(ParseNodeType.Break, token) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/CaseLabelNode.cs b/src/Core/Compiler/CodeModel/Statements/CaseLabelNode.cs
new file mode 100644
index 000000000..84dafdf99
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/CaseLabelNode.cs
@@ -0,0 +1,26 @@
+// CaseLabelNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class CaseLabelNode : StatementNode {
+
+        private ParseNode _value;
+
+        public CaseLabelNode(Token token, ParseNode value)
+            : base(ParseNodeType.CaseLabel, token) {
+            _value = GetParentedNode(value);
+        }
+
+        public ParseNode Value {
+            get {
+                return _value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/CatchNode.cs b/src/Core/Compiler/CodeModel/Statements/CatchNode.cs
new file mode 100644
index 000000000..5df1f012e
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/CatchNode.cs
@@ -0,0 +1,44 @@
+// CatchNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class CatchNode : StatementNode {
+
+        private ParseNode _type;
+        private ParseNode _body;
+        private AtomicNameNode _name;
+
+        public CatchNode(Token token, ParseNode type,
+                         AtomicNameNode name,
+                         ParseNode body)
+            : base(ParseNodeType.Catch, token) {
+            _type = GetParentedNode(type);
+            _name = (AtomicNameNode)GetParentedNode(name);
+            _body = GetParentedNode(body);
+        }
+
+        public ParseNode Body {
+            get {
+                return _body;
+            }
+        }
+
+        public AtomicNameNode Name {
+            get {
+                return _name;
+            }
+        }
+
+        public ParseNode Type {
+            get {
+                return _type;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/CheckedNode.cs b/src/Core/Compiler/CodeModel/Statements/CheckedNode.cs
new file mode 100644
index 000000000..916188974
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/CheckedNode.cs
@@ -0,0 +1,21 @@
+// CheckedNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class CheckedNode : StatementNode {
+
+        private BlockStatementNode _body;
+
+        public CheckedNode(Token token, BlockStatementNode body)
+            : base(ParseNodeType.Checked, token) {
+            _body = (BlockStatementNode)GetParentedNode(body);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/ConstantDeclarationNode.cs b/src/Core/Compiler/CodeModel/Statements/ConstantDeclarationNode.cs
new file mode 100644
index 000000000..d29f8b761
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/ConstantDeclarationNode.cs
@@ -0,0 +1,21 @@
+// ConstantDeclarationNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal class ConstantDeclarationNode : VariableDeclarationNode {
+
+        public ConstantDeclarationNode(Token token,
+                                       ParseNodeList attributes,
+                                       Modifiers modifiers,
+                                       ParseNode type,
+                                       ParseNodeList initializers)
+            : base(ParseNodeType.ConstDeclaration, token, attributes, modifiers, type, initializers, false) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/ContinueNode.cs b/src/Core/Compiler/CodeModel/Statements/ContinueNode.cs
new file mode 100644
index 000000000..0d9e92593
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/ContinueNode.cs
@@ -0,0 +1,17 @@
+// ContinueNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class ContinueNode : StatementNode {
+
+        public ContinueNode(Token token)
+            : base(ParseNodeType.Continue, token) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/DefaultLabelNode.cs b/src/Core/Compiler/CodeModel/Statements/DefaultLabelNode.cs
new file mode 100644
index 000000000..c79d63303
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/DefaultLabelNode.cs
@@ -0,0 +1,17 @@
+// DefaultLabelNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class DefaultLabelNode : StatementNode {
+
+        public DefaultLabelNode(Token token)
+            : base(ParseNodeType.DefaultLabel, token) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/DoWhileNode.cs b/src/Core/Compiler/CodeModel/Statements/DoWhileNode.cs
new file mode 100644
index 000000000..c3f3b2504
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/DoWhileNode.cs
@@ -0,0 +1,36 @@
+// DoWhileNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class DoWhileNode : StatementNode {
+
+        private ParseNode _condition;
+        private ParseNode _body;
+
+        public DoWhileNode(Token token,
+                      ParseNode body,
+                      ParseNode condition)
+            : base(ParseNodeType.DoWhile, token) {
+            _body = GetParentedNode(body);
+            _condition = GetParentedNode(condition);
+        }
+
+        public ParseNode Body {
+            get {
+                return _body;
+            }
+        }
+
+        public ParseNode Condition {
+            get {
+                return _condition;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/EmptyStatementNode.cs b/src/Core/Compiler/CodeModel/Statements/EmptyStatementNode.cs
new file mode 100644
index 000000000..7413ce02f
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/EmptyStatementNode.cs
@@ -0,0 +1,17 @@
+// EmptyStatementNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class EmptyStatementNode : StatementNode {
+
+        public EmptyStatementNode(Token token)
+            : base(ParseNodeType.EmptyStatement, token) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/ExpressionStatementNode.cs b/src/Core/Compiler/CodeModel/Statements/ExpressionStatementNode.cs
new file mode 100644
index 000000000..b9ab612f5
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/ExpressionStatementNode.cs
@@ -0,0 +1,26 @@
+// ExpressionStatementNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal class ExpressionStatementNode : StatementNode {
+
+        private ParseNode _expression;
+
+        public ExpressionStatementNode(ParseNode expression)
+            : base(ParseNodeType.ExpressionStatement, expression.token) {
+            _expression = GetParentedNode(expression);
+        }
+
+        public ParseNode Expression {
+            get {
+                return _expression;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/FixedNode.cs b/src/Core/Compiler/CodeModel/Statements/FixedNode.cs
new file mode 100644
index 000000000..c678beb65
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/FixedNode.cs
@@ -0,0 +1,25 @@
+// FixedNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class FixedNode : StatementNode {
+
+        private VariableDeclarationNode _declaration;
+        private ParseNode _body;
+
+        public FixedNode(Token token,
+                         VariableDeclarationNode declaration,
+                         ParseNode body)
+            : base(ParseNodeType.Fixed, token) {
+            _declaration = (VariableDeclarationNode)GetParentedNode(declaration);
+            _body = GetParentedNode(body);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/ForNode.cs b/src/Core/Compiler/CodeModel/Statements/ForNode.cs
new file mode 100644
index 000000000..3450fb372
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/ForNode.cs
@@ -0,0 +1,54 @@
+// ForNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class ForNode : StatementNode {
+
+        private ParseNode _initializer;
+        private ParseNode _condition;
+        private ParseNode _increment;
+        private ParseNode _body;
+
+        public ForNode(Token token,
+                       ParseNode initializer,
+                       ParseNode condition,
+                       ParseNode increment,
+                       ParseNode body)
+            : base(ParseNodeType.For, token) {
+            _initializer = GetParentedNode(initializer);
+            _condition = GetParentedNode(condition);
+            _increment = GetParentedNode(increment);
+            _body = GetParentedNode(body);
+        }
+
+        public ParseNode Body {
+            get {
+                return _body;
+            }
+        }
+
+        public ParseNode Condition {
+            get {
+                return _condition;
+            }
+        }
+
+        public ParseNode Increment {
+            get {
+                return _increment;
+            }
+        }
+
+        public ParseNode Initializer {
+            get {
+                return _initializer;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/ForeachNode.cs b/src/Core/Compiler/CodeModel/Statements/ForeachNode.cs
new file mode 100644
index 000000000..52b5cef86
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/ForeachNode.cs
@@ -0,0 +1,55 @@
+// ForeachNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal class ForeachNode : StatementNode {
+
+        private ParseNode _type;
+        private AtomicNameNode _name;
+        private ParseNode _container;
+        private ParseNode _body;
+
+        public ForeachNode(Token token,
+                           ParseNode type,
+                           AtomicNameNode name,
+                           ParseNode container,
+                           ParseNode body)
+            : base(ParseNodeType.Foreach, token) {
+            _type = GetParentedNode(type);
+            _name = (AtomicNameNode)GetParentedNode(name);
+            _container = GetParentedNode(container);
+            _body = GetParentedNode(body);
+        }
+
+        public ParseNode Body {
+            get {
+                return _body;
+            }
+        }
+
+        public ParseNode Container {
+            get {
+                return _container;
+            }
+        }
+
+        public ParseNode Type {
+            get {
+                return _type;
+            }
+        }
+
+        public AtomicNameNode Name {
+            get {
+                return _name;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/GotoNode.cs b/src/Core/Compiler/CodeModel/Statements/GotoNode.cs
new file mode 100644
index 000000000..10090f8ec
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/GotoNode.cs
@@ -0,0 +1,21 @@
+// GotoNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class GotoNode : StatementNode {
+
+        private ParseNode _value;
+
+        public GotoNode(Token token, ParseNode value)
+            : base(ParseNodeType.Goto, token) {
+            _value = GetParentedNode(value);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/IfElseNode.cs b/src/Core/Compiler/CodeModel/Statements/IfElseNode.cs
new file mode 100644
index 000000000..454baae48
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/IfElseNode.cs
@@ -0,0 +1,45 @@
+// IfElseNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class IfElseNode : StatementNode {
+
+        private ParseNode _condition;
+        private ParseNode _ifBlock;
+        private ParseNode _elseBlock;
+
+        public IfElseNode(Token token,
+                      ParseNode condition,
+                      ParseNode ifBlock,
+                      ParseNode elseBlock)
+            : base(ParseNodeType.IfElse, token) {
+            _condition = GetParentedNode(condition);
+            _ifBlock = GetParentedNode(ifBlock);
+            _elseBlock = GetParentedNode(elseBlock);
+        }
+
+        public ParseNode Condition {
+            get {
+                return _condition;
+            }
+        }
+
+        public ParseNode ElseBlock {
+            get {
+                return _elseBlock;
+            }
+        }
+
+        public ParseNode IfBlock {
+            get {
+                return _ifBlock;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/LabeledStatementNode.cs b/src/Core/Compiler/CodeModel/Statements/LabeledStatementNode.cs
new file mode 100644
index 000000000..b7b8f10e2
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/LabeledStatementNode.cs
@@ -0,0 +1,23 @@
+// LabeledStatementNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal class LabeledStatementNode : StatementNode {
+
+        private AtomicNameNode _label;
+        private ParseNode _statement;
+
+        public LabeledStatementNode(AtomicNameNode label, ParseNode statement)
+            : base(ParseNodeType.LabeledStatement, label.token) {
+            _label = (AtomicNameNode)GetParentedNode(label);
+            _statement = GetParentedNode(statement);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/LockNode.cs b/src/Core/Compiler/CodeModel/Statements/LockNode.cs
new file mode 100644
index 000000000..3910ad50d
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/LockNode.cs
@@ -0,0 +1,25 @@
+// LockNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class LockNode : StatementNode {
+
+        public ParseNode monitor;
+        public ParseNode body;
+
+        public LockNode(Token token,
+                        ParseNode monitor,
+                        ParseNode body)
+            : base(ParseNodeType.Lock, token) {
+            this.monitor = GetParentedNode(monitor);
+            this.body = GetParentedNode(body);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/ReturnNode.cs b/src/Core/Compiler/CodeModel/Statements/ReturnNode.cs
new file mode 100644
index 000000000..205df0d74
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/ReturnNode.cs
@@ -0,0 +1,26 @@
+// ReturnNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal class ReturnNode : StatementNode {
+
+        private ParseNode _value;
+
+        public ReturnNode(Token token, ParseNode value)
+            : base(ParseNodeType.Return, token) {
+            _value = GetParentedNode(value);
+        }
+
+        public ParseNode Value {
+            get {
+                return _value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/StatementNode.cs b/src/Core/Compiler/CodeModel/Statements/StatementNode.cs
new file mode 100644
index 000000000..fbda39b4e
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/StatementNode.cs
@@ -0,0 +1,17 @@
+// StatementNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal abstract class StatementNode : ParseNode {
+
+        protected StatementNode(ParseNodeType nodeType, Token token)
+            : base(nodeType, token) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/SwitchNode.cs b/src/Core/Compiler/CodeModel/Statements/SwitchNode.cs
new file mode 100644
index 000000000..a81a24d30
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/SwitchNode.cs
@@ -0,0 +1,36 @@
+// SwitchNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class SwitchNode : StatementNode {
+
+        private ParseNode _condition;
+        private ParseNodeList _cases;
+
+        public SwitchNode(Token token,
+                          ParseNode condition,
+                          ParseNodeList cases)
+            : base(ParseNodeType.Switch, token) {
+            _condition = GetParentedNode(condition);
+            _cases = GetParentedNodeList(cases);
+        }
+
+        public ParseNodeList Cases {
+            get {
+                return _cases;
+            }
+        }
+
+        public ParseNode Condition {
+            get {
+                return _condition;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/SwitchSectionNode.cs b/src/Core/Compiler/CodeModel/Statements/SwitchSectionNode.cs
new file mode 100644
index 000000000..87516eb0f
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/SwitchSectionNode.cs
@@ -0,0 +1,36 @@
+// SwitchSectionNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class SwitchSectionNode : StatementNode {
+
+        private ParseNodeList _labels;
+        private ParseNodeList _statements;
+
+        public SwitchSectionNode(Token token,
+                                 ParseNodeList labels,
+                                 ParseNodeList statements)
+            : base(ParseNodeType.SwitchSection, token) {
+            _labels = GetParentedNodeList(labels);
+            _statements = GetParentedNodeList(statements);
+        }
+
+        public ParseNodeList Labels {
+            get {
+                return _labels;
+            }
+        }
+
+        public ParseNodeList Statements {
+            get {
+                return _statements;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/ThrowNode.cs b/src/Core/Compiler/CodeModel/Statements/ThrowNode.cs
new file mode 100644
index 000000000..479149034
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/ThrowNode.cs
@@ -0,0 +1,26 @@
+// ThrowNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class ThrowNode : StatementNode {
+
+        private ParseNode _value;
+
+        public ThrowNode(Token token, ParseNode value)
+            : base(ParseNodeType.Throw, token) {
+            _value = GetParentedNode(value);
+        }
+
+        public ParseNode Value {
+            get {
+                return _value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/TryNode.cs b/src/Core/Compiler/CodeModel/Statements/TryNode.cs
new file mode 100644
index 000000000..73cd1f0f2
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/TryNode.cs
@@ -0,0 +1,45 @@
+// TryNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class TryNode : StatementNode {
+
+        private ParseNode _body;
+        private ParseNodeList _catchClauses;
+        private ParseNode _finallyClause;
+
+        public TryNode(Token token,
+                       ParseNode body,
+                       ParseNodeList catchClauses,
+                       ParseNode finallyClause)
+            : base(ParseNodeType.Try, token) {
+            _body = GetParentedNode(body);
+            _catchClauses = GetParentedNodeList(catchClauses);
+            _finallyClause = GetParentedNode(finallyClause);
+        }
+
+        public ParseNode Body {
+            get {
+                return _body;
+            }
+        }
+
+        public ParseNodeList CatchClauses {
+            get {
+                return _catchClauses;
+            }
+        }
+
+        public ParseNode FinallyClause {
+            get {
+                return _finallyClause;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/UncheckedNode.cs b/src/Core/Compiler/CodeModel/Statements/UncheckedNode.cs
new file mode 100644
index 000000000..d56257bb3
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/UncheckedNode.cs
@@ -0,0 +1,21 @@
+// UncheckedNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class UncheckedNode : StatementNode {
+
+        private BlockStatementNode _body;
+
+        public UncheckedNode(Token token, BlockStatementNode body)
+            : base(ParseNodeType.Unchecked, token) {
+            _body = (BlockStatementNode)GetParentedNode(body);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/UnsafeNode.cs b/src/Core/Compiler/CodeModel/Statements/UnsafeNode.cs
new file mode 100644
index 000000000..b839540c8
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/UnsafeNode.cs
@@ -0,0 +1,21 @@
+// UnsafeNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal class UnsafeNode : StatementNode {
+
+        private ParseNode _body;
+
+        public UnsafeNode(Token token, ParseNode body)
+            : base(ParseNodeType.UnsafeStatement, token) {
+            _body = body;
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/UsingNode.cs b/src/Core/Compiler/CodeModel/Statements/UsingNode.cs
new file mode 100644
index 000000000..70776b4e4
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/UsingNode.cs
@@ -0,0 +1,25 @@
+// UsingNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class UsingNode : StatementNode {
+
+        private ParseNode _guard;
+        private ParseNode _body;
+
+        public UsingNode(Token token,
+                         ParseNode guard,
+                         ParseNode body)
+            : base(ParseNodeType.Using, token) {
+            _guard = GetParentedNode(guard);
+            _body = GetParentedNode(body);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/VariableDeclarationNode.cs b/src/Core/Compiler/CodeModel/Statements/VariableDeclarationNode.cs
new file mode 100644
index 000000000..3e53ef383
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/VariableDeclarationNode.cs
@@ -0,0 +1,66 @@
+// VariableDeclarationNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal class VariableDeclarationNode : StatementNode {
+
+        private ParseNodeList attributes;
+        private Modifiers modifiers;
+        private ParseNode type;
+        private ParseNodeList initializers;
+        private bool isFixed;
+
+        public VariableDeclarationNode(Token token,
+                                       ParseNodeList attributes,
+                                       Modifiers modifiers,
+                                       ParseNode type,
+                                       ParseNodeList initializers,
+                                       bool isFixed)
+            : this(ParseNodeType.VariableDeclaration, token, attributes, modifiers, type, initializers, isFixed) {
+        }
+
+        protected VariableDeclarationNode(ParseNodeType nodeType, Token token,
+                                          ParseNodeList attributes,
+                                          Modifiers modifiers,
+                                          ParseNode type,
+                                          ParseNodeList initializers,
+                                          bool isFixed)
+            : base(nodeType, token) {
+            this.attributes = GetParentedNodeList(attributes);
+            this.modifiers = modifiers;
+            this.type = GetParentedNode(type);
+            this.initializers = GetParentedNodeList(initializers);
+            this.isFixed = isFixed;
+        }
+
+        public ParseNodeList Initializers {
+            get {
+                return initializers;
+            }
+        }
+
+        public bool IsFixed {
+            get {
+                return isFixed;
+            }
+        }
+
+        public Modifiers Modifiers {
+            get {
+                return modifiers;
+            }
+        }
+
+        public ParseNode Type {
+            get {
+                return type;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/WhileNode.cs b/src/Core/Compiler/CodeModel/Statements/WhileNode.cs
new file mode 100644
index 000000000..10fd88ade
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/WhileNode.cs
@@ -0,0 +1,36 @@
+// WhileNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class WhileNode : StatementNode {
+
+        private ParseNode _condition;
+        private ParseNode _body;
+
+        public WhileNode(Token token,
+                         ParseNode condition,
+                         ParseNode body)
+            : base(ParseNodeType.While, token) {
+            _condition = GetParentedNode(condition);
+            _body = GetParentedNode(body);
+        }
+
+        public ParseNode Body {
+            get {
+                return _body;
+            }
+        }
+
+        public ParseNode Condition {
+            get {
+                return _condition;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/YieldBreakNode.cs b/src/Core/Compiler/CodeModel/Statements/YieldBreakNode.cs
new file mode 100644
index 000000000..c64d24076
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/YieldBreakNode.cs
@@ -0,0 +1,18 @@
+// YieldBreakNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class YieldBreakNode : StatementNode {
+
+        public YieldBreakNode(Token token)
+            : base(ParseNodeType.YieldBreak, token) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Statements/YieldReturnNode.cs b/src/Core/Compiler/CodeModel/Statements/YieldReturnNode.cs
new file mode 100644
index 000000000..49ef9c2a6
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Statements/YieldReturnNode.cs
@@ -0,0 +1,21 @@
+// YieldReturnNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class YieldReturnNode : StatementNode {
+
+        private ParseNode _value;
+
+        public YieldReturnNode(Token token, ParseNode value)
+            : base(ParseNodeType.YieldReturn, token) {
+            _value = GetParentedNode(value);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/BooleanToken.cs b/src/Core/Compiler/CodeModel/Tokens/BooleanToken.cs
new file mode 100644
index 000000000..104d369c8
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/BooleanToken.cs
@@ -0,0 +1,37 @@
+// BooleanToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class BooleanToken : LiteralToken {
+
+        private bool _value;
+
+        internal BooleanToken(bool value, string sourcePath, BufferPosition position)
+            : base(LiteralTokenType.Boolean, sourcePath, position) {
+            _value = value;
+        }
+
+        public override object LiteralValue {
+            get {
+                return Value;
+            }
+        }
+
+        public bool Value {
+            get {
+                return _value;
+            }
+        }
+
+        public override string ToString() {
+            return _value.ToString();
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/CharToken.cs b/src/Core/Compiler/CodeModel/Tokens/CharToken.cs
new file mode 100644
index 000000000..a6f54f256
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/CharToken.cs
@@ -0,0 +1,37 @@
+// CharToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class CharToken : LiteralToken {
+
+        private char _value;
+
+        internal CharToken(char value, string sourcePath, BufferPosition position)
+            : base(LiteralTokenType.Char, sourcePath, position) {
+            _value = value;
+        }
+
+        public override object LiteralValue {
+            get {
+                return Value;
+            }
+        }
+
+        public char Value {
+            get {
+                return _value;
+            }
+        }
+
+        public override string ToString() {
+            return "\'" + _value + "\'";
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/CommentToken.cs b/src/Core/Compiler/CodeModel/Tokens/CommentToken.cs
new file mode 100644
index 000000000..4e51b3dd6
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/CommentToken.cs
@@ -0,0 +1,35 @@
+// CommentTokenType.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class CommentToken : Token {
+
+        private string _comment;
+        private CommentTokenType _commentType;
+
+        internal CommentToken(CommentTokenType type, string comment, string sourcePath, BufferPosition position)
+            : base(TokenType.Comment, sourcePath, position) {
+            _commentType = type;
+            _comment = comment;
+        }
+
+        public string Comment {
+            get {
+                return _comment;
+            }
+        }
+
+        public CommentTokenType CommentType {
+            get {
+                return _commentType;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/CommentTokenType.cs b/src/Core/Compiler/CodeModel/Tokens/CommentTokenType.cs
new file mode 100644
index 000000000..3d9e5c7c7
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/CommentTokenType.cs
@@ -0,0 +1,18 @@
+// CommentTokenType.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.CodeModel {
+
+    internal enum CommentTokenType {
+        
+        SlashStar,
+
+        DoubleSlash,
+
+        TripleSlash,
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/DecimalToken.cs b/src/Core/Compiler/CodeModel/Tokens/DecimalToken.cs
new file mode 100644
index 000000000..e34061c69
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/DecimalToken.cs
@@ -0,0 +1,37 @@
+// DecimalToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class DecimalToken : LiteralToken {
+
+        private decimal _value;
+
+        internal DecimalToken(decimal value, string sourcePath, BufferPosition position)
+            : base(LiteralTokenType.Decimal, sourcePath, position) {
+            _value = value;
+        }
+
+        public override object LiteralValue {
+            get {
+                return Value;
+            }
+        }
+
+        public decimal Value {
+            get {
+                return _value;
+            }
+        }
+
+        public override string ToString() {
+            return _value.ToString();
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/DoubleToken.cs b/src/Core/Compiler/CodeModel/Tokens/DoubleToken.cs
new file mode 100644
index 000000000..e5d52be78
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/DoubleToken.cs
@@ -0,0 +1,37 @@
+// DoubleToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class DoubleToken : LiteralToken {
+
+        private double _value;
+
+        internal DoubleToken(double value, string sourcePath, BufferPosition position)
+            : base(LiteralTokenType.Double, sourcePath, position) {
+            _value = value;
+        }
+
+        public override object LiteralValue {
+            get {
+                return Value;
+            }
+        }
+
+        public double Value {
+            get {
+                return _value;
+            }
+        }
+
+        public override string ToString() {
+            return _value.ToString();
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/FloatToken.cs b/src/Core/Compiler/CodeModel/Tokens/FloatToken.cs
new file mode 100644
index 000000000..d236c3019
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/FloatToken.cs
@@ -0,0 +1,37 @@
+// FloatToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class FloatToken : LiteralToken {
+
+        private float _value;
+
+        internal FloatToken(float value, string sourcePath, BufferPosition position)
+            : base(LiteralTokenType.Float, sourcePath, position) {
+            _value = value;
+        }
+
+        public override object LiteralValue {
+            get {
+                return Value;
+            }
+        }
+
+        public float Value {
+            get {
+                return _value;
+            }
+        }
+
+        public override string ToString() {
+            return _value.ToString();
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/IdentifierToken.cs b/src/Core/Compiler/CodeModel/Tokens/IdentifierToken.cs
new file mode 100644
index 000000000..0bad84a74
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/IdentifierToken.cs
@@ -0,0 +1,47 @@
+// IdentifierToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class IdentifierToken : Token {
+
+        public const int MaxIdentifierLength = 512;
+
+        private Name _symbol;
+        private bool _atPrefixed;
+
+        internal IdentifierToken(Name identifier, bool atPrefixed, string sourcePath, BufferPosition position)
+            : base(TokenType.Identifier, sourcePath, position) {
+            _symbol = identifier;
+            _atPrefixed = atPrefixed;
+        }
+
+        public bool AtPrefixed {
+            get {
+                return _atPrefixed;
+            }
+        }
+
+        public string Identifier {
+            get {
+                return _symbol.ToString();
+            }
+        }
+
+        internal Name Symbol {
+            get {
+                return _symbol;
+            }
+        }
+
+        public override string ToString() {
+            return _symbol.ToString();
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/IntToken.cs b/src/Core/Compiler/CodeModel/Tokens/IntToken.cs
new file mode 100644
index 000000000..2c96c707d
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/IntToken.cs
@@ -0,0 +1,37 @@
+// IntToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class IntToken : LiteralToken {
+
+        private int _value;
+
+        internal IntToken(int value, string sourcePath, BufferPosition position)
+            : base(LiteralTokenType.Int, sourcePath, position) {
+            _value = value;
+        }
+
+        public override object LiteralValue {
+            get {
+                return Value;
+            }
+        }
+
+        public int Value {
+            get {
+                return _value;
+            }
+        }
+
+        public override string ToString() {
+            return _value.ToString();
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/LiteralToken.cs b/src/Core/Compiler/CodeModel/Tokens/LiteralToken.cs
new file mode 100644
index 000000000..c2bf8e861
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/LiteralToken.cs
@@ -0,0 +1,31 @@
+// LiteralToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal abstract class LiteralToken : Token {
+
+        private LiteralTokenType _literalType;
+
+        internal LiteralToken(LiteralTokenType literalType, string sourcePath, BufferPosition position)
+            : base(TokenType.Literal, sourcePath, position) {
+            _literalType = literalType;
+        }
+
+        public LiteralTokenType LiteralType {
+            get {
+                return _literalType;
+            }
+        }
+
+        public abstract object LiteralValue {
+            get;
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/LiteralTokenType.cs b/src/Core/Compiler/CodeModel/Tokens/LiteralTokenType.cs
new file mode 100644
index 000000000..fe12909ec
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/LiteralTokenType.cs
@@ -0,0 +1,23 @@
+// LiteralTokenType.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.CodeModel {
+
+    internal enum LiteralTokenType {
+        Null,
+        Boolean,
+        Char,
+        String,
+        Int,
+        UInt,
+        Long,
+        ULong,
+        Float,
+        Double,
+        Decimal,
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/LongToken.cs b/src/Core/Compiler/CodeModel/Tokens/LongToken.cs
new file mode 100644
index 000000000..f58cbbbaa
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/LongToken.cs
@@ -0,0 +1,37 @@
+// LongToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class LongToken : LiteralToken {
+
+        private long _value;
+
+        internal LongToken(long value, string sourcePath, BufferPosition position)
+            : base(LiteralTokenType.Long, sourcePath, position) {
+            _value = value;
+        }
+
+        public override object LiteralValue {
+            get {
+                return Value;
+            }
+        }
+
+        public long Value {
+            get {
+                return _value;
+            }
+        }
+
+        public override string ToString() {
+            return _value.ToString();
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/NullToken.cs b/src/Core/Compiler/CodeModel/Tokens/NullToken.cs
new file mode 100644
index 000000000..67c700e13
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/NullToken.cs
@@ -0,0 +1,34 @@
+// NullToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class NullToken : LiteralToken {
+
+        internal NullToken(string sourcePath, BufferPosition position)
+            : base(LiteralTokenType.Null, sourcePath, position) {
+        }
+
+        public override object LiteralValue {
+            get {
+                return null;
+            }
+        }
+
+        public object Value {
+            get {
+                return null;
+            }
+        }
+
+        public override string ToString() {
+            return "null";
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/StringToken.cs b/src/Core/Compiler/CodeModel/Tokens/StringToken.cs
new file mode 100644
index 000000000..8f1957b6e
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/StringToken.cs
@@ -0,0 +1,37 @@
+// StringToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class StringToken : LiteralToken {
+
+        private string _value;
+
+        internal StringToken(string value, string sourcePath, BufferPosition position)
+            : base(LiteralTokenType.String, sourcePath, position) {
+            _value = value;
+        }
+
+        public override object LiteralValue {
+            get {
+                return Value;
+            }
+        }
+
+        public string Value {
+            get {
+                return _value;
+            }
+        }
+
+        public override string ToString() {
+            return "\"" + _value + "\"";
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/Token.cs b/src/Core/Compiler/CodeModel/Tokens/Token.cs
new file mode 100644
index 000000000..33b6dbf83
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/Token.cs
@@ -0,0 +1,237 @@
+// Token.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal class Token : IComparable {
+
+        public const int MaximumPrecedence = int.MaxValue - 1;
+
+        private static TokenInfo[] infos;
+
+        private TokenType _type;
+        private string _sourcePath;
+        private BufferPosition _position;
+
+        static Token() {
+            infos = new TokenInfo[] {
+                new TokenInfo("abstract"      , TokenFlags.None),
+                new TokenInfo("as"            , TokenFlags.None,      4),
+                new TokenInfo("base"          , TokenFlags.None),
+                new TokenInfo("bool"          , TokenFlags.PredefinedType),
+                new TokenInfo("break"         , TokenFlags.None),
+                new TokenInfo("byte"          , TokenFlags.PredefinedType),
+                new TokenInfo("case"          , TokenFlags.None),
+                new TokenInfo("catch"         , TokenFlags.None),
+                new TokenInfo("char"          , TokenFlags.PredefinedType),
+                new TokenInfo("checked"       , TokenFlags.None),
+                new TokenInfo("class"         , TokenFlags.None),
+                new TokenInfo("const"         , TokenFlags.None),
+                new TokenInfo("continue"      , TokenFlags.None),
+                new TokenInfo("decimal"       , TokenFlags.PredefinedType),
+                new TokenInfo("default"       , TokenFlags.None),
+                new TokenInfo("delegate"      , TokenFlags.None),
+                new TokenInfo("do"            , TokenFlags.None),
+                new TokenInfo("double"        , TokenFlags.PredefinedType),
+                new TokenInfo("else"          , TokenFlags.None),
+                new TokenInfo("enum"          , TokenFlags.None),
+                new TokenInfo("event"         , TokenFlags.None),
+                new TokenInfo("explicit"      , TokenFlags.None),
+                new TokenInfo("extern"        , TokenFlags.None),
+                new TokenInfo("false"         , TokenFlags.OverloadableOperator),
+                new TokenInfo("finally"       , TokenFlags.None),
+                new TokenInfo("fixed"         , TokenFlags.None),
+                new TokenInfo("float"         , TokenFlags.PredefinedType),
+                new TokenInfo("for"           , TokenFlags.None),
+                new TokenInfo("foreach"       , TokenFlags.None),
+                new TokenInfo("goto"          , TokenFlags.None),
+                new TokenInfo("if"            , TokenFlags.None),
+                new TokenInfo("in"            , TokenFlags.None),
+                new TokenInfo("implicit"      , TokenFlags.None),
+                new TokenInfo("int"           , TokenFlags.PredefinedType),
+                new TokenInfo("interface"     , TokenFlags.None),
+                new TokenInfo("internal"      , TokenFlags.None),
+                new TokenInfo("is"            , TokenFlags.None,      4),
+                new TokenInfo("lock"          , TokenFlags.None),
+                new TokenInfo("long"          , TokenFlags.PredefinedType),
+                new TokenInfo("namespace"     , TokenFlags.None),
+                new TokenInfo("new"           , TokenFlags.None),
+                new TokenInfo("null"          , TokenFlags.None),
+                new TokenInfo("object"        , TokenFlags.PredefinedType),
+                new TokenInfo("operator"      , TokenFlags.None),
+                new TokenInfo("out"           , TokenFlags.None),
+                new TokenInfo("override"      , TokenFlags.None),
+                new TokenInfo("params"        , TokenFlags.None),
+                new TokenInfo("private"       , TokenFlags.None),
+                new TokenInfo("protected"     , TokenFlags.None),
+                new TokenInfo("public"        , TokenFlags.None),
+                new TokenInfo("readonly"      , TokenFlags.None),
+                new TokenInfo("ref"           , TokenFlags.None),
+                new TokenInfo("return"        , TokenFlags.None),
+                new TokenInfo("sbyte"         , TokenFlags.PredefinedType),
+                new TokenInfo("sealed"        , TokenFlags.None),
+                new TokenInfo("short"         , TokenFlags.PredefinedType),
+                new TokenInfo("sizeof"        , TokenFlags.None),
+                new TokenInfo("stackalloc"    , TokenFlags.None),
+                new TokenInfo("static"        , TokenFlags.None),
+                new TokenInfo("string"        , TokenFlags.PredefinedType),
+                new TokenInfo("struct"        , TokenFlags.None),
+                new TokenInfo("switch"        , TokenFlags.None),
+                new TokenInfo("this"          , TokenFlags.None),
+                new TokenInfo("throw"         , TokenFlags.None),
+                new TokenInfo("true"          , TokenFlags.OverloadableOperator),
+                new TokenInfo("try"           , TokenFlags.None),
+                new TokenInfo("typeof"        , TokenFlags.None),
+                new TokenInfo("uint"          , TokenFlags.PredefinedType),
+                new TokenInfo("ulong"         , TokenFlags.PredefinedType),
+                new TokenInfo("unchecked"     , TokenFlags.None),
+                new TokenInfo("unsafe"        , TokenFlags.None),
+                new TokenInfo("ushort"        , TokenFlags.PredefinedType),
+                new TokenInfo("using"         , TokenFlags.None),
+                new TokenInfo("virtual"       , TokenFlags.None),
+                new TokenInfo("void"          , TokenFlags.PredefinedType),
+                new TokenInfo("volatile"      , TokenFlags.None),
+                new TokenInfo("while"         , TokenFlags.None),
+                new TokenInfo("Identifier"    , TokenFlags.None),
+                new TokenInfo("Literal"       , TokenFlags.None),
+                new TokenInfo(";"             , TokenFlags.None),
+                new TokenInfo(")"             , TokenFlags.None),
+                new TokenInfo("]"             , TokenFlags.None),
+                new TokenInfo("{"             , TokenFlags.None),
+                new TokenInfo("}"             , TokenFlags.None),
+                new TokenInfo(","             , TokenFlags.None),
+                new TokenInfo("="             , TokenFlags.AssignmentOperator),
+                new TokenInfo("+="            , TokenFlags.AssignmentOperator),
+                new TokenInfo("-="            , TokenFlags.AssignmentOperator),
+                new TokenInfo("*="            , TokenFlags.AssignmentOperator),
+                new TokenInfo("/="            , TokenFlags.AssignmentOperator),
+                new TokenInfo("%="            , TokenFlags.AssignmentOperator),
+                new TokenInfo("&="            , TokenFlags.AssignmentOperator),
+                new TokenInfo("^="            , TokenFlags.AssignmentOperator),
+                new TokenInfo("|="            , TokenFlags.AssignmentOperator),
+                new TokenInfo("<<="           , TokenFlags.AssignmentOperator),
+                new TokenInfo(">>="           , TokenFlags.AssignmentOperator),
+                new TokenInfo("?"             , TokenFlags.None),
+                new TokenInfo(":"             , TokenFlags.None),
+                new TokenInfo("::"            , TokenFlags.None),
+                new TokenInfo("||"            , TokenFlags.None,                      10),
+                new TokenInfo("&&"            , TokenFlags.None,                      9),
+                new TokenInfo("|"             , TokenFlags.OverloadableOperator,      8),
+                new TokenInfo("^"             , TokenFlags.OverloadableOperator,      7),
+                new TokenInfo("&"             , TokenFlags.OverloadableOperator,      6),
+                new TokenInfo("=="            , TokenFlags.OverloadableOperator,      5),
+                new TokenInfo("!="            , TokenFlags.OverloadableOperator,      5),
+                new TokenInfo("<"             , TokenFlags.OverloadableOperator,      4),
+                new TokenInfo("<="            , TokenFlags.OverloadableOperator,      4),
+                new TokenInfo(">"             , TokenFlags.OverloadableOperator,      4),
+                new TokenInfo(">="            , TokenFlags.OverloadableOperator,      4),
+                new TokenInfo("??"            , TokenFlags.OverloadableOperator,      4),
+                new TokenInfo("<<"            , TokenFlags.OverloadableOperator,      3),
+                new TokenInfo(">>"            , TokenFlags.OverloadableOperator,      3),
+                new TokenInfo("+"             , TokenFlags.OverloadableOperator,      2),
+                new TokenInfo("-"             , TokenFlags.OverloadableOperator,      2),
+                new TokenInfo("*"             , TokenFlags.OverloadableOperator,      1),
+                new TokenInfo("/"             , TokenFlags.OverloadableOperator,      1),
+                new TokenInfo("%"             , TokenFlags.OverloadableOperator,      1),
+                new TokenInfo("~"             , TokenFlags.OverloadableOperator),
+                new TokenInfo("!"             , TokenFlags.OverloadableOperator),
+                new TokenInfo("++"            , TokenFlags.OverloadableOperator),
+                new TokenInfo("--"            , TokenFlags.OverloadableOperator),
+                new TokenInfo("("             , TokenFlags.None),
+                new TokenInfo("["             , TokenFlags.None),
+                new TokenInfo("."             , TokenFlags.None),
+                new TokenInfo("->"            , TokenFlags.None),
+                new TokenInfo("BOF"           , TokenFlags.None),
+                new TokenInfo("EOF"           , TokenFlags.None),
+                new TokenInfo("Comment"       , TokenFlags.None),
+                new TokenInfo("Error"         , TokenFlags.None),
+                new TokenInfo("Invalid"       , TokenFlags.None),
+            };
+
+            Debug.Assert(((int)TokenType.Invalid + 1) == infos.Length);
+        }
+
+        internal Token(TokenType type, string sourcePath, BufferPosition position) {
+            _type = type;
+            _sourcePath = sourcePath;
+            _position = position;
+        }
+
+        public string Location {
+            get {
+                return _sourcePath + _position;
+            }
+        }
+
+        public BufferPosition Position {
+            get {
+                return _position;
+            }
+        }
+
+        public string SourcePath {
+            get {
+                return _sourcePath;
+            }
+        }
+
+        public TokenType Type {
+            get {
+                return _type;
+            }
+        }
+
+        public int CompareTo(Token token) {
+            return _position.CompareTo(token.Position);
+        }
+
+        public static string GetString(TokenType type) {
+            return infos[(int)type].ToString();
+        }
+
+        public static int GetTokenPrecedence(TokenType type) {
+            return infos[(int)type].Precedence;
+        }
+
+        public bool IsAdjacent(Token right) {
+            return (_position.Line == right.Position.Line) &&
+                   ((_position.Column + this.ToString().Length) == right.Position.Column);
+        }
+
+        public static bool IsAssignmentOperator(TokenType type) {
+            return infos[(int)type].IsAssignmentOperator;
+        }
+
+        public static bool IsBinaryOperator(TokenType type) {
+            return infos[(int)type].IsBinaryOperator;
+        }
+
+        public static bool IsKeyword(TokenType type) {
+            return (type < TokenType.Identifier);
+        }
+
+        public static bool IsOverloadableOperator(TokenType type) {
+            return infos[(int)type].IsOverloadableOperator;
+        }
+
+        public static bool IsPredefinedType(TokenType type) {
+            return infos[(int)type].IsPredefinedType;
+        }
+
+        public override string ToString() {
+            return GetString(_type);
+        }
+
+        #region Implementation of IComparable
+        int IComparable.CompareTo(object o) {
+            return this.CompareTo((Token)o);
+        }
+        #endregion
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/TokenFlags.cs b/src/Core/Compiler/CodeModel/Tokens/TokenFlags.cs
new file mode 100644
index 000000000..9896ed901
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/TokenFlags.cs
@@ -0,0 +1,21 @@
+// TokenFlags.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.CodeModel {
+
+    [Flags]
+    internal enum TokenFlags {
+
+        None = 0,
+
+        PredefinedType = 1,
+
+        AssignmentOperator = 2,
+
+        OverloadableOperator = 4,
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/TokenInfo.cs b/src/Core/Compiler/CodeModel/Tokens/TokenInfo.cs
new file mode 100644
index 000000000..9ad28bd40
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/TokenInfo.cs
@@ -0,0 +1,64 @@
+// TokenInfo.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class TokenInfo {
+
+        public const int InvalidPrecedence = Int32.MaxValue;
+
+        private string _tokenString;
+        private TokenFlags _flags;
+        private int _precedence;
+
+        internal TokenInfo(string tokenString, TokenFlags flags, int precedence)
+            : this(tokenString, flags) {
+            _precedence = precedence;
+        }
+
+        internal TokenInfo(string tokenString, TokenFlags flags) {
+            _tokenString = tokenString;
+            _flags = flags;
+            _precedence = TokenInfo.InvalidPrecedence;
+        }
+
+        public bool IsAssignmentOperator {
+            get {
+                return (_flags & TokenFlags.AssignmentOperator) != 0;
+            }
+        }
+
+        public bool IsBinaryOperator {
+            get {
+                return _precedence != InvalidPrecedence;
+            }
+        }
+
+        public bool IsOverloadableOperator {
+            get {
+                return (_flags & TokenFlags.OverloadableOperator) != 0;
+            }
+        }
+
+        public bool IsPredefinedType {
+            get {
+                return (_flags & TokenFlags.PredefinedType) != 0;
+            }
+        }
+
+        public int Precedence {
+            get {
+                return _precedence;
+            }
+        }
+
+        public override string ToString() {
+            return _tokenString;
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/TokenType.cs b/src/Core/Compiler/CodeModel/Tokens/TokenType.cs
new file mode 100644
index 000000000..ea7de4269
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/TokenType.cs
@@ -0,0 +1,153 @@
+// TokenType.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.CodeModel {
+
+    /// <summary>
+    /// The list of valid token types.
+    /// NOTE: Must keep this list in sync with the Token static constuctor.
+    /// </summary>
+    internal enum TokenType {
+        Abstract,
+        As,
+        Base,
+        Bool,
+        Break,
+        Byte,
+        Case,
+        Catch,
+        Char,
+        Checked,
+        Class,
+        Const,
+        Continue,
+        Decimal,
+        Default,
+        Delegate,
+        Do,
+        Double,
+        Else,
+        Enum,
+        Event,
+        Explicit,
+        Extern,
+        False,
+        Finally,
+        Fixed,
+        Float,
+        For,
+        Foreach,
+        Goto,
+        If,
+        In,
+        Implicit,
+        Int,
+        Interface,
+        Internal,
+        Is,
+        Lock,
+        Long,
+        Namespace,
+        New,
+        Null,
+        Object,
+        Operator,
+        Out,
+        Override,
+        Params,
+        Private,
+        Protected,
+        Public,
+        Readonly,
+        Ref,
+        Return,
+        SByte,
+        Sealed,
+        Short,
+        Sizeof,
+        Stackalloc,
+        Static,
+        String,
+        Struct,
+        Switch,
+        This,
+        Throw,
+        True,
+        Try,
+        Typeof,
+        UInt,
+        ULong,
+        Unchecked,
+        Unsafe,
+        UShort,
+        Using,
+        Virtual,
+        Void,
+        Volatile,
+        While,
+
+        Identifier,
+        Literal,
+        Semicolon,
+        CloseParen,
+        CloseSquare,
+        OpenCurly,
+        CloseCurly,
+        Comma,
+        Equal,
+        PlusEqual,
+        MinusEqual,
+        StarEqual,
+        SlashEqual,
+        PercentEqual,
+        AndEqual,
+        HatEqual,
+        BarEqual,
+        ShiftLeftEqual,
+        ShiftRightEqual,
+        Question,
+        Colon,
+        ColonColon,
+        LogOr,
+        LogAnd,
+        Bar,
+        Hat,
+        Ampersand,
+        EqualEqual,
+        NotEqual,
+        Less,
+        OpenAngle = Less,
+        LessEqual,
+        Greater,
+        CloseAngle = Greater,
+        GreaterEqual,
+        Coalesce,
+        ShiftLeft,
+        ShiftRight,
+        Plus,
+        Minus,
+        Star,
+        Slash,
+        Percent,
+        Tilde,
+        Bang,
+        PlusPlus,
+        MinusMinus,
+        OpenParen,
+        OpenSquare,
+        Dot,
+        Arrow,
+
+        BOF,
+        EOF,
+
+        Comment,
+
+        Error,
+        Invalid     // must be last
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/UIntToken.cs b/src/Core/Compiler/CodeModel/Tokens/UIntToken.cs
new file mode 100644
index 000000000..83753dbb3
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/UIntToken.cs
@@ -0,0 +1,37 @@
+// UIntToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class UIntToken : LiteralToken {
+
+        private uint _value;
+
+        internal UIntToken(uint value, string sourcePath, BufferPosition position)
+            : base(LiteralTokenType.UInt, sourcePath, position) {
+            _value = value;
+        }
+
+        public override object LiteralValue {
+            get {
+                return Value;
+            }
+        }
+
+        public uint Value {
+            get {
+                return _value;
+            }
+        }
+
+        public override string ToString() {
+            return _value.ToString();
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Tokens/ULongToken.cs b/src/Core/Compiler/CodeModel/Tokens/ULongToken.cs
new file mode 100644
index 000000000..6bb1a4999
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Tokens/ULongToken.cs
@@ -0,0 +1,37 @@
+// ULongToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.Parser;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class ULongToken : LiteralToken {
+
+        private ulong _value;
+
+        internal ULongToken(ulong value, string sourcePath, BufferPosition position)
+            : base(LiteralTokenType.ULong, sourcePath, position) {
+            _value = value;
+        }
+
+        public override object LiteralValue {
+            get {
+                return Value;
+            }
+        }
+
+        public ulong Value {
+            get {
+                return _value;
+            }
+        }
+
+        public override string ToString() {
+            return _value.ToString();
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/ArrayTypeNode.cs b/src/Core/Compiler/CodeModel/Types/ArrayTypeNode.cs
new file mode 100644
index 000000000..6ab748fc3
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/ArrayTypeNode.cs
@@ -0,0 +1,34 @@
+// ArrayTypeNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class ArrayTypeNode : TypeNode {
+
+        private ParseNode _baseType;
+        private int _rank;
+
+        public ArrayTypeNode(ParseNode baseType, int rank)
+            : base(ParseNodeType.ArrayType, baseType.token) {
+            _baseType = GetParentedNode(baseType);
+            _rank = rank;
+        }
+
+        public ParseNode BaseType {
+            get {
+                return _baseType;
+            }
+        }
+
+        public int Rank {
+            get {
+                return _rank;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/CompilationUnitNode.cs b/src/Core/Compiler/CodeModel/Types/CompilationUnitNode.cs
new file mode 100644
index 000000000..81298ad13
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/CompilationUnitNode.cs
@@ -0,0 +1,68 @@
+// CompilationUnitNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class CompilationUnitNode : ParseNode {
+
+        private ParseNodeList _externAliases;
+        private ParseNodeList _usingClauses;
+        private ParseNodeList _members;
+        private ParseNodeList _attributes;
+
+        public CompilationUnitNode(Token token,
+                                   ParseNodeList externAliases,
+                                   ParseNodeList usingClauses,
+                                   ParseNodeList attributes,
+                                   ParseNodeList members)
+            : base(ParseNodeType.CompilationUnit, token) {
+            _externAliases = GetParentedNodeList(externAliases);
+            _usingClauses = GetParentedNodeList(usingClauses);
+            _attributes = GetParentedNodeList(attributes);
+            _members = GetParentedNodeList(GetNamespaces(members));
+        }
+
+        public ParseNodeList Members {
+            get {
+                return _members;
+            }
+        }
+
+        public ParseNodeList UsingClauses {
+            get {
+                return _usingClauses;
+            }
+        }
+
+        public ParseNodeList Attributes {
+            get {
+                return _attributes;
+            }
+        }
+
+        private ParseNodeList GetNamespaces(ParseNodeList members) {
+            ParseNodeList namespaceList = new ParseNodeList();
+
+            foreach (ParseNode memberNode in members) {
+                NamespaceNode namespaceNode = memberNode as NamespaceNode;
+
+                if (namespaceNode == null) {
+                    // Top-level type nodes are turned into children of a namespace with
+                    // an empty name.
+
+                    Token nsToken = new Token(TokenType.Namespace, memberNode.Token.SourcePath, memberNode.Token.Position);
+                    namespaceNode = new NamespaceNode(nsToken, String.Empty, _usingClauses, new ParseNodeList(memberNode));
+                }
+
+                namespaceList.Append(namespaceNode);
+            }
+
+            return namespaceList;
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/CustomTypeNode.cs b/src/Core/Compiler/CodeModel/Types/CustomTypeNode.cs
new file mode 100644
index 000000000..08d63bf4a
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/CustomTypeNode.cs
@@ -0,0 +1,49 @@
+// CustomTypeNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class CustomTypeNode : UserTypeNode {
+
+        private ParseNodeList _baseTypes;
+        private ParseNodeList _members;
+
+        public CustomTypeNode(Token token, TokenType type,
+                              ParseNodeList attributes,
+                              Modifiers modifiers,
+                              AtomicNameNode name,
+                              ParseNodeList typeParameters,
+                              ParseNodeList baseTypes,
+                              ParseNodeList constraintClauses,
+                              ParseNodeList members)
+            : base(ParseNodeType.Type, token, type, attributes, modifiers, name, typeParameters, constraintClauses) {
+            _baseTypes = GetParentedNodeList(baseTypes);
+            _members = GetParentedNodeList(members);
+        }
+
+        public ParseNodeList BaseTypes {
+            get {
+                return _baseTypes;
+            }
+        }
+
+        public ParseNodeList Members {
+            get {
+                return _members;
+            }
+        }
+
+        internal override void MergePartialType(CustomTypeNode partialTypeNode) {
+            base.MergePartialType(partialTypeNode);
+
+            if (partialTypeNode._baseTypes.Count > 0) {
+                _baseTypes.Append(GetParentedNodeList(partialTypeNode._baseTypes));
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/DelegateTypeNode.cs b/src/Core/Compiler/CodeModel/Types/DelegateTypeNode.cs
new file mode 100644
index 000000000..073e43ad2
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/DelegateTypeNode.cs
@@ -0,0 +1,42 @@
+// DelegateTypeNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Ignored in conversion
+    internal sealed class DelegateTypeNode : UserTypeNode {
+
+        private ParseNode _returnType;
+        private ParseNodeList _parameters;
+
+        public DelegateTypeNode(Token token,
+                                ParseNodeList attributes,
+                                Modifiers modifiers,
+                                ParseNode returnType,
+                                AtomicNameNode name,
+                                ParseNodeList typeParameters,
+                                ParseNodeList parameters,
+                                ParseNodeList constraintClauses)
+            : base(ParseNodeType.Delegate, token, TokenType.Delegate, attributes, modifiers, name, typeParameters, constraintClauses) {
+            _returnType = GetParentedNode(returnType);
+            _parameters = GetParentedNodeList(parameters);
+        }
+
+        public ParseNodeList Parameters {
+            get {
+                return _parameters;
+            }
+        }
+
+        public ParseNode ReturnType {
+            get {
+                return _returnType;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/ExternAliasNode.cs b/src/Core/Compiler/CodeModel/Types/ExternAliasNode.cs
new file mode 100644
index 000000000..258686bdc
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/ExternAliasNode.cs
@@ -0,0 +1,21 @@
+// ExternAliasNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: This is supported in conversion
+    internal sealed class ExternAliasNode : ParseNode {
+
+        private NameNode _aliasName;
+
+        public ExternAliasNode(Token token, AtomicNameNode aliasName)
+            : base(ParseNodeType.ExternAlias, token) {
+            _aliasName = (AtomicNameNode)GetParentedNode(aliasName);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/IntrinsicTypeNode.cs b/src/Core/Compiler/CodeModel/Types/IntrinsicTypeNode.cs
new file mode 100644
index 000000000..bde676ebd
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/IntrinsicTypeNode.cs
@@ -0,0 +1,35 @@
+// IntrinsicTypeNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class IntrinsicTypeNode : TypeNode {
+
+        private bool _nullable;
+
+        public IntrinsicTypeNode(Token token)
+            : base(ParseNodeType.PredefinedType, token) {
+        }
+
+        public TokenType Type {
+            get {
+                return token.Type;
+            }
+        }
+
+        public bool IsNullable {
+            get {
+                return _nullable;
+            }
+        }
+
+        public void AddNullability() {
+            _nullable = true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/NamespaceNode.cs b/src/Core/Compiler/CodeModel/Types/NamespaceNode.cs
new file mode 100644
index 000000000..00bfe8e6b
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/NamespaceNode.cs
@@ -0,0 +1,71 @@
+// NamespaceNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class NamespaceNode : ParseNode {
+
+        private string _name;
+        private ParseNodeList _externAliases;
+        private ParseNodeList _usingClauses;
+        private ParseNodeList _members;
+
+        public NamespaceNode(Token token, NameNode nameNode,
+                             ParseNodeList externAliases,
+                             ParseNodeList usingClauses,
+                             ParseNodeList members)
+            : base(ParseNodeType.Namespace, token) {
+            _name = nameNode.Name;
+            _externAliases = GetParentedNodeList(externAliases);
+            _usingClauses = GetParentedNodeList(usingClauses);
+            _members = GetParentedNodeList(members);
+        }
+
+        public NamespaceNode(Token token, string name,
+                             ParseNodeList usingClauses,
+                             ParseNodeList members)
+            : base(ParseNodeType.Namespace, token) {
+            _name = name;
+            _usingClauses = GetParentedNodeList(usingClauses);
+            _members = GetParentedNodeList(members);
+        }
+
+        public ParseNodeList Members {
+            get {
+                return _members;
+            }
+        }
+
+        public string Name {
+            get {
+                return _name;
+            }
+        }
+
+        public ParseNodeList UsingClauses {
+            get {
+                return _usingClauses;
+            }
+        }
+
+        internal void IncludeCompilationUnitUsingClauses() {
+            CompilationUnitNode compilationUnit = (CompilationUnitNode)parent;
+            if (compilationUnit.UsingClauses.Count != 0) {
+                ParseNodeList mergedUsings = new ParseNodeList();
+                mergedUsings.Append(compilationUnit.UsingClauses);
+
+                if (_usingClauses.Count != 0) {
+                    mergedUsings.Append(_usingClauses);
+                }
+
+                _usingClauses = GetParentedNodeList(mergedUsings);
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/PointerTypeNode.cs b/src/Core/Compiler/CodeModel/Types/PointerTypeNode.cs
new file mode 100644
index 000000000..68021c17a
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/PointerTypeNode.cs
@@ -0,0 +1,21 @@
+// PointerTypeNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Not supported in conversion
+    internal sealed class PointerTypeNode : TypeNode {
+
+        private ParseNode _baseType;
+
+        public PointerTypeNode(ParseNode baseType)
+            : base(ParseNodeType.PointerType, baseType.token) {
+            _baseType = GetParentedNode(baseType);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/TypeNode.cs b/src/Core/Compiler/CodeModel/Types/TypeNode.cs
new file mode 100644
index 000000000..7bc33d4b8
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/TypeNode.cs
@@ -0,0 +1,17 @@
+// TypeNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal abstract class TypeNode : ParseNode {
+
+        protected TypeNode(ParseNodeType nodeType, Token token)
+            : base(nodeType, token) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/TypeParameterConstraintNode.cs b/src/Core/Compiler/CodeModel/Types/TypeParameterConstraintNode.cs
new file mode 100644
index 000000000..15362046d
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/TypeParameterConstraintNode.cs
@@ -0,0 +1,26 @@
+// TypeParameterConstraintNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal sealed class TypeParameterConstraintNode : ParseNode {
+
+        private AtomicNameNode _typeParameter;
+        private ParseNodeList _typeConstraints;
+        private bool _hasConstructorConstraint;
+
+        public TypeParameterConstraintNode(AtomicNameNode typeParameter, ParseNodeList typeConstraints,
+                                    bool hasConstructorConstraint)
+            : base(ParseNodeType.ConstraintClause, typeParameter.token) {
+            _typeParameter = typeParameter;
+            _typeConstraints = typeConstraints;
+            _hasConstructorConstraint = hasConstructorConstraint;
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/TypeParameterNode.cs b/src/Core/Compiler/CodeModel/Types/TypeParameterNode.cs
new file mode 100644
index 000000000..e39de3ca6
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/TypeParameterNode.cs
@@ -0,0 +1,24 @@
+// TypeParameterNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    // NOTE: Ignored in conversion
+    internal sealed class TypeParameterNode : ParseNode {
+
+        private ParseNodeList _attributes;
+        private AtomicNameNode _name;
+
+        public TypeParameterNode(ParseNodeList attributes, AtomicNameNode name)
+            : base(ParseNodeType.TypeParameter, name.token) {
+            _attributes = attributes;
+            _name = name;
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/UserTypeNode.cs b/src/Core/Compiler/CodeModel/Types/UserTypeNode.cs
new file mode 100644
index 000000000..433ae72d5
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/UserTypeNode.cs
@@ -0,0 +1,86 @@
+// UserTypeNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal abstract class UserTypeNode : TypeNode {
+
+        private TokenType _type;
+        private ParseNodeList _attributes;
+        private Modifiers _modifiers;
+        private AtomicNameNode _nameNode;
+        private ParseNodeList _typeParameters;
+        private ParseNodeList _constraintClauses;
+
+        public UserTypeNode(ParseNodeType type, Token token, TokenType tokenType,
+                            ParseNodeList attributes,
+                            Modifiers modifiers,
+                            AtomicNameNode name,
+                            ParseNodeList typeParameters,
+                            ParseNodeList constraintClauses)
+            : base(type, token) {
+            _type = tokenType;
+            _attributes = GetParentedNodeList(AttributeNode.GetAttributeList(attributes));
+            _modifiers = modifiers;
+            _nameNode = name;
+            _typeParameters = GetParentedNodeList(typeParameters);
+            _constraintClauses = GetParentedNodeList(constraintClauses);
+        }
+
+        public ParseNodeList Attributes {
+            get {
+                return _attributes;
+            }
+        }
+
+        public string Name {
+            get {
+                return _nameNode.Name;
+            }
+        }
+
+        public NameNode NameNode {
+            get {
+                return _nameNode;
+            }
+        }
+
+        public Modifiers Modifiers {
+            get {
+                return _modifiers;
+            }
+        }
+
+        public TokenType Type {
+            get {
+                return _type;
+            }
+        }
+
+        internal virtual void MergePartialType(CustomTypeNode partialTypeNode) {
+            Debug.Assert(Name == partialTypeNode.Name);
+
+            if (partialTypeNode._attributes.Count > 0) {
+                _attributes.Append(GetParentedNodeList(partialTypeNode._attributes));
+            }
+
+            if ((partialTypeNode.Modifiers & Modifiers.PartialModifiers) != 0) {
+                _modifiers |= (partialTypeNode.Modifiers & Modifiers.PartialModifiers);
+            }
+
+            if (partialTypeNode._typeParameters.Count > 0) {
+                _typeParameters.Append(GetParentedNodeList(partialTypeNode._typeParameters));
+            }
+
+            if (partialTypeNode._constraintClauses.Count > 0) {
+                _constraintClauses.Append(GetParentedNodeList(partialTypeNode._constraintClauses));
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/UsingAliasNode.cs b/src/Core/Compiler/CodeModel/Types/UsingAliasNode.cs
new file mode 100644
index 000000000..33fb2a679
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/UsingAliasNode.cs
@@ -0,0 +1,35 @@
+// UsingAliasNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal class UsingAliasNode : ParseNode {
+
+        private AtomicNameNode _aliasName;
+        private NameNode _typeName;
+
+        public UsingAliasNode(Token token, AtomicNameNode name, NameNode type)
+            : base(ParseNodeType.UsingAlias, token) {
+            _aliasName = (AtomicNameNode)GetParentedNode(name);
+            _typeName = (NameNode)GetParentedNode(type);
+        }
+
+        public string Alias {
+            get {
+                return _aliasName.Name;
+            }
+        }
+
+        public string TypeName {
+            get {
+                return _typeName.Name;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/CodeModel/Types/UsingNamespaceNode.cs b/src/Core/Compiler/CodeModel/Types/UsingNamespaceNode.cs
new file mode 100644
index 000000000..693ad7b6a
--- /dev/null
+++ b/src/Core/Compiler/CodeModel/Types/UsingNamespaceNode.cs
@@ -0,0 +1,27 @@
+// UsingNamespaceNode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.CodeModel {
+
+    internal class UsingNamespaceNode : ParseNode {
+
+        private NameNode _namespaceNameNode;
+
+        public UsingNamespaceNode(Token token, NameNode namespaceName)
+            : base(ParseNodeType.UsingNamespace, token) {
+            _namespaceNameNode = (NameNode)GetParentedNode(namespaceName);
+        }
+
+        public string ReferencedNamespace {
+            get {
+                return _namespaceNameNode.Name;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Compiler.csproj b/src/Core/Compiler/Compiler.csproj
new file mode 100644
index 000000000..7f14af864
--- /dev/null
+++ b/src/Core/Compiler/Compiler.csproj
@@ -0,0 +1,490 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{9F14036F-673F-418E-B817-7E2289D7F3F6}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ScriptSharp</RootNamespace>
+    <AssemblyName>ScriptSharp</AssemblyName>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>false</DelaySign>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;IL_READ_ONLY</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE;IL_READ_ONLY</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.XML" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="..\FileInputStreamSource.cs">
+      <Link>FileInputStreamSource.cs</Link>
+    </Compile>
+    <Compile Include="..\ResXItem.cs">
+      <Link>ResXItem.cs</Link>
+    </Compile>
+    <Compile Include="..\ResXParser.cs">
+      <Link>ResXParser.cs</Link>
+    </Compile>
+    <Compile Include="Importer\IL\ArrayType.cs" />
+    <Compile Include="Importer\IL\AssemblyDefinition.cs" />
+    <Compile Include="Importer\IL\AssemblyFlags.cs" />
+    <Compile Include="Importer\IL\AssemblyHashAlgorithm.cs" />
+    <Compile Include="Importer\IL\AssemblyLinkedResource.cs" />
+    <Compile Include="Importer\IL\AssemblyNameDefinition.cs" />
+    <Compile Include="Importer\IL\AssemblyNameReference.cs" />
+    <Compile Include="Importer\IL\AssemblyReader.cs" />
+    <Compile Include="Importer\IL\AssemblyWriter.cs" />
+    <Compile Include="Importer\IL\BaseAssemblyResolver.cs" />
+    <Compile Include="Importer\IL\CallSite.cs" />
+    <Compile Include="Importer\IL\Cil\Code.cs" />
+    <Compile Include="Importer\IL\Cil\CodeReader.cs" />
+    <Compile Include="Importer\IL\Cil\CodeWriter.cs" />
+    <Compile Include="Importer\IL\Cil\Document.cs" />
+    <Compile Include="Importer\IL\Cil\ExceptionHandler.cs" />
+    <Compile Include="Importer\IL\Cil\ILProcessor.cs" />
+    <Compile Include="Importer\IL\Cil\Instruction.cs" />
+    <Compile Include="Importer\IL\Cil\MethodBody.cs" />
+    <Compile Include="Importer\IL\Cil\OpCode.cs" />
+    <Compile Include="Importer\IL\Cil\OpCodes.cs" />
+    <Compile Include="Importer\IL\Cil\SequencePoint.cs" />
+    <Compile Include="Importer\IL\Cil\Symbols.cs" />
+    <Compile Include="Importer\IL\Cil\VariableDefinition.cs" />
+    <Compile Include="Importer\IL\Cil\VariableReference.cs" />
+    <Compile Include="Importer\IL\CustomAttribute.cs" />
+    <Compile Include="Importer\IL\DefaultAssemblyResolver.cs" />
+    <Compile Include="Importer\IL\EmbeddedResource.cs" />
+    <Compile Include="Importer\IL\EventAttributes.cs" />
+    <Compile Include="Importer\IL\EventDefinition.cs" />
+    <Compile Include="Importer\IL\EventReference.cs" />
+    <Compile Include="Importer\IL\ExportedType.cs" />
+    <Compile Include="Importer\IL\FieldAttributes.cs" />
+    <Compile Include="Importer\IL\FieldDefinition.cs" />
+    <Compile Include="Importer\IL\FieldReference.cs" />
+    <Compile Include="Importer\IL\FileAttributes.cs" />
+    <Compile Include="Importer\IL\FunctionPointerType.cs" />
+    <Compile Include="Importer\IL\GenericInstanceMethod.cs" />
+    <Compile Include="Importer\IL\GenericInstanceType.cs" />
+    <Compile Include="Importer\IL\GenericParameter.cs" />
+    <Compile Include="Importer\IL\GenericParameterAttributes.cs" />
+    <Compile Include="Importer\IL\IConstantProvider.cs" />
+    <Compile Include="Importer\IL\ICustomAttributeProvider.cs" />
+    <Compile Include="Importer\IL\IGenericInstance.cs" />
+    <Compile Include="Importer\IL\IGenericParameterProvider.cs" />
+    <Compile Include="Importer\IL\IMarshalInfoProvider.cs" />
+    <Compile Include="Importer\IL\IMemberDefinition.cs" />
+    <Compile Include="Importer\IL\IMetadataScope.cs" />
+    <Compile Include="Importer\IL\IMetadataTokenProvider.cs" />
+    <Compile Include="Importer\IL\IMethodSignature.cs" />
+    <Compile Include="Importer\IL\Import.cs" />
+    <Compile Include="Importer\IL\LinkedResource.cs" />
+    <Compile Include="Importer\IL\ManifestResourceAttributes.cs" />
+    <Compile Include="Importer\IL\MarshalInfo.cs" />
+    <Compile Include="Importer\IL\MemberDefinitionCollection.cs" />
+    <Compile Include="Importer\IL\MemberReference.cs" />
+    <Compile Include="Importer\IL\MetadataResolver.cs" />
+    <Compile Include="Importer\IL\MetadataSystem.cs" />
+    <Compile Include="Importer\IL\Metadata\BlobHeap.cs" />
+    <Compile Include="Importer\IL\Metadata\Buffers.cs" />
+    <Compile Include="Importer\IL\Metadata\CodedIndex.cs" />
+    <Compile Include="Importer\IL\Metadata\ElementType.cs" />
+    <Compile Include="Importer\IL\Metadata\GuidHeap.cs" />
+    <Compile Include="Importer\IL\Metadata\Heap.cs" />
+    <Compile Include="Importer\IL\Metadata\MetadataToken.cs" />
+    <Compile Include="Importer\IL\Metadata\Row.cs" />
+    <Compile Include="Importer\IL\Metadata\StringHeap.cs" />
+    <Compile Include="Importer\IL\Metadata\TableHeap.cs" />
+    <Compile Include="Importer\IL\Metadata\TokenType.cs" />
+    <Compile Include="Importer\IL\Metadata\UserStringHeap.cs" />
+    <Compile Include="Importer\IL\Metadata\Utilities.cs" />
+    <Compile Include="Importer\IL\MethodAttributes.cs" />
+    <Compile Include="Importer\IL\MethodCallingConvention.cs" />
+    <Compile Include="Importer\IL\MethodDefinition.cs" />
+    <Compile Include="Importer\IL\MethodImplAttributes.cs" />
+    <Compile Include="Importer\IL\MethodReference.cs" />
+    <Compile Include="Importer\IL\MethodReturnType.cs" />
+    <Compile Include="Importer\IL\MethodSemanticsAttributes.cs" />
+    <Compile Include="Importer\IL\MethodSpecification.cs" />
+    <Compile Include="Importer\IL\Modifiers.cs" />
+    <Compile Include="Importer\IL\ModuleDefinition.cs" />
+    <Compile Include="Importer\IL\ModuleKind.cs" />
+    <Compile Include="Importer\IL\ModuleReference.cs" />
+    <Compile Include="Importer\IL\NativeType.cs" />
+    <Compile Include="Importer\IL\ParameterAttributes.cs" />
+    <Compile Include="Importer\IL\ParameterDefinition.cs" />
+    <Compile Include="Importer\IL\ParameterDefinitionCollection.cs" />
+    <Compile Include="Importer\IL\ParameterReference.cs" />
+    <Compile Include="Importer\IL\PE\BinaryStreamReader.cs" />
+    <Compile Include="Importer\IL\PE\BinaryStreamWriter.cs" />
+    <Compile Include="Importer\IL\PE\ByteBuffer.cs" />
+    <Compile Include="Importer\IL\PE\ByteBufferEqualityComparer.cs" />
+    <Compile Include="Importer\IL\PE\DataDirectory.cs" />
+    <Compile Include="Importer\IL\PE\Image.cs" />
+    <Compile Include="Importer\IL\PE\ImageReader.cs" />
+    <Compile Include="Importer\IL\PE\ImageWriter.cs" />
+    <Compile Include="Importer\IL\PE\Section.cs" />
+    <Compile Include="Importer\IL\PE\TextMap.cs" />
+    <Compile Include="Importer\IL\PinnedType.cs" />
+    <Compile Include="Importer\IL\PInvokeAttributes.cs" />
+    <Compile Include="Importer\IL\PInvokeInfo.cs" />
+    <Compile Include="Importer\IL\PointerType.cs" />
+    <Compile Include="Importer\IL\PropertyAttributes.cs" />
+    <Compile Include="Importer\IL\PropertyDefinition.cs" />
+    <Compile Include="Importer\IL\PropertyReference.cs" />
+    <Compile Include="Importer\IL\ReferenceType.cs" />
+    <Compile Include="Importer\IL\Resource.cs" />
+    <Compile Include="Importer\IL\SecurityDeclaration.cs" />
+    <Compile Include="Importer\IL\SentinelType.cs" />
+    <Compile Include="Importer\IL\TargetRuntime.cs" />
+    <Compile Include="Importer\IL\TypeAttributes.cs" />
+    <Compile Include="Importer\IL\TypeDefinition.cs" />
+    <Compile Include="Importer\IL\TypeDefinitionCollection.cs" />
+    <Compile Include="Importer\IL\TypeParser.cs" />
+    <Compile Include="Importer\IL\TypeReference.cs" />
+    <Compile Include="Importer\IL\TypeSpecification.cs" />
+    <Compile Include="Importer\IL\TypeSystem.cs" />
+    <Compile Include="Importer\IL\Utility\Collection.cs" />
+    <Compile Include="Importer\IL\Utility\CryptoConvert.cs" />
+    <Compile Include="Importer\IL\Utility\CryptoService.cs" />
+    <Compile Include="Importer\IL\Utility\Empty.cs" />
+    <Compile Include="Importer\IL\VariantType.cs" />
+    <Compile Include="IStreamResolver.cs" />
+    <Compile Include="IStreamSource.cs" />
+    <Compile Include="ScriptModel\Symbols\IntrinsicType.cs" />
+    <Compile Include="ScriptModel\Symbols\GenericParameterSymbol.cs" />
+    <Compile Include="Utility.cs" />
+    <Compile Include="CompilerOptions.cs" />
+    <Compile Include="IErrorHandler.cs" />
+    <Compile Include="ScriptCompiler.cs" />
+    <Compile Include="ScriptPreprocessor.cs" />
+    <Compile Include="PreprocessorOptions.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Preprocessor\CondenserTextReader.cs" />
+    <Compile Include="Preprocessor\PreprocessorException.cs" />
+    <Compile Include="Preprocessor\PreprocessorTextReader.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Importer\MetadataImporter.cs" />
+    <Compile Include="Importer\MetadataSource.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CodeModel\IParseNodeHandler.cs" />
+    <Compile Include="CodeModel\ParseNode.cs" />
+    <Compile Include="CodeModel\CodeModelBuilder.cs" />
+    <Compile Include="CodeModel\ParseNodeList.cs" />
+    <Compile Include="CodeModel\ParseNodeType.cs" />
+    <Compile Include="CodeModel\CodeModelProcessor.cs" />
+    <Compile Include="CodeModel\Modifiers.cs" />
+    <Compile Include="CodeModel\Attributes\AttributeNode.cs" />
+    <Compile Include="CodeModel\Attributes\AttributeBlockNode.cs" />
+    <Compile Include="CodeModel\Attributes\AttributeTargets.cs" />
+    <Compile Include="CodeModel\Expressions\ConditionalNode.cs" />
+    <Compile Include="CodeModel\Expressions\BinaryExpressionNode.cs" />
+    <Compile Include="CodeModel\Expressions\CastNode.cs" />
+    <Compile Include="CodeModel\Expressions\ArrayNewNode.cs" />
+    <Compile Include="CodeModel\Expressions\BaseNode.cs" />
+    <Compile Include="CodeModel\Expressions\AnonymousMethodNode.cs" />
+    <Compile Include="CodeModel\Expressions\VariableInitializerNode.cs" />
+    <Compile Include="CodeModel\Expressions\DefaultValueNode.cs" />
+    <Compile Include="CodeModel\Expressions\StackAllocNode.cs" />
+    <Compile Include="CodeModel\Expressions\LiteralNode.cs" />
+    <Compile Include="CodeModel\Expressions\SizeofNode.cs" />
+    <Compile Include="CodeModel\Expressions\ThisNode.cs" />
+    <Compile Include="CodeModel\Expressions\NewNode.cs" />
+    <Compile Include="CodeModel\Expressions\TypeofNode.cs" />
+    <Compile Include="CodeModel\Expressions\UnaryExpressionNode.cs" />
+    <Compile Include="CodeModel\Expressions\ExpressionListNode.cs" />
+    <Compile Include="CodeModel\Expressions\ArrayInitializerNode.cs" />
+    <Compile Include="CodeModel\Expressions\ExpressionNode.cs" />
+    <Compile Include="CodeModel\Members\AccessorType.cs" />
+    <Compile Include="CodeModel\Members\AccessorNode.cs" />
+    <Compile Include="CodeModel\Members\ConstantFieldDeclarationNode.cs" />
+    <Compile Include="CodeModel\Members\ConstructorDeclarationNode.cs" />
+    <Compile Include="CodeModel\Members\OperatorDeclarationNode.cs" />
+    <Compile Include="CodeModel\Members\DestructorDeclarationNode.cs" />
+    <Compile Include="CodeModel\Members\MethodDeclarationNode.cs" />
+    <Compile Include="CodeModel\Members\EventDeclarationNode.cs" />
+    <Compile Include="CodeModel\Members\IndexerDeclarationNode.cs" />
+    <Compile Include="CodeModel\Members\PropertyDeclarationNode.cs" />
+    <Compile Include="CodeModel\Members\FieldDeclarationNode.cs" />
+    <Compile Include="CodeModel\Members\EnumerationFieldNode.cs" />
+    <Compile Include="CodeModel\Members\ParameterNode.cs" />
+    <Compile Include="CodeModel\Members\MemberNode.cs" />
+    <Compile Include="CodeModel\Members\ParameterFlags.cs" />
+    <Compile Include="CodeModel\Names\AtomicNameNode.cs" />
+    <Compile Include="CodeModel\Names\AliasQualifiedNameNode.cs" />
+    <Compile Include="CodeModel\Names\GenericNameNode.cs" />
+    <Compile Include="CodeModel\Names\MultiPartNameNode.cs" />
+    <Compile Include="CodeModel\Names\NameNode.cs" />
+    <Compile Include="CodeModel\Statements\BlockStatementNode.cs" />
+    <Compile Include="CodeModel\Statements\ConstantDeclarationNode.cs" />
+    <Compile Include="CodeModel\Statements\CaseLabelNode.cs" />
+    <Compile Include="CodeModel\Statements\BreakNode.cs" />
+    <Compile Include="CodeModel\Statements\ContinueNode.cs" />
+    <Compile Include="CodeModel\Statements\CatchNode.cs" />
+    <Compile Include="CodeModel\Statements\CheckedNode.cs" />
+    <Compile Include="CodeModel\Statements\LabeledStatementNode.cs" />
+    <Compile Include="CodeModel\Statements\UnsafeNode.cs" />
+    <Compile Include="CodeModel\Statements\FixedNode.cs" />
+    <Compile Include="CodeModel\Statements\LockNode.cs" />
+    <Compile Include="CodeModel\Statements\UsingNode.cs" />
+    <Compile Include="CodeModel\Statements\UncheckedNode.cs" />
+    <Compile Include="CodeModel\Statements\TryNode.cs" />
+    <Compile Include="CodeModel\Statements\ThrowNode.cs" />
+    <Compile Include="CodeModel\Statements\YieldBreakNode.cs" />
+    <Compile Include="CodeModel\Statements\YieldReturnNode.cs" />
+    <Compile Include="CodeModel\Statements\ReturnNode.cs" />
+    <Compile Include="CodeModel\Statements\GotoNode.cs" />
+    <Compile Include="CodeModel\Statements\ForeachNode.cs" />
+    <Compile Include="CodeModel\Statements\ForNode.cs" />
+    <Compile Include="CodeModel\Statements\DoWhileNode.cs" />
+    <Compile Include="CodeModel\Statements\WhileNode.cs" />
+    <Compile Include="CodeModel\Statements\SwitchNode.cs" />
+    <Compile Include="CodeModel\Statements\SwitchSectionNode.cs" />
+    <Compile Include="CodeModel\Statements\DefaultLabelNode.cs" />
+    <Compile Include="CodeModel\Statements\IfElseNode.cs" />
+    <Compile Include="CodeModel\Statements\VariableDeclarationNode.cs" />
+    <Compile Include="CodeModel\Statements\ExpressionStatementNode.cs" />
+    <Compile Include="CodeModel\Statements\EmptyStatementNode.cs" />
+    <Compile Include="CodeModel\Statements\StatementNode.cs" />
+    <Compile Include="CodeModel\Tokens\BooleanToken.cs" />
+    <Compile Include="CodeModel\Tokens\CharToken.cs" />
+    <Compile Include="CodeModel\Tokens\CommentTokenType.cs" />
+    <Compile Include="CodeModel\Tokens\CommentToken.cs" />
+    <Compile Include="CodeModel\Tokens\DecimalToken.cs" />
+    <Compile Include="CodeModel\Tokens\DoubleToken.cs" />
+    <Compile Include="CodeModel\Tokens\FloatToken.cs" />
+    <Compile Include="CodeModel\Tokens\ULongToken.cs" />
+    <Compile Include="CodeModel\Tokens\LongToken.cs" />
+    <Compile Include="CodeModel\Tokens\UIntToken.cs" />
+    <Compile Include="CodeModel\Tokens\IntToken.cs" />
+    <Compile Include="CodeModel\Tokens\NullToken.cs" />
+    <Compile Include="CodeModel\Tokens\StringToken.cs" />
+    <Compile Include="CodeModel\Tokens\LiteralToken.cs" />
+    <Compile Include="CodeModel\Tokens\LiteralTokenType.cs" />
+    <Compile Include="CodeModel\Tokens\IdentifierToken.cs" />
+    <Compile Include="CodeModel\Tokens\Token.cs" />
+    <Compile Include="CodeModel\Tokens\TokenFlags.cs" />
+    <Compile Include="CodeModel\Tokens\TokenInfo.cs" />
+    <Compile Include="CodeModel\Tokens\TokenType.cs" />
+    <Compile Include="CodeModel\Types\CompilationUnitNode.cs" />
+    <Compile Include="CodeModel\Types\ArrayTypeNode.cs" />
+    <Compile Include="CodeModel\Types\PointerTypeNode.cs" />
+    <Compile Include="CodeModel\Types\DelegateTypeNode.cs" />
+    <Compile Include="CodeModel\Types\CustomTypeNode.cs" />
+    <Compile Include="CodeModel\Types\TypeParameterConstraintNode.cs" />
+    <Compile Include="CodeModel\Types\UserTypeNode.cs" />
+    <Compile Include="CodeModel\Types\IntrinsicTypeNode.cs" />
+    <Compile Include="CodeModel\Types\TypeParameterNode.cs" />
+    <Compile Include="CodeModel\Types\ExternAliasNode.cs" />
+    <Compile Include="CodeModel\Types\UsingAliasNode.cs" />
+    <Compile Include="CodeModel\Types\UsingNamespaceNode.cs" />
+    <Compile Include="CodeModel\Types\NamespaceNode.cs" />
+    <Compile Include="CodeModel\Types\TypeNode.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Parser\BufferPosition.cs" />
+    <Compile Include="Parser\PreprocessorIfLine.cs" />
+    <Compile Include="Parser\PreprocessorLineNumberLine.cs" />
+    <Compile Include="Parser\PreprocessorControlLine.cs" />
+    <Compile Include="Parser\PreprocessorDeclarationLine.cs" />
+    <Compile Include="Parser\PreprocessorIdentifierToken.cs" />
+    <Compile Include="Parser\PreprocessorStringToken.cs" />
+    <Compile Include="Parser\PreprocessorIntToken.cs" />
+    <Compile Include="Parser\PreprocessorTokenType.cs" />
+    <Compile Include="Parser\Error.cs" />
+    <Compile Include="Parser\ErrorEventArgs.cs" />
+    <Compile Include="Parser\ErrorEventHandler.cs" />
+    <Compile Include="Parser\FileErrorEventArgs.cs" />
+    <Compile Include="Parser\FileErrorEventHandler.cs" />
+    <Compile Include="Parser\FileLexer.cs" />
+    <Compile Include="Parser\FileParser.cs" />
+    <Compile Include="Parser\FilePosition.cs" />
+    <Compile Include="Parser\Keywords.cs" />
+    <Compile Include="Parser\Lexer.cs" />
+    <Compile Include="Parser\LexError.cs" />
+    <Compile Include="Parser\LineMap.cs" />
+    <Compile Include="Parser\Name.cs" />
+    <Compile Include="Parser\NameTable.cs" />
+    <Compile Include="Parser\ParseError.cs" />
+    <Compile Include="Parser\Parser.cs" />
+    <Compile Include="Parser\PreprocessorError.cs" />
+    <Compile Include="Parser\PreprocessorKeywords.cs" />
+    <Compile Include="Parser\PreprocessorLexer.cs" />
+    <Compile Include="Parser\PreprocessorLine.cs" />
+    <Compile Include="Parser\PreprocessorLineParser.cs" />
+    <Compile Include="Parser\PreprocessorTokens.cs" />
+    <Compile Include="Parser\TextBuffer.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Compiler\CodeBuilder.cs" />
+    <Compile Include="Compiler\MetadataBuilder.cs" />
+    <Compile Include="Compiler\ImplementationBuilder.cs" />
+    <Compile Include="Compiler\StatementBuilder.cs" />
+    <Compile Include="Compiler\ExpressionBuilder.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ScriptModel\Expressions\Operator.cs" />
+    <Compile Include="ScriptModel\Expressions\OperatorConverter.cs" />
+    <Compile Include="ScriptModel\Expressions\BaseExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\BinaryExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\ConditionalExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\NewExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\UnaryExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\ThisExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\TypeExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\LocalExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\LiteralExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\Expression.cs" />
+    <Compile Include="ScriptModel\Expressions\ExpressionType.cs" />
+    <Compile Include="ScriptModel\Expressions\MemberExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\BaseInitializerExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\MethodExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\IndexerExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\PropertyExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\FieldExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\EnumerationFieldExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\EventExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\DelegateExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\LateBoundOperation.cs" />
+    <Compile Include="ScriptModel\Expressions\LateBoundExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\DelegateInvokeExpression.cs" />
+    <Compile Include="ScriptModel\Expressions\InlineScriptExpression.cs" />
+    <Compile Include="ScriptModel\Statements\BlockStatement.cs" />
+    <Compile Include="ScriptModel\Statements\BreakStatement.cs" />
+    <Compile Include="ScriptModel\Statements\ContinueStatement.cs" />
+    <Compile Include="ScriptModel\Statements\TryCatchFinallyStatement.cs" />
+    <Compile Include="ScriptModel\Statements\ThrowStatement.cs" />
+    <Compile Include="ScriptModel\Statements\SwitchGroup.cs" />
+    <Compile Include="ScriptModel\Statements\SwitchStatement.cs" />
+    <Compile Include="ScriptModel\Statements\ForStatement.cs" />
+    <Compile Include="ScriptModel\Statements\ForInStatement.cs" />
+    <Compile Include="ScriptModel\Statements\WhileStatement.cs" />
+    <Compile Include="ScriptModel\Statements\IfElseStatement.cs" />
+    <Compile Include="ScriptModel\Statements\ExpressionStatement.cs" />
+    <Compile Include="ScriptModel\Statements\ReturnStatement.cs" />
+    <Compile Include="ScriptModel\Statements\VariableDeclarationStatement.cs" />
+    <Compile Include="ScriptModel\Statements\EmptyStatement.cs" />
+    <Compile Include="ScriptModel\Statements\ErrorStatement.cs" />
+    <Compile Include="ScriptModel\Statements\Statement.cs" />
+    <Compile Include="ScriptModel\Statements\StatementType.cs" />
+    <Compile Include="ScriptModel\Symbols\SymbolImplementation.cs" />
+    <Compile Include="ScriptModel\Symbols\CodeMemberSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\SymbolImplementationFlags.cs" />
+    <Compile Include="ScriptModel\Symbols\ClassSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\SymbolSetDumper.cs" />
+    <Compile Include="ScriptModel\Symbols\ConstructorSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\IndexerSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\SymbolSet.cs" />
+    <Compile Include="ScriptModel\Symbols\ILocalSymbolTable.cs" />
+    <Compile Include="ScriptModel\Symbols\ParameterSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\ParameterMode.cs" />
+    <Compile Include="ScriptModel\Symbols\SymbolScope.cs" />
+    <Compile Include="ScriptModel\Symbols\VariableSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\LocalSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\EventSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\MethodSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\AnonymousMethodSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\PropertySymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\EnumerationFieldSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\FieldSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\DelegateSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\EnumerationSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\InterfaceSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\MemberSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\MemberVisibility.cs" />
+    <Compile Include="ScriptModel\Symbols\TypeSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\SymbolFilter.cs" />
+    <Compile Include="ScriptModel\Symbols\ISymbolTable.cs" />
+    <Compile Include="ScriptModel\Symbols\NamespaceSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\Symbol.cs" />
+    <Compile Include="ScriptModel\Symbols\SymbolType.cs" />
+    <Compile Include="ScriptModel\Symbols\SymbolObfuscator.cs" />
+    <Compile Include="ScriptModel\Symbols\SymbolImplementationTransformer.cs" />
+    <Compile Include="ScriptModel\Symbols\ISymbolTransformer.cs" />
+    <Compile Include="ScriptModel\Symbols\SymbolSetTransformer.cs" />
+    <Compile Include="ScriptModel\Symbols\RecordSymbol.cs" />
+    <Compile Include="ScriptModel\Symbols\SymbolInternalizer.cs" />
+    <Compile Include="ScriptModel\Symbols\ResourcesSymbol.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Validator\CodeModelValidator.cs" />
+    <Compile Include="Validator\IParseNodeValidator.cs" />
+    <Compile Include="Validator\UnsupportedParseNodeValidator.cs" />
+    <Compile Include="Validator\TryNodeValidator.cs" />
+    <Compile Include="Validator\ParameterNodeValidator.cs" />
+    <Compile Include="Validator\ArrayTypeNodeValidator.cs" />
+    <Compile Include="Validator\CompilationUnitNodeValidator.cs" />
+    <Compile Include="Validator\CustomTypeNodeValidator.cs" />
+    <Compile Include="Validator\NameNodeValidator.cs" />
+    <Compile Include="Validator\NamespaceNodeValidator.cs" />
+    <Compile Include="Validator\ThrowNodeValidator.cs" />
+    <Compile Include="Validator\FieldDeclarationNodeValidator.cs" />
+    <Compile Include="Validator\EnumerationFieldNodeValidator.cs" />
+    <Compile Include="Validator\ArrayNewNodeValidator.cs" />
+    <Compile Include="Validator\MethodDeclarationNodeValidator.cs" />
+    <Compile Include="Validator\PropertyDeclarationNodeValidator.cs" />
+    <Compile Include="Validator\EventDeclarationNodeValidator.cs" />
+    <Compile Include="Validator\NewNodeValidator.cs" />
+    <Compile Include="Validator\IndexerDeclarationNodeValidator.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Generator\CodeGenerator.cs" />
+    <Compile Include="Generator\ExpressionGenerator.cs" />
+    <Compile Include="Generator\DocCommentGenerator.cs" />
+    <Compile Include="Generator\StatementGenerator.cs" />
+    <Compile Include="Generator\MemberGenerator.cs" />
+    <Compile Include="Generator\TypeGenerator.cs" />
+    <Compile Include="Generator\ScriptTextWriter.cs" />
+    <Compile Include="Generator\NamespaceGenerator.cs" />
+    <Compile Include="Generator\ScriptGenerator.cs" />
+    <Compile Include="Generator\TestGenerator.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Importer\MetadataHelpers.cs" />
+    <Compile Include="IScriptInfo.cs" />
+    <Compile Include="Compiler\ResourcesBuilder.cs" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Core/Compiler/Compiler/CodeBuilder.cs b/src/Core/Compiler/Compiler/CodeBuilder.cs
new file mode 100644
index 000000000..b1860caa8
--- /dev/null
+++ b/src/Core/Compiler/Compiler/CodeBuilder.cs
@@ -0,0 +1,190 @@
+// CodeBuilder.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Compiler {
+
+    internal sealed class CodeBuilder {
+
+        private CompilerOptions _options;
+        private IErrorHandler _errorHandler;
+
+        private List<SymbolImplementation> _implementations;
+
+        public CodeBuilder(CompilerOptions options, IErrorHandler errorHandler) {
+            _options = options;
+            _errorHandler = errorHandler;
+        }
+
+        public ICollection<SymbolImplementation> BuildCode(SymbolSet symbols) {
+            _implementations = new List<SymbolImplementation>();
+
+            foreach (NamespaceSymbol namespaceSymbol in symbols.Namespaces) {
+                if (namespaceSymbol.HasApplicationTypes == false) {
+                    continue;
+                }
+
+                foreach (TypeSymbol type in namespaceSymbol.Types) {
+                    if (type.IsApplicationType == false) {
+                        continue;
+                    }
+
+                    if (type.IsTestType && !_options.IncludeTests) {
+                        // Ignore test types, if tests are not to be compiled
+                        continue;
+                    }
+
+                    switch (type.Type) {
+                        case SymbolType.Class:
+                            BuildCode((ClassSymbol)type);
+                            break;
+                        case SymbolType.Record:
+                            if (((RecordSymbol)type).Constructor != null) {
+                                BuildCode(((RecordSymbol)type).Constructor);
+                            }
+                            break;
+                    }
+                }
+            }
+
+            return _implementations;
+        }
+
+        private void BuildCode(ClassSymbol classSymbol) {
+            if (classSymbol.Constructor != null) {
+                BuildCode(classSymbol.Constructor);
+            }
+
+            if (classSymbol.StaticConstructor != null) {
+                BuildCode(classSymbol.StaticConstructor);
+            }
+
+            if (classSymbol.Indexer != null) {
+                BuildCode(classSymbol.Indexer);
+            }
+
+            foreach (MemberSymbol memberSymbol in classSymbol.Members) {
+                switch (memberSymbol.Type) {
+                    case SymbolType.Event:
+                        BuildCode((EventSymbol)memberSymbol);
+                        break;
+                    case SymbolType.Field:
+                        BuildCode((FieldSymbol)memberSymbol);
+                        break;
+                    case SymbolType.Method:
+                        BuildCode((MethodSymbol)memberSymbol);
+                        break;
+                    case SymbolType.Property:
+                        BuildCode((PropertySymbol)memberSymbol);
+                        break;
+                }
+            }
+        }
+
+        private void BuildCode(EventSymbol eventSymbol) {
+            if (eventSymbol.IsAbstract || eventSymbol.DefaultImplementation) {
+                return;
+            }
+
+            ImplementationBuilder implBuilder = new ImplementationBuilder(_options, _errorHandler);
+
+            eventSymbol.AddImplementation(implBuilder.BuildEventAdd(eventSymbol), /* adder */ true);
+            eventSymbol.AddImplementation(implBuilder.BuildEventRemove(eventSymbol), /* adder */ false);
+
+            _implementations.Add(eventSymbol.AdderImplementation);
+            _implementations.Add(eventSymbol.RemoverImplementation);
+
+            if (eventSymbol.AnonymousMethods != null) {
+                foreach (AnonymousMethodSymbol anonymousMethod in eventSymbol.AnonymousMethods) {
+                    Debug.Assert(anonymousMethod.Implementation != null);
+
+                    _implementations.Add(anonymousMethod.Implementation);
+                }
+            }
+        }
+
+        private void BuildCode(FieldSymbol fieldSymbol) {
+            ImplementationBuilder implBuilder = new ImplementationBuilder(_options, _errorHandler);
+            fieldSymbol.AddImplementation(implBuilder.BuildField(fieldSymbol));
+
+            _implementations.Add(fieldSymbol.Implementation);
+        }
+
+        private void BuildCode(IndexerSymbol indexerSymbol) {
+            if (indexerSymbol.IsAbstract) {
+                return;
+            }
+
+            ImplementationBuilder implBuilder = new ImplementationBuilder(_options, _errorHandler);
+
+            indexerSymbol.AddImplementation(implBuilder.BuildIndexerGetter(indexerSymbol), /* getter */ true);
+            _implementations.Add(indexerSymbol.GetterImplementation);
+
+            if (indexerSymbol.IsReadOnly == false) {
+                indexerSymbol.AddImplementation(implBuilder.BuildPropertySetter(indexerSymbol), /* getter */ false);
+                _implementations.Add(indexerSymbol.SetterImplementation);
+            }
+
+            if (indexerSymbol.AnonymousMethods != null) {
+                foreach (AnonymousMethodSymbol anonymousMethod in indexerSymbol.AnonymousMethods) {
+                    Debug.Assert(anonymousMethod.Implementation != null);
+
+                    _implementations.Add(anonymousMethod.Implementation);
+                }
+            }
+        }
+
+        private void BuildCode(MethodSymbol methodSymbol) {
+            if (methodSymbol.IsAbstract) {
+                return;
+            }
+
+            ImplementationBuilder implBuilder = new ImplementationBuilder(_options, _errorHandler);
+            methodSymbol.AddImplementation(implBuilder.BuildMethod(methodSymbol));
+
+            _implementations.Add(methodSymbol.Implementation);
+
+            if (methodSymbol.AnonymousMethods != null) {
+                foreach (AnonymousMethodSymbol anonymousMethod in methodSymbol.AnonymousMethods) {
+                    Debug.Assert(anonymousMethod.Implementation != null);
+
+                    _implementations.Add(anonymousMethod.Implementation);
+                }
+            }
+        }
+
+        private void BuildCode(PropertySymbol propertySymbol) {
+            if (propertySymbol.IsAbstract) {
+                return;
+            }
+
+            ImplementationBuilder implBuilder = new ImplementationBuilder(_options, _errorHandler);
+            
+            propertySymbol.AddImplementation(implBuilder.BuildPropertyGetter(propertySymbol), /* getter */ true);
+            _implementations.Add(propertySymbol.GetterImplementation);
+
+            if (propertySymbol.IsReadOnly == false) {
+                propertySymbol.AddImplementation(implBuilder.BuildPropertySetter(propertySymbol), /* getter */ false);
+                _implementations.Add(propertySymbol.SetterImplementation);
+            }
+
+            if (propertySymbol.AnonymousMethods != null) {
+                foreach (AnonymousMethodSymbol anonymousMethod in propertySymbol.AnonymousMethods) {
+                    Debug.Assert(anonymousMethod.Implementation != null);
+
+                    _implementations.Add(anonymousMethod.Implementation);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Compiler/ExpressionBuilder.cs b/src/Core/Compiler/Compiler/ExpressionBuilder.cs
new file mode 100644
index 000000000..8fbca4d99
--- /dev/null
+++ b/src/Core/Compiler/Compiler/ExpressionBuilder.cs
@@ -0,0 +1,1487 @@
+// ExpressionBuilder.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Compiler {
+
+    internal sealed class ExpressionBuilder {
+
+        private CompilerOptions _options;
+        private IErrorHandler _errorHandler;
+        private ILocalSymbolTable _symbolTable;
+        private Symbol _symbolContext;
+        private CodeMemberSymbol _memberContext;
+        private ClassSymbol _classContext;
+        private SymbolSet _symbolSet;
+
+        public ExpressionBuilder(ILocalSymbolTable symbolTable, CodeMemberSymbol memberContext, IErrorHandler errorHandler, CompilerOptions options) {
+            _symbolTable = symbolTable;
+            _symbolContext = memberContext;
+            _memberContext = memberContext;
+            _classContext = ((ClassSymbol)memberContext.Parent).PrimaryPartialClass;
+            _symbolSet = memberContext.SymbolSet;
+            _errorHandler = errorHandler;
+            _options = options;
+        }
+
+        public ExpressionBuilder(ILocalSymbolTable symbolTable, FieldSymbol fieldContext, IErrorHandler errorHandler, CompilerOptions options) {
+            _symbolTable = symbolTable;
+            _symbolContext = fieldContext;
+            _classContext = ((ClassSymbol)fieldContext.Parent).PrimaryPartialClass;
+            _symbolSet = fieldContext.SymbolSet;
+            _errorHandler = errorHandler;
+            _options = options;
+        }
+
+        public Expression BuildExpression(ParseNode node) {
+            Expression expression = null;
+
+            switch (node.NodeType) {
+                case ParseNodeType.Literal:
+                    expression = ProcessLiteralNode((LiteralNode)node);
+                    break;
+                case ParseNodeType.Name:
+                case ParseNodeType.GenericName:
+                    expression = ProcessNameNode((NameNode)node);
+                    break;
+                case ParseNodeType.Typeof:
+                    expression = ProcessTypeofNode((TypeofNode)node);
+                    break;
+                case ParseNodeType.This:
+                    expression = ProcessThisNode((ThisNode)node);
+                    break;
+                case ParseNodeType.Base:
+                    expression = ProcessBaseNode((BaseNode)node);
+                    break;
+                case ParseNodeType.UnaryExpression:
+                    expression = ProcessUnaryExpressionNode((UnaryExpressionNode)node);
+                    break;
+                case ParseNodeType.BinaryExpression:
+                    expression = ProcessBinaryExpressionNode((BinaryExpressionNode)node);
+                    break;
+                case ParseNodeType.Conditional:
+                    expression = ProcessConditionalNode((ConditionalNode)node);
+                    break;
+                case ParseNodeType.New:
+                    expression = ProcessNewNode((NewNode)node);
+                    break;
+                case ParseNodeType.ArrayNew:
+                    expression = ProcessArrayNewNode((ArrayNewNode)node);
+                    break;
+                case ParseNodeType.ArrayInitializer:
+                    expression = ProcessArrayInitializerNode((ArrayInitializerNode)node);
+                    break;
+                case ParseNodeType.ArrayType:
+                    expression = ProcessArrayTypeNode((ArrayTypeNode)node);
+                    break;
+                case ParseNodeType.PredefinedType:
+                    expression = ProcessIntrinsicType((IntrinsicTypeNode)node);
+                    break;
+                case ParseNodeType.Cast:
+                    expression = ProcessCastNode((CastNode)node);
+                    break;
+                case ParseNodeType.AnonymousMethod:
+                    expression = ProcessAnonymousMethodNode((AnonymousMethodNode)node);
+                    break;
+                default:
+                    Debug.Fail("Unhandled Expression Node: " + node.NodeType);
+                    break;
+            }
+
+            if ((node is ExpressionNode) && ((ExpressionNode)node).Parenthesized) {
+                expression.AddParenthesisHint();
+            }
+            return expression;
+        }
+
+        public List<Expression> BuildExpressionList(ExpressionListNode node) {
+            List<Expression> expressions = new List<Expression>(node.Expressions.Count);
+
+            foreach (ParseNode itemNode in node.Expressions) {
+                Expression itemExpr = BuildExpression(itemNode);
+                if (itemExpr is MemberExpression) {
+                    itemExpr = TransformMemberExpression((MemberExpression)itemExpr);
+                }
+                expressions.Add(itemExpr);
+            }
+
+            return expressions;
+        }
+
+        private Expression ProcessAnonymousMethodNode(AnonymousMethodNode node) {
+            TypeSymbol voidType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Void);
+            Debug.Assert(voidType != null);
+
+            bool createStaticDelegate = (_memberContext.Visibility & MemberVisibility.Static) != 0;
+
+            AnonymousMethodSymbol methodSymbol =
+                new AnonymousMethodSymbol(_memberContext, _symbolTable, voidType, createStaticDelegate);
+            methodSymbol.SetParseContext(node);
+
+            if ((node.Parameters != null) && (node.Parameters.Count != 0)) {
+                foreach (ParameterNode parameterNode in node.Parameters) {
+                    TypeSymbol parameterType = _symbolSet.ResolveType(parameterNode.Type, _symbolTable, _symbolContext);
+                    Debug.Assert(parameterType != null);
+
+                    ParameterSymbol paramSymbol =
+                        new ParameterSymbol(parameterNode.Name, methodSymbol, parameterType, ParameterMode.In);
+                    if (paramSymbol != null) {
+                        paramSymbol.SetParseContext(parameterNode);
+                        methodSymbol.AddParameter(paramSymbol);
+                    }
+                }
+            }
+
+            ImplementationBuilder implBuilder = new ImplementationBuilder(_options, _errorHandler);
+            SymbolImplementation implementation = implBuilder.BuildMethod(methodSymbol);
+
+            methodSymbol.AddImplementation(implementation);
+
+            if ((createStaticDelegate == false) && (implementation.RequiresThisContext == false)) {
+                methodSymbol.SetVisibility(methodSymbol.Visibility | MemberVisibility.Static);
+                createStaticDelegate = true;
+            }
+
+            Expression objectExpression;
+            if (createStaticDelegate) {
+                TypeSymbol objectType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Object);
+                Debug.Assert(objectType != null);
+
+                objectExpression = new LiteralExpression(objectType, null);
+            }
+            else {
+                objectExpression = new ThisExpression(_classContext, /* explicitReference */ true);
+            }
+
+            return new DelegateExpression(objectExpression, methodSymbol);
+        }
+
+        private Expression ProcessArrayInitializerNode(ArrayInitializerNode node) {
+            TypeSymbol itemTypeSymbol = _symbolSet.ResolveIntrinsicType(IntrinsicType.Object);
+            Debug.Assert(itemTypeSymbol != null);
+
+            TypeSymbol arrayTypeSymbol = _symbolSet.CreateArrayTypeSymbol(itemTypeSymbol);
+            Expression[] values = new Expression[node.Values.Count];
+
+            int i = 0;
+            foreach (ParseNode valueNode in node.Values) {
+                values[i] = BuildExpression(valueNode);
+                if (values[i] is MemberExpression) {
+                    values[i] = TransformMemberExpression((MemberExpression)values[i]);
+                }
+                i++;
+            }
+
+            return new LiteralExpression(arrayTypeSymbol, values);
+        }
+
+        private Expression ProcessArrayNewNode(ArrayNewNode node) {
+            TypeSymbol itemTypeSymbol = _symbolSet.ResolveType(node.TypeReference, _symbolTable, _symbolContext);
+            Debug.Assert(itemTypeSymbol != null);
+
+            TypeSymbol arrayTypeSymbol = _symbolSet.CreateArrayTypeSymbol(itemTypeSymbol);
+
+            if (node.InitializerExpression == null) {
+                if (node.ExpressionList == null) {
+                    return new LiteralExpression(arrayTypeSymbol, new Expression[0]);
+                }
+                else {
+                    Debug.Assert(node.ExpressionList.NodeType == ParseNodeType.ExpressionList);
+                    ExpressionListNode argsList = (ExpressionListNode)node.ExpressionList;
+
+                    Debug.Assert(argsList.Expressions.Count == 1);
+                    Expression sizeExpression = BuildExpression(argsList.Expressions[0]);
+                    if (sizeExpression is MemberExpression) {
+                        sizeExpression = TransformMemberExpression((MemberExpression)sizeExpression);
+                    }
+
+                    NewExpression newExpr = new NewExpression(arrayTypeSymbol);
+                    newExpr.AddParameterValue(sizeExpression);
+
+                    return newExpr;
+                }
+            }
+            else {
+                ArrayInitializerNode initializerNode = (ArrayInitializerNode)node.InitializerExpression;
+                Expression[] values = new Expression[initializerNode.Values.Count];
+
+                int i = 0;
+                foreach (ParseNode valueNode in initializerNode.Values) {
+                    values[i] = BuildExpression(valueNode);
+                    if (values[i] is MemberExpression) {
+                        values[i] = TransformMemberExpression((MemberExpression)values[i]);
+                    }
+                    i++;
+                }
+
+                return new LiteralExpression(arrayTypeSymbol, values);
+            }
+        }
+
+        private Expression ProcessArrayTypeNode(ArrayTypeNode node) {
+            TypeSymbol itemTypeSymbol = _symbolSet.ResolveType(node.BaseType, _symbolTable, _symbolContext);
+            Debug.Assert(itemTypeSymbol != null);
+
+            TypeSymbol arrayTypeSymbol = _symbolSet.CreateArrayTypeSymbol(itemTypeSymbol);
+
+            return new TypeExpression(arrayTypeSymbol, SymbolFilter.Public | SymbolFilter.StaticMembers);
+        }
+
+        private Expression ProcessBaseNode(BaseNode node) {
+            Debug.Assert(_classContext.BaseClass != null);
+
+            return new BaseExpression(_classContext.BaseClass);
+        }
+
+        private Expression ProcessBinaryExpressionNode(BinaryExpressionNode node) {
+            if ((node.Operator == TokenType.PlusPlus) ||
+                (node.Operator == TokenType.MinusMinus)) {
+                Expression childExpression = BuildExpression(node.LeftChild);
+                if (childExpression is MemberExpression) {
+                    childExpression = TransformMemberExpression((MemberExpression)childExpression);
+                }
+
+                return new UnaryExpression((node.Operator == TokenType.PlusPlus) ? Operator.PreIncrement : Operator.PreDecrement,
+                                           childExpression);
+            }
+
+            if (node.Operator == TokenType.Dot) {
+                return ProcessDotExpressionNode(node);
+            }
+
+            if (node.Operator == TokenType.OpenParen) {
+                return ProcessOpenParenExpressionNode(node);
+            }
+
+            if (node.Operator == TokenType.OpenSquare) {
+                return ProcessOpenBracketsExpressionNode(node);
+            }
+
+            Expression leftExpression = BuildExpression(node.LeftChild);
+            Expression rightExpression = BuildExpression(node.RightChild);
+
+            if ((node.Operator == TokenType.PlusEqual) ||
+                (node.Operator == TokenType.MinusEqual)) {
+                if (rightExpression.Type == ExpressionType.Member) {
+                    rightExpression = TransformMemberExpression((MemberExpression)rightExpression);
+                }
+
+                if ((rightExpression.Type == ExpressionType.Delegate) ||
+                    (rightExpression.EvaluatedType.Type == SymbolType.Delegate)) {
+                    Debug.Assert(leftExpression.Type == ExpressionType.Member);
+                    Debug.Assert(((MemberExpression)leftExpression).Member.Type == SymbolType.Event);
+
+                    bool add = (node.Operator == TokenType.PlusEqual);
+                    EventExpression eventExpression =
+                        (EventExpression)TransformMemberExpression((MemberExpression)leftExpression,
+                                                                   add, /* isEventAddOrRemove */ true);
+
+                    eventExpression.SetHandler(rightExpression);
+                    return eventExpression;
+                }
+
+                if (leftExpression.Type == ExpressionType.Member) {
+                    MemberExpression leftMemberExpression = (MemberExpression)leftExpression;
+                    if (leftMemberExpression.Member.Type == SymbolType.Property) {
+                        // For properties, we need to expand out the += and -= into a get, followed by
+                        // the + or - operation and then a set with the resulting value
+
+                        leftExpression = TransformMemberExpression(leftMemberExpression, /* getter */ false);
+
+                        Expression initialValueExpression = TransformMemberExpression(leftMemberExpression);
+                        Operator substitutedOperator;
+
+                        if (node.Operator == TokenType.PlusEqual) {
+                            substitutedOperator = Operator.Plus;
+                        }
+                        else {
+                            substitutedOperator = Operator.Minus;
+                        }
+
+                        Expression newValueExpression =
+                            new BinaryExpression(substitutedOperator, initialValueExpression, rightExpression);
+                        return new BinaryExpression(Operator.Equals, leftExpression, newValueExpression);
+                    }
+                }
+            }
+
+            if (leftExpression.Type == ExpressionType.Member) {
+                leftExpression = TransformMemberExpression((MemberExpression)leftExpression,
+                    /* getOrAdd */ (node.Operator != TokenType.Equal));
+            }
+
+            if (rightExpression.Type == ExpressionType.Member) {
+                rightExpression = TransformMemberExpression((MemberExpression)rightExpression);
+            }
+
+            TypeSymbol resultType = null;
+            Operator operatorType = OperatorConverter.OperatorFromToken(node.Operator);
+
+            switch (node.Operator) {
+                case TokenType.EqualEqual:
+                case TokenType.NotEqual:
+                case TokenType.Less:
+                case TokenType.LessEqual:
+                case TokenType.Greater:
+                case TokenType.GreaterEqual:
+                case TokenType.Is:
+                    resultType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Boolean);
+                    break;
+                case TokenType.As:
+                    resultType = rightExpression.EvaluatedType;
+                    break;
+                case TokenType.Plus:
+                    if (rightExpression.EvaluatedType == _symbolSet.ResolveIntrinsicType(IntrinsicType.String)) {
+                        resultType = rightExpression.EvaluatedType;
+                    }
+                    break;
+                case TokenType.Slash:
+                    resultType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Double);
+                    break;
+            }
+
+            if (operatorType != Operator.Invalid) {
+                if ((operatorType == Operator.BitwiseAnd) ||
+                    (operatorType == Operator.BitwiseAndEquals) ||
+                    (operatorType == Operator.BitwiseOr) ||
+                    (operatorType == Operator.BitwiseOrEquals) ||
+                    (operatorType == Operator.BitwiseXor) ||
+                    (operatorType == Operator.BitwiseXorEquals)) {
+                    TypeSymbol leftExpressionType = leftExpression.EvaluatedType;
+
+                    if (leftExpressionType == _symbolSet.ResolveIntrinsicType(IntrinsicType.Boolean)) {
+                        // For bitwise operators involving boolean expressions, we perform
+                        // a type coercion due to behavioral differences between C# and JavaScript.
+                        // Example:
+                        //     var result = true & true;
+                        //     actual: result === 1
+                        //     expected: result === true
+                        Operator baseOperatorType = operatorType;
+
+                        switch (operatorType) {
+                            case Operator.BitwiseAndEquals:
+                                baseOperatorType = Operator.BitwiseAnd;
+                                break;
+                            case Operator.BitwiseOrEquals:
+                                baseOperatorType = Operator.BitwiseOr;
+                                break;
+                            case Operator.BitwiseXorEquals:
+                                baseOperatorType = Operator.BitwiseXor;
+                                break;
+                        }
+
+                        // Map "x op y" to "(x op y) === 1"
+                        // Map "x op= y" to "x = (x op y) === 1"
+                        Expression bitwiseExpression =
+                            new BinaryExpression(baseOperatorType, leftExpression, rightExpression);
+                        bitwiseExpression.AddParenthesisHint();
+
+                        Expression coerceExpression =
+                            new BinaryExpression(Operator.EqualEqualEqual, bitwiseExpression,
+                                new LiteralExpression(_symbolSet.ResolveIntrinsicType(IntrinsicType.Integer), 1));
+
+                        if (operatorType == baseOperatorType) {
+                            return coerceExpression;
+                        }
+                        else {
+                            // Since y above can be a complex expression, add parentheses around it to ensure
+                            // proper operator precedence.
+                            rightExpression.AddParenthesisHint();
+
+                            return new BinaryExpression(Operator.Equals, TransformGetPropertyExpression(leftExpression), coerceExpression);
+                        }
+                    }
+                }
+
+                if ((operatorType == Operator.EqualEqualEqual) ||
+                    (operatorType == Operator.NotEqualEqual)) {
+                    LiteralExpression literalExpression = rightExpression as LiteralExpression;
+                    if (literalExpression != null) {
+                        // Comparisons with null are mapped to the less-strict comparison operator
+                        // to handle undefined as well.
+                        if (literalExpression.Value == null) {
+                            if (operatorType == Operator.EqualEqualEqual) {
+                                return new BinaryExpression(Operator.EqualEqual, leftExpression, rightExpression, resultType);
+                            }
+                            else {
+                                return new BinaryExpression(Operator.NotEqual, leftExpression, rightExpression, resultType);
+                            }
+                        }
+                    }
+                }
+
+                if ((operatorType == Operator.ShiftRight) ||
+                    (operatorType == Operator.ShiftRightEquals)) {
+                    TypeSymbol leftExpressionType = leftExpression.EvaluatedType;
+
+                    if ((leftExpressionType == _symbolSet.ResolveIntrinsicType(IntrinsicType.Byte)) ||
+                        (leftExpressionType == _symbolSet.ResolveIntrinsicType(IntrinsicType.UnsignedShort)) ||
+                        (leftExpressionType == _symbolSet.ResolveIntrinsicType(IntrinsicType.UnsignedInteger)) ||
+                        (leftExpressionType == _symbolSet.ResolveIntrinsicType(IntrinsicType.UnsignedLong))) {
+                        // Switch to unsigned shift operator for unsigned types (which happens
+                        // to be set up to follow the signed operator in the enumeration offset by 1)
+                        Debug.Assert(((int)Operator.UnsignedShiftRight - (int)Operator.ShiftRight) == 2);
+                        Debug.Assert(((int)Operator.UnsignedShiftRightEquals - (int)Operator.ShiftRightEquals) == 2);
+
+                        operatorType = (Operator)((int)(operatorType) + 2);
+                    }
+                }
+
+                if (resultType == null) {
+                    return new BinaryExpression(operatorType, leftExpression, rightExpression);
+                }
+                else {
+                    return new BinaryExpression(operatorType, leftExpression, rightExpression, resultType);
+                }
+            }
+            return null;
+        }
+
+        private Expression ProcessCastNode(CastNode node) {
+            Expression childExpression = BuildExpression(node.Child);
+            if (childExpression.Type == ExpressionType.Member) {
+                childExpression = TransformMemberExpression((MemberExpression)childExpression);
+            }
+
+            TypeSymbol typeSymbol = _symbolSet.ResolveType(node.TypeReference, _symbolTable, _symbolContext);
+            Debug.Assert(typeSymbol != null);
+
+            if ((typeSymbol == _symbolSet.ResolveIntrinsicType(IntrinsicType.Integer))) {
+                if ((childExpression.EvaluatedType == _symbolSet.ResolveIntrinsicType(IntrinsicType.Double)) ||
+                    (childExpression.EvaluatedType == _symbolSet.ResolveIntrinsicType(IntrinsicType.Single))) {
+                    // A float or double is being cast to an int
+                    // In regular .net this causes a truncation to happen, and we'd like
+                    // to preserve that behavior.
+
+                    TypeSymbol mathType =
+                        (TypeSymbol)((ISymbolTable)_symbolSet.SystemNamespace).FindSymbol("Math", null, SymbolFilter.Types);
+                    Debug.Assert(mathType != null);
+
+                    MethodSymbol truncateMethod = (MethodSymbol)mathType.GetMember("Truncate");
+                    Debug.Assert(truncateMethod != null);
+
+                    MethodExpression truncateExpression =
+                        new MethodExpression(new TypeExpression(mathType, SymbolFilter.Public | SymbolFilter.StaticMembers),
+                                             truncateMethod);
+                    truncateExpression.AddParameterValue(childExpression);
+
+                    return truncateExpression;
+                }
+            }
+
+            return new UnaryExpression(Operator.Cast, childExpression, typeSymbol, childExpression.MemberMask);
+        }
+
+        private Expression ProcessConditionalNode(ConditionalNode node) {
+            Expression conditionExpression = BuildExpression(node.Condition);
+            Expression trueExpression = BuildExpression(node.TrueValue);
+            Expression falseExpression = BuildExpression(node.FalseValue);
+
+            if (conditionExpression.Type == ExpressionType.Member) {
+                conditionExpression = TransformMemberExpression((MemberExpression)conditionExpression);
+            }
+            if (trueExpression.Type == ExpressionType.Member) {
+                trueExpression = TransformMemberExpression((MemberExpression)trueExpression);
+            }
+            if (falseExpression.Type == ExpressionType.Member) {
+                falseExpression = TransformMemberExpression((MemberExpression)falseExpression);
+            }
+
+            return new ConditionalExpression(conditionExpression, trueExpression, falseExpression);
+        }
+
+        private Expression ProcessDotExpressionNode(BinaryExpressionNode node, SymbolFilter filter, out MemberSymbol memberSymbol) {
+            Debug.Assert(node.RightChild is NameNode);
+
+            Expression objectExpression = null;
+
+            if ((node.LeftChild.NodeType == ParseNodeType.Name) || (node.LeftChild.NodeType == ParseNodeType.GenericName)) {
+                objectExpression = ProcessNameNode((NameNode)node.LeftChild, filter);
+            }
+            else {
+                objectExpression = BuildExpression(node.LeftChild);
+            }
+
+            if (objectExpression is MemberExpression) {
+                objectExpression = TransformMemberExpression((MemberExpression)objectExpression);
+            }
+
+            if (objectExpression is LiteralExpression) {
+                object literalValue = ((LiteralExpression)objectExpression).Value;
+                if (!((literalValue is Boolean) || (literalValue is String))) {
+                    // Numeric literals need to be paranthesized in script when followed by a
+                    // dot member access.
+                    objectExpression.AddParenthesisHint();
+                }
+            }
+
+            Debug.Assert(objectExpression.EvaluatedType is ISymbolTable);
+
+            ISymbolTable typeSymbolTable = (ISymbolTable)objectExpression.EvaluatedType;
+            string memberName = ((NameNode)node.RightChild).Name;
+
+            memberSymbol = (MemberSymbol)typeSymbolTable.FindSymbol(memberName,
+                                                                    _symbolContext,
+                                                                    objectExpression.MemberMask);
+
+            if ((memberSymbol != null) && (memberSymbol.AssociatedType.Type == SymbolType.GenericParameter)) {
+                if (node.RightChild.NodeType == ParseNodeType.GenericName) {
+                    int genericArgIndex = ((GenericParameterSymbol)memberSymbol.AssociatedType).Index;
+
+                    Debug.Assert(node.RightChild.NodeType == ParseNodeType.GenericName);
+                    Debug.Assert(((GenericNameNode)node.RightChild).TypeArguments != null);
+
+                    ParseNode typeArgNode = ((GenericNameNode)node.RightChild).TypeArguments[genericArgIndex];
+                    TypeSymbol returnType = _symbolSet.ResolveType(typeArgNode, _symbolTable, _symbolContext);
+
+                    if (returnType != null) {
+                        // We're just going to force the resulting expression to use the more
+                        // specific type, rather than the generic type, and have that percolate through
+                        // the rest of the expression tree.
+
+                        objectExpression.Reevaluate(returnType);
+                    }
+                    else {
+                        memberSymbol = null;
+                    }
+                }
+            }
+
+            if (memberSymbol == null) {
+                objectExpression = null;
+            }
+
+            return objectExpression;
+        }
+
+        private Expression ProcessDotExpressionNode(BinaryExpressionNode node) {
+            SymbolFilter filter = SymbolFilter.All;
+            MemberSymbol memberSymbol = null;
+
+            Expression objectExpression = ProcessDotExpressionNode(node, filter, out memberSymbol);
+            if (objectExpression == null) {
+                // We didn't successfully create an expression. The first pass attempted to
+                // process the right child as an instance member of the left child expression.
+                // We need to process the left child again as a type so we can process the
+                // right child as a static member this time around.
+                filter &= ~SymbolFilter.Members;
+                objectExpression = ProcessDotExpressionNode(node, filter, out memberSymbol);
+            }
+            Debug.Assert(objectExpression != null);
+
+            TypeSymbol dictionaryType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Dictionary);
+            TypeSymbol genericDictionaryType = _symbolSet.ResolveIntrinsicType(IntrinsicType.GenericDictionary);
+            TypeSymbol nullableType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Nullable);
+
+            if (memberSymbol.Type == SymbolType.Property) {
+                if ((memberSymbol.Parent == dictionaryType) ||
+                    (memberSymbol.Parent == genericDictionaryType)) {
+                    MethodSymbol methodSymbol = null;
+
+                    if (String.CompareOrdinal(memberSymbol.Name, "Count") == 0) {
+                        methodSymbol = (MethodSymbol)dictionaryType.GetMember("GetKeyCount");
+                        Debug.Assert(methodSymbol != null);
+                    }
+                    else if (String.CompareOrdinal(memberSymbol.Name, "Keys") == 0) {
+                        methodSymbol = (MethodSymbol)dictionaryType.GetMember("GetKeys");
+                        Debug.Assert(methodSymbol != null);
+                    }
+
+                    if (methodSymbol != null) {
+                        MethodExpression methodExpression =
+                            new MethodExpression(new TypeExpression(dictionaryType, SymbolFilter.Public | SymbolFilter.StaticMembers),
+                                                 methodSymbol);
+                        methodExpression.AddParameterValue(objectExpression);
+                        return methodExpression;
+                    }
+                }
+                else if (memberSymbol.Parent == nullableType) {
+                    if (String.CompareOrdinal(memberSymbol.Name, "Value") == 0) {
+                        // Nullable<T>.Value becomes Nullable<T>
+
+                        TypeSymbol underlyingType = objectExpression.EvaluatedType.GenericArguments.First();
+                        objectExpression.Reevaluate(underlyingType);
+
+                        return objectExpression;
+                    }
+                    else if (String.CompareOrdinal(memberSymbol.Name, "HasValue") == 0) {
+                        // Nullable<T>.Value becomes Script.IsValue(Nullable<T>)
+
+                        TypeSymbol scriptType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Script);
+                        MethodSymbol isValueMethod = (MethodSymbol)scriptType.GetMember("IsValue");
+
+                        MethodExpression methodExpression
+                            = new MethodExpression(new TypeExpression(scriptType, SymbolFilter.Public | SymbolFilter.StaticMembers),
+                                                   isValueMethod);
+                        methodExpression.AddParameterValue(objectExpression);
+
+                        return methodExpression;
+                    }
+                }
+            }
+            else if (memberSymbol.Type == SymbolType.Method) {
+                if (memberSymbol.Parent == nullableType) {
+                    // Nullable<T>.GetValueOrDefault() becomes Nullable<T> || 0|false
+
+                    TypeSymbol underlyingType = objectExpression.EvaluatedType.GenericArguments.First();
+
+                    object defaultValue = 0;
+                    if (underlyingType == _symbolSet.ResolveIntrinsicType(IntrinsicType.Boolean)) {
+                        defaultValue = false;
+                    }
+                    else if (underlyingType == _symbolSet.ResolveIntrinsicType(IntrinsicType.String)) {
+                        defaultValue = String.Empty;
+                    }
+
+                    LiteralExpression literalExpression = new LiteralExpression(underlyingType, defaultValue);
+
+                    BinaryExpression logicalOrExpression = new BinaryExpression(Operator.LogicalOr, objectExpression, literalExpression);
+                    logicalOrExpression.Reevaluate(underlyingType);
+                    logicalOrExpression.AddParenthesisHint();
+
+                    return logicalOrExpression;
+                }
+            }
+
+            string dependency = ((TypeSymbol)memberSymbol.Parent).DependencyName;
+            if (String.IsNullOrEmpty(dependency) == false) {
+                _options.AddExecutionDependency(dependency);
+            }
+
+            MemberExpression expression = new MemberExpression(objectExpression, memberSymbol);
+            if ((memberSymbol.Type == SymbolType.Method) &&
+                memberSymbol.AssociatedType.IsGeneric && (memberSymbol.AssociatedType.GenericArguments == null)) {
+                Debug.Assert(node.RightChild.NodeType == ParseNodeType.GenericName);
+                Debug.Assert(((GenericNameNode)node.RightChild).TypeArguments != null);
+
+                List<TypeSymbol> typeArgs = new List<TypeSymbol>();
+                foreach (ParseNode typeArgNode in ((GenericNameNode)node.RightChild).TypeArguments) {
+                    typeArgs.Add(_symbolSet.ResolveType(typeArgNode, _symbolTable, _symbolContext));
+                }
+
+                TypeSymbol returnType = _symbolSet.CreateGenericTypeSymbol(memberSymbol.AssociatedType, typeArgs);
+                if (returnType != null) {
+                    MethodSymbol genericMethod = (MethodSymbol)memberSymbol;
+                    MethodSymbol instanceMethod = new MethodSymbol(genericMethod.Name, (TypeSymbol)genericMethod.Parent, returnType);
+
+                    if (genericMethod.IsTransformed) {
+                        instanceMethod.SetTransformedName(genericMethod.GeneratedName);
+                    }
+                    instanceMethod.SetNameCasing(genericMethod.IsCasePreserved);
+
+                    expression = new MemberExpression(objectExpression, instanceMethod);
+                }
+            }
+
+            return expression;
+        }
+
+        private Expression ProcessIntrinsicType(IntrinsicTypeNode node) {
+            TypeSymbol typeSymbol = _symbolSet.ResolveType(node, _symbolTable, _symbolContext);
+            Debug.Assert(typeSymbol != null);
+
+            return TransformTypeSymbol(typeSymbol);
+        }
+
+        private Expression ProcessLiteralNode(LiteralNode node) {
+            LiteralToken token = (LiteralToken)node.Token;
+
+            string systemTypeName = null;
+
+            switch (token.LiteralType) {
+                case LiteralTokenType.Null:
+                    systemTypeName = "Object";
+                    break;
+                case LiteralTokenType.Boolean:
+                    systemTypeName = "Boolean";
+                    break;
+                case LiteralTokenType.Char:
+                    systemTypeName = "Char";
+                    break;
+                case LiteralTokenType.String:
+                    systemTypeName = "String";
+                    break;
+                case LiteralTokenType.Int:
+                    systemTypeName = "Int32";
+                    break;
+                case LiteralTokenType.UInt:
+                    systemTypeName = "UInt32";
+                    break;
+                case LiteralTokenType.Long:
+                    systemTypeName = "Int64";
+                    break;
+                case LiteralTokenType.ULong:
+                    systemTypeName = "UInt64";
+                    break;
+                case LiteralTokenType.Float:
+                    systemTypeName = "Single";
+                    break;
+                case LiteralTokenType.Double:
+                    systemTypeName = "Double";
+                    break;
+                case LiteralTokenType.Decimal:
+                    systemTypeName = "Decimal";
+                    break;
+                default:
+                    Debug.Fail("Unknown Literal Token Type: " + token.LiteralType);
+                    break;
+            }
+
+            if (systemTypeName != null) {
+                TypeSymbol typeSymbol =
+                    (TypeSymbol)((ISymbolTable)_symbolSet.SystemNamespace).FindSymbol(systemTypeName, null, SymbolFilter.Types);
+                Debug.Assert(typeSymbol != null);
+
+                return new LiteralExpression(typeSymbol, token.LiteralValue);
+            }
+
+            return null;
+        }
+
+        private Expression ProcessNameNode(NameNode node) {
+            return ProcessNameNode(node, SymbolFilter.All);
+        }
+
+        private Expression ProcessNameNode(NameNode node, SymbolFilter filter) {
+            string name = node.Name;
+
+            if (node.NodeType == ParseNodeType.GenericName) {
+                name = name + "`" + ((GenericNameNode)node).TypeArguments.Count;
+            }
+
+            // TODO: When inside a static method, we should only lookup static members
+
+            Symbol symbol = _symbolTable.FindSymbol(name, _symbolContext, filter);
+            if (symbol is LocalSymbol) {
+                if (_classContext == ((LocalSymbol)symbol).ValueType) {
+                    SymbolFilter memberMask = SymbolFilter.Public | SymbolFilter.Protected | SymbolFilter.Private |
+                                              SymbolFilter.InstanceMembers;
+                    return new LocalExpression((LocalSymbol)symbol, memberMask);
+                }
+                else {
+                    return new LocalExpression((LocalSymbol)symbol);
+                }
+            }
+            else if (symbol is MemberSymbol) {
+                // TODO: Does C# allow access to private/protected members if the type of the member is
+                //       the same as the class context?
+                MemberSymbol memberSymbol = (MemberSymbol)symbol;
+
+                if ((memberSymbol.Visibility & MemberVisibility.Static) != 0) {
+                    return new MemberExpression(new TypeExpression((TypeSymbol)memberSymbol.Parent,
+                                                SymbolFilter.Public | SymbolFilter.StaticMembers),
+                                                memberSymbol);
+                }
+                else {
+                    return new MemberExpression(new ThisExpression(_classContext, /* explicitReference */ false),
+                                                memberSymbol);
+                }
+            }
+            else if (symbol is TypeSymbol) {
+                return TransformTypeSymbol((TypeSymbol)symbol);
+            }
+
+            return null;
+        }
+
+        private Expression ProcessNewNode(NewNode node) {
+            TypeSymbol type = _symbolSet.ResolveType(node.TypeReference, _symbolTable, _symbolContext);
+            Debug.Assert(type != null);
+
+            if (type.Type == SymbolType.Delegate) {
+                // If its an instantiation of a delegate, return the argument itself
+                // which is already a delegate expression.
+                // The delegate type itself does not have a runtime representation that
+                // is instantiated.
+
+                Debug.Assert(node.Arguments is ExpressionListNode);
+                Debug.Assert(((ExpressionListNode)node.Arguments).Expressions.Count == 1);
+
+                return BuildExpression(((ExpressionListNode)node.Arguments).Expressions[0]);
+            }
+
+            NewExpression newExpression = new NewExpression(type);
+            if (node.Arguments != null) {
+                Debug.Assert(node.Arguments is ExpressionListNode);
+                List<Expression> args = BuildExpressionList((ExpressionListNode)node.Arguments);
+
+                if ((type == _symbolSet.ResolveIntrinsicType(IntrinsicType.Function)) &&
+                    (args.Count > 1)) {
+                    // The function ctor in javascript takes parameters in
+                    // reverse order, with the params array effectively at
+                    // the start of the param list... in c# we must keep the params
+                    // list at the end, so skip the first parameter, add the rest,
+                    // and then add back the first parameter (the body of the
+                    // function). Uggh!
+
+                    Expression functionBodyParam = null;
+
+                    foreach (Expression paramExpr in args) {
+                        if (functionBodyParam == null) {
+                            functionBodyParam = paramExpr;
+                            continue;
+                        }
+
+                        newExpression.AddParameterValue(paramExpr);
+                    }
+
+                    newExpression.AddParameterValue(functionBodyParam);
+                }
+                else if (type.GenericType == _symbolSet.ResolveIntrinsicType(IntrinsicType.Nullable)) {
+                    // Creating a new Nullable<T> ... if there is a value specified as a ctor param,
+                    // just use the value; otherwise use undefined.
+                    if (args.Count == 1) {
+                        return args[0];
+                    }
+                    return new InlineScriptExpression("undefined", type);
+                }
+                else {
+                    foreach (Expression paramExpr in args) {
+                        newExpression.AddParameterValue(paramExpr);
+                    }
+                }
+            }
+
+            if (String.IsNullOrEmpty(type.DependencyName) == false) {
+                _options.AddExecutionDependency(type.DependencyName);
+            }
+
+            return newExpression;
+        }
+
+        private Expression ProcessOpenBracketsExpressionNode(BinaryExpressionNode node) {
+            Expression leftExpression = BuildExpression(node.LeftChild);
+            if (leftExpression is MemberExpression) {
+                leftExpression = TransformMemberExpression((MemberExpression)leftExpression);
+            }
+
+            Debug.Assert((leftExpression.EvaluatedType.Type == SymbolType.Class) ||
+                         (leftExpression.EvaluatedType.Type == SymbolType.Record) ||
+                         (leftExpression.EvaluatedType.Type == SymbolType.Interface));
+
+            IndexerSymbol indexer = null;
+            if (leftExpression.EvaluatedType.Type != SymbolType.Interface) {
+                indexer = ((ClassSymbol)leftExpression.EvaluatedType).GetIndexer();
+            }
+            else {
+                indexer = ((InterfaceSymbol)leftExpression.EvaluatedType).Indexer;
+            }
+            Debug.Assert(indexer != null);
+            Debug.Assert(indexer.MatchFilter(leftExpression.MemberMask));
+
+            IndexerExpression indexerExpression = new IndexerExpression(leftExpression, indexer);
+
+            Debug.Assert(node.RightChild is ExpressionListNode);
+            ICollection<Expression> args = BuildExpressionList((ExpressionListNode)node.RightChild);
+
+            foreach (Expression paramExpr in args) {
+                indexerExpression.AddIndexParameterValue(paramExpr);
+            }
+
+            return indexerExpression;
+        }
+
+        private Expression ProcessOpenParenExpressionNode(BinaryExpressionNode node) {
+            bool isDelegateInvoke = false;
+            Expression leftExpression = BuildExpression(node.LeftChild);
+
+            if (leftExpression is LocalExpression) {
+                Debug.Assert(leftExpression.EvaluatedType.Type == SymbolType.Delegate);
+
+                // Handle the implicit delegate invoke scenario by turning the expression
+                // into an explicit call into the delegate's Invoke method
+
+                MemberSymbol invokeMethodSymbol = leftExpression.EvaluatedType.GetMember("Invoke");
+                Debug.Assert(invokeMethodSymbol != null);
+
+                leftExpression = new MemberExpression(leftExpression, invokeMethodSymbol);
+                isDelegateInvoke = true;
+            }
+
+            if (leftExpression.Type != ExpressionType.Member) {
+                // A method call was evaluated into a non-member expression as part of building
+                // the left node. For example, Nullable<T>.GetValueOrDefault() becomes a logical or expression.
+
+                return leftExpression;
+            }
+
+            MemberExpression memberExpression = (MemberExpression)leftExpression;
+
+            ExpressionListNode argNodes = null;
+            List<Expression> args = null;
+            if (node.RightChild != null) {
+                Debug.Assert(node.RightChild is ExpressionListNode);
+
+                argNodes = (ExpressionListNode)node.RightChild;
+                args = BuildExpressionList(argNodes);
+            }
+
+            MethodExpression methodExpression = null;
+
+            if (memberExpression.Member.Type != SymbolType.Method) {
+                // A non-method member is being used in a method call; the member must be
+                // a delegate...
+                Debug.Assert(memberExpression.EvaluatedType.Type == SymbolType.Delegate);
+                Expression instanceExpression = TransformMemberExpression(memberExpression);
+
+                MethodSymbol invokeMethod =
+                    (MethodSymbol)memberExpression.EvaluatedType.GetMember("Invoke");
+                Debug.Assert(invokeMethod != null);
+
+                methodExpression = new MethodExpression(instanceExpression, invokeMethod);
+                isDelegateInvoke = true;
+            }
+            else {
+                // The member being accessed is a method...
+
+                // REVIEW: Uggh... this has become too complex over time with all the transformations
+                //         added over time. Refactoring needed...
+
+                MethodSymbol method = (MethodSymbol)memberExpression.Member;
+                TypeSymbol objectType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Object);
+                TypeSymbol typeType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Type);
+                TypeSymbol dictionaryType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Dictionary);
+                TypeSymbol genericDictionaryType = _symbolSet.ResolveIntrinsicType(IntrinsicType.GenericDictionary);
+                TypeSymbol numberType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Number);
+                TypeSymbol stringType = _symbolSet.ResolveIntrinsicType(IntrinsicType.String);
+                TypeSymbol scriptType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Script);
+                TypeSymbol argsType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Arguments);
+
+                if ((method.Parent == objectType) &&
+                    method.Name.Equals("GetType", StringComparison.Ordinal)) {
+                    // Since we can't extend object's prototype, we need to transform the
+                    // natural c# syntax into a static method.
+                    // Object.GetType instance method becomes Type.GetInstanceType static method
+
+                    TypeSymbol typeSymbol = typeType;
+
+                    method = (MethodSymbol)typeSymbol.GetMember("GetInstanceType");
+                    Debug.Assert(method != null);
+
+                    methodExpression = new MethodExpression(new TypeExpression(typeSymbol, SymbolFilter.Public | SymbolFilter.StaticMembers),
+                                                            method);
+                    methodExpression.AddParameterValue(memberExpression.ObjectReference);
+                    return methodExpression;
+                }
+                else if ((method.Parent == objectType) &&
+                         (method.Name.Equals("ToString", StringComparison.Ordinal) ||
+                          method.Name.Equals("ToLocaleString", StringComparison.Ordinal)) &&
+                         (memberExpression.ObjectReference.EvaluatedType == stringType)) {
+                    // No-op ToString calls on strings (this happens when performing a ToString
+                    // on a named enum value.
+                    return memberExpression.ObjectReference;
+                }
+                else if ((method.Parent == objectType) &&
+                         (method.Name.Equals("ToString", StringComparison.Ordinal) ||
+                          method.Name.Equals("ToLocaleString", StringComparison.Ordinal)) &&
+                         (memberExpression.ObjectReference.EvaluatedType is EnumerationSymbol)) {
+                    EnumerationSymbol enumSymbol = (EnumerationSymbol)memberExpression.ObjectReference.EvaluatedType;
+
+                    if (enumSymbol.UseNamedValues) {
+                        // If the enum value is a named enum, then it is already a string.
+                        return memberExpression.ObjectReference;
+                    }
+
+                    return new MethodExpression(memberExpression.ObjectReference, method);
+                }
+                else if (((method.Parent == dictionaryType) || (method.Parent == genericDictionaryType)) &&
+                         method.Name.Equals("ContainsKey", StringComparison.Ordinal)) {
+                    // Switch the instance ContainsKey method on Dictionary to
+                    // calls to the static KeyExists method.
+                    Debug.Assert(args.Count == 1);
+
+                    MethodSymbol keyExistsMethod = (MethodSymbol)dictionaryType.GetMember("KeyExists");
+                    Debug.Assert(keyExistsMethod != null);
+
+                    methodExpression = new MethodExpression(new TypeExpression(dictionaryType, SymbolFilter.Public | SymbolFilter.StaticMembers),
+                                                            keyExistsMethod);
+                    methodExpression.AddParameterValue(memberExpression.ObjectReference);
+                    methodExpression.AddParameterValue(args[0]);
+
+                    return methodExpression;
+                }
+                else if (((method.Parent == dictionaryType) || (method.Parent == genericDictionaryType)) &&
+                         method.Name.Equals("Remove", StringComparison.Ordinal)) {
+                    // Switch the instance Remove method on Dictionary to
+                    // calls to the static DeleteKey method.
+                    Debug.Assert(args.Count == 1);
+
+                    return new LateBoundExpression(memberExpression.ObjectReference,
+                                                   args[0], LateBoundOperation.DeleteField,
+                                                   objectType);
+                }
+                else if (((method.Parent == dictionaryType) || (method.Parent == genericDictionaryType)) &&
+                         method.Name.Equals("Clear")) {
+                    // Switch the instance Clear method on Dictionary to
+                    // calls to the static ClearKeys method.
+                    MethodSymbol clearKeysMethod = (MethodSymbol)dictionaryType.GetMember("ClearKeys");
+                    Debug.Assert(clearKeysMethod != null);
+
+                    methodExpression = new MethodExpression(new TypeExpression(dictionaryType, SymbolFilter.Public | SymbolFilter.StaticMembers),
+                                                            clearKeysMethod);
+                    methodExpression.AddParameterValue(memberExpression.ObjectReference);
+                    return methodExpression;
+                }
+                else if (((method.Parent == dictionaryType) || (((TypeSymbol)method.Parent).GenericType == genericDictionaryType)) &&
+                         ((method.Visibility & MemberVisibility.Static) != 0) &&
+                         method.Name.Equals("GetDictionary", StringComparison.Ordinal)) {
+                    // Dictionary.GetDictionary is a no-op method; we're just interested
+                    // in the object being passed in.
+                    // However we'll re-evaluate the argument to be of dictionary type
+                    // so that subsequent use of this expression sees it as a dictionary.
+                    Debug.Assert(args.Count == 1);
+                    args[0].Reevaluate((TypeSymbol)method.Parent);
+
+                    return args[0];
+                }
+                else if ((method.Parent == stringType) &&
+                         (method.Name.Equals("Escape", StringComparison.Ordinal) ||
+                          method.Name.Equals("Unescape", StringComparison.Ordinal) ||
+                          method.Name.Equals("EncodeUri", StringComparison.Ordinal) ||
+                          method.Name.Equals("DecodeUri", StringComparison.Ordinal) ||
+                          method.Name.Equals("EncodeUriComponent", StringComparison.Ordinal) ||
+                          method.Name.Equals("DecodeUriComponent", StringComparison.Ordinal))) {
+                    // String.<Method> becomes Script.<Method>, as its a global method in script
+                    MethodSymbol scriptMethod = (MethodSymbol)scriptType.GetMember(method.Name);
+
+                    methodExpression = new MethodExpression(new TypeExpression(scriptType, SymbolFilter.Public | SymbolFilter.StaticMembers),
+                                                            scriptMethod);
+                    methodExpression.AddParameterValue(memberExpression.ObjectReference);
+                    return methodExpression;
+                }
+                else if ((method.Parent == scriptType) &&
+                         method.Name.Equals("Literal", StringComparison.Ordinal)) {
+                    // Convert a call to Script.Literal into a literal expression
+
+                    Debug.Assert(args.Count >= 1);
+                    string script = null;
+
+                    if (args[0].Type == ExpressionType.Field) {
+                        Debug.Assert(args[0].EvaluatedType == stringType);
+
+                        FieldSymbol field = ((FieldExpression)args[0]).Field;
+                        if (field.IsConstant) {
+                            Debug.Assert(field.Value is string);
+                            script = (string)field.Value;
+                        }
+                    }
+                    else if (args[0].Type == ExpressionType.Literal) {
+                        Debug.Assert(((LiteralExpression)args[0]).Value is string);
+                        script = (string)((LiteralExpression)args[0]).Value;
+                    }
+
+                    if (script == null) {
+                        // TODO: When we start raising errors at the expression level instead of the statement
+                        //       level, we should return an ErrorExpression instead of a dummy expression.
+                        Token argToken = argNodes.Expressions[0].Token;
+
+                        _errorHandler.ReportError("The argument to Script.Literal must be a constant string.",
+                                                  argToken.Location);
+                        return new InlineScriptExpression("", objectType);
+                    }
+
+                    InlineScriptExpression scriptExpression = new InlineScriptExpression(script, objectType);
+                    for (int i = 1; i < args.Count; i++) {
+                        scriptExpression.AddParameterValue(args[i]);
+                    }
+
+                    return scriptExpression;
+                }
+                else if ((method.Parent == scriptType) &&
+                         method.Name.Equals("Boolean", StringComparison.Ordinal)) {
+                    Debug.Assert(args.Count == 1);
+
+                    return new UnaryExpression(Operator.LogicalNot, new UnaryExpression(Operator.LogicalNot, args[0]));
+                }
+                else if ((method.Parent == scriptType) &&
+                         method.Name.Equals("Value", StringComparison.Ordinal)) {
+                    Debug.Assert(args.Count >= 2);
+
+                    Expression expr = args[0];
+                    for (int i = 1; i < args.Count; i++) {
+                        expr = new BinaryExpression(Operator.LogicalOr, expr, args[i]);
+                    }
+
+                    expr.Reevaluate(args[0].EvaluatedType);
+                    expr.AddParenthesisHint();
+
+                    return expr;
+                }
+                else if (method.Parent == argsType) {
+                    if (method.Name.Equals("GetArgument", StringComparison.Ordinal)) {
+                        // Switch Arguments.GetArgument into Arguments[]
+                        Debug.Assert(args.Count == 1);
+
+                        IndexerExpression indexExpression =
+                            new IndexerExpression(new LiteralExpression(typeType, method.Parent),
+                                                  ((ClassSymbol)method.Parent).GetIndexer());
+                        indexExpression.AddIndexParameterValue(args[0]);
+
+                        return indexExpression;
+                    }
+                    else if (method.Name.Equals("ToArray", StringComparison.Ordinal)) {
+                        // Switch Arguments.ToArray into Array.ToArray(arguments)
+
+                        TypeSymbol arrayType = _symbolSet.ResolveIntrinsicType(IntrinsicType.Array);
+                        MethodSymbol toArrayMethod = (MethodSymbol)arrayType.GetMember("ToArray");
+
+                        InlineScriptExpression argsExpression =
+                            new InlineScriptExpression("arguments", objectType, /* parenthesize */ false);
+                        MethodExpression toArrayExpression =
+                            new MethodExpression(new TypeExpression(arrayType, SymbolFilter.Public | SymbolFilter.StaticMembers),
+                                                 toArrayMethod);
+                        toArrayExpression.AddParameterValue(argsExpression);
+
+                        return toArrayExpression;
+                    }
+                }
+                else {
+                    bool lateBound = false;
+
+                    if (method.Parent == scriptType) {
+                        LateBoundOperation lateBoundOperation = LateBoundOperation.InvokeMethod;
+
+                        if (method.Name.Equals("InvokeMethod", StringComparison.Ordinal)) {
+                            lateBound = true;
+                        }
+                        else if (method.Name.Equals("DeleteField", StringComparison.Ordinal)) {
+                            lateBound = true;
+                            lateBoundOperation = LateBoundOperation.DeleteField;
+                        }
+                        else if (method.Name.Equals("GetField", StringComparison.Ordinal)) {
+                            lateBound = true;
+                            lateBoundOperation = LateBoundOperation.GetField;
+                        }
+                        else if (method.Name.Equals("SetField", StringComparison.Ordinal)) {
+                            lateBound = true;
+                            lateBoundOperation = LateBoundOperation.SetField;
+                        }
+                        else if (method.Name.Equals("GetScriptType", StringComparison.Ordinal)) {
+                            lateBound = true;
+                            lateBoundOperation = LateBoundOperation.GetScriptType;
+                        }
+                        else if (method.Name.Equals("HasField", StringComparison.Ordinal)) {
+                            lateBound = true;
+                            lateBoundOperation = LateBoundOperation.HasField;
+                        }
+                        else if (method.Name.Equals("HasMethod", StringComparison.Ordinal)) {
+                            lateBound = true;
+                            lateBoundOperation = LateBoundOperation.HasMethod;
+                        }
+                        else if (method.Name.Equals("CreateInstance", StringComparison.Ordinal)) {
+                            Debug.Assert(args.Count >= 1);
+
+                            if ((args[0].Type == ExpressionType.MethodInvoke) ||
+                                (args[0].Type == ExpressionType.PropertyGet)) {
+                                // When using the result of a method call/property access directly
+                                // with Type.CreateInstance, the following script would be generated:
+                                //
+                                // new method()()
+                                // which is invalid. Instead we need to generate the following:
+                                // var type = method();
+                                // new type()
+
+                                _errorHandler.ReportError("You must store the type returned from a method or property into a local variable to use with Type.CreateInstance.",
+                                                          node.Token.Location);
+                            }
+
+                            NewExpression newExpression = new NewExpression(args[0], objectType);
+                            if (args.Count > 1) {
+                                bool first = true;
+                                foreach (Expression paramExpr in args) {
+                                    if (first) {
+                                        first = false;
+                                        continue;
+                                    }
+                                    newExpression.AddParameterValue(paramExpr);
+                                }
+                            }
+                            return newExpression;
+                        }
+
+                        if (lateBound) {
+                            // Switch explicit late-bound calls into implicit late-bound expressions
+                            // in script
+                            Debug.Assert((args != null) &&
+                                         (((lateBoundOperation == LateBoundOperation.GetScriptType) && (args.Count == 1)) ||
+                                          (args.Count >= 2)));
+
+                            LateBoundExpression lateBoundExpression = null;
+                            Expression instanceExpression = null;
+                            Expression nameExpression = null;
+
+                            foreach (Expression paramExpr in args) {
+                                if (instanceExpression == null) {
+                                    instanceExpression = paramExpr;
+
+                                    if (lateBoundOperation == LateBoundOperation.GetScriptType) {
+                                        // GetScriptType only takes an instance
+                                        return new LateBoundExpression(instanceExpression, null,
+                                                                       lateBoundOperation, objectType);
+                                    }
+                                    continue;
+                                }
+                                if (nameExpression == null) {
+                                    nameExpression = paramExpr;
+
+                                    Expression objectExpression = instanceExpression;
+                                    if (lateBoundOperation == LateBoundOperation.InvokeMethod) {
+                                        if ((instanceExpression.Type == ExpressionType.Literal) &&
+                                            (((LiteralExpression)instanceExpression).Value == null)) {
+                                            objectExpression = null;
+
+                                            LiteralExpression literalExpression = nameExpression as LiteralExpression;
+                                            if (literalExpression == null) {
+                                                _errorHandler.ReportError("The name of a global method must be a constant string known at compile time.",
+                                                                          argNodes.Expressions[0].Token.Location);
+                                            }
+                                            else if (!Utility.IsValidIdentifier((string)literalExpression.Value)) {
+                                                _errorHandler.ReportError("The name of a global method must be a valid identifer.",
+                                                                          argNodes.Expressions[0].Token.Location);
+                                            }
+                                        }
+                                    }
+
+                                    lateBoundExpression = new LateBoundExpression(objectExpression, nameExpression,
+                                                                                  lateBoundOperation, objectType);
+                                    continue;
+                                }
+
+                                lateBoundExpression.AddParameterValue(paramExpr);
+                            }
+
+                            Debug.Assert(lateBoundExpression != null);
+                            return lateBoundExpression;
+                        }
+                    }
+
+                    if (!method.MatchesConditions(_options.Defines)) {
+                        return null;
+                    }
+
+                    methodExpression = new MethodExpression(memberExpression.ObjectReference,
+                                                            method);
+                }
+            }
+
+            if (args != null) {
+                foreach (Expression paramExpr in args) {
+                    methodExpression.AddParameterValue(paramExpr);
+                }
+            }
+
+            if (isDelegateInvoke) {
+                return new DelegateInvokeExpression(methodExpression);
+            }
+            return methodExpression;
+        }
+
+        private Expression ProcessThisNode(ThisNode node) {
+            return new ThisExpression(_classContext, /* explicitReference */ true);
+        }
+
+        private Expression ProcessTypeofNode(TypeofNode node) {
+            TypeSymbol referencedType = _symbolSet.ResolveType(node.TypeReference, _symbolTable, _symbolContext);
+            Debug.Assert(referencedType != null);
+
+            if (String.IsNullOrEmpty(referencedType.DependencyName) == false) {
+                _options.AddExecutionDependency(referencedType.DependencyName);
+            }
+
+            TypeSymbol typeSymbol = _symbolSet.ResolveIntrinsicType(IntrinsicType.Type);
+            Debug.Assert(typeSymbol != null);
+
+            return new LiteralExpression(typeSymbol, referencedType);
+        }
+
+        private Expression ProcessUnaryExpressionNode(UnaryExpressionNode node) {
+            Operator operatorType = Operator.Invalid;
+
+            switch (node.Operator) {
+                case TokenType.PlusPlus:
+                    operatorType = Operator.PostIncrement;
+                    break;
+                case TokenType.MinusMinus:
+                    operatorType = Operator.PostDecrement;
+                    break;
+                case TokenType.Tilde:
+                case TokenType.Bang:
+                    operatorType = OperatorConverter.OperatorFromToken(node.Operator);
+                    break;
+                case TokenType.Minus:
+                    operatorType = Operator.Negative;
+                    break;
+                case TokenType.Plus:
+                    operatorType = Operator.Plus;
+                    break;
+                default:
+                    Debug.Fail("Unhandled unary expression with operator " + node.Operator);
+                    break;
+            }
+
+            if (operatorType != Operator.Invalid) {
+                Expression childExpression = BuildExpression(node.Child);
+                if (childExpression is MemberExpression) {
+                    childExpression = TransformMemberExpression((MemberExpression)childExpression);
+                }
+
+                if (operatorType == Operator.Plus) {
+                    return childExpression;
+                }
+
+                return new UnaryExpression(operatorType, childExpression);
+            }
+            return null;
+        }
+
+        private Expression TransformTypeSymbol(TypeSymbol symbol) {
+            SymbolFilter memberMask = SymbolFilter.Public | SymbolFilter.StaticMembers;
+
+            if (symbol.Type != SymbolType.Enumeration) {
+                bool isSameType = (_classContext == symbol);
+
+                if (isSameType) {
+                    memberMask |= SymbolFilter.Protected | SymbolFilter.Private;
+                }
+                else {
+                    bool isDerived = false;
+
+                    ClassSymbol baseSymbol = _classContext.BaseClass;
+                    if (baseSymbol != null) {
+                        while (!isDerived && (baseSymbol != null)) {
+                            isDerived = (baseSymbol == symbol);
+                            baseSymbol = baseSymbol.BaseClass;
+                        }
+                    }
+
+                    if (isDerived) {
+                        memberMask |= SymbolFilter.Protected;
+                    }
+                }
+            }
+
+            return new TypeExpression(symbol, memberMask);
+        }
+
+        public Expression TransformGetPropertyExpression(Expression expression) {
+            PropertyExpression property = expression as PropertyExpression;
+            if ((property != null) &&
+                (property.Type == ExpressionType.PropertyGet)) {
+                return new PropertyExpression(property.ObjectReference, property.Property, false);
+            }
+            else {
+                return expression;
+            }
+        }
+
+        public Expression TransformMemberExpression(MemberExpression expression) {
+            return TransformMemberExpression(expression, /* getOrAdd */ true, /* isEventAddOrRemove */ false);
+        }
+
+        public Expression TransformMemberExpression(MemberExpression expression, bool getOrAdd) {
+            return TransformMemberExpression(expression, getOrAdd, /* isEventAddOrRemove */ false);
+        }
+
+        public Expression TransformMemberExpression(MemberExpression expression, bool getOrAdd, bool isEventAddRemove) {
+            switch (expression.Member.Type) {
+                case SymbolType.EnumerationField:
+                    if (((EnumerationSymbol)expression.Member.Parent).UseNamedValues) {
+                        EnumerationFieldSymbol field = (EnumerationFieldSymbol)expression.Member;
+                        string fieldName = ((EnumerationSymbol)expression.Member.Parent).CreateNamedValue(field);
+
+                        return new LiteralExpression(_symbolSet.ResolveIntrinsicType(IntrinsicType.String),
+                                                     fieldName);
+                    }
+                    else if (((TypeSymbol)expression.Member.Parent).IsApplicationType ||
+                             ((EnumerationSymbol)expression.Member.Parent).UseNumericValues) {
+                        // For enum types defined within the same assembly, simply use the literal value.
+                        // Same goes for any enums marked as numeric values
+                        return new LiteralExpression(_symbolSet.ResolveIntrinsicType(IntrinsicType.Integer),
+                                                     ((EnumerationFieldSymbol)expression.Member).Value);
+                    }
+                    else {
+                        // For enum types imported for another assembly
+                        return new EnumerationFieldExpression(expression.ObjectReference,
+                                                              (EnumerationFieldSymbol)expression.Member);
+                    }
+                case SymbolType.Field:
+                    if (((FieldSymbol)expression.Member).IsConstant) {
+                        return new LiteralExpression(expression.Member.AssociatedType, ((FieldSymbol)expression.Member).Value);
+                    }
+                    if (expression.ObjectReference is BaseExpression) {
+                        // Create a this expression, because "this" works just as well as base.
+                        // It is explicit, because the base was explicit.
+                        return new FieldExpression(new ThisExpression(_classContext, /* explicitReference */ true),
+                                                   (FieldSymbol)expression.Member);
+                    }
+                    if (((expression.Member.Visibility & MemberVisibility.Static) != 0) &&
+                        (expression.Member.Parent != expression.ObjectReference.EvaluatedType)) {
+                        // Create a new type expression because a static member
+                        // of the base type is being used.
+                        return new FieldExpression(new TypeExpression((ClassSymbol)expression.Member.Parent, expression.MemberMask),
+                                                   (FieldSymbol)expression.Member);
+                    }
+                    if ((_symbolContext.Parent.Type == SymbolType.Record) &&
+                        (expression.ObjectReference.Type == ExpressionType.This)) {
+                        // Change "this" references inside struct ctor code to "$o"
+                        VariableSymbol objectVariable = new VariableSymbol("$o", _memberContext, _classContext);
+                        return new FieldExpression(new LocalExpression(objectVariable),
+                                                   (FieldSymbol)expression.Member);
+                    }
+                    if (((expression.Member.Visibility & MemberVisibility.Static) != 0) &&
+                        (expression.Member.Parent == _symbolSet.ResolveIntrinsicType(IntrinsicType.String)) &&
+                        (String.CompareOrdinal(expression.Member.Name, "Empty") == 0)) {
+                        // Convert String.Empty to literal expression
+                        return new LiteralExpression(expression.Member.AssociatedType, String.Empty);
+                    }
+                    return new FieldExpression(expression.ObjectReference,
+                                               (FieldSymbol)expression.Member);
+                case SymbolType.Property:
+                    return new PropertyExpression(expression.ObjectReference,
+                                                  (PropertySymbol)expression.Member, getOrAdd);
+                case SymbolType.Method:
+                    Debug.Assert(getOrAdd);
+                    return new DelegateExpression(expression.ObjectReference,
+                                                  (MethodSymbol)expression.Member);
+                case SymbolType.Event:
+                    if (isEventAddRemove) {
+                        return new EventExpression(expression.ObjectReference,
+                                                   (EventSymbol)expression.Member, getOrAdd);
+                    }
+                    else {
+                        Debug.Assert(((EventSymbol)expression.Member).DefaultImplementation);
+
+                        // When the field corresponding to an event whose accessors are auto-generated is
+                        // referenced, we need to hunt for a special generated field name (this is the
+                        // field that is added to the class).
+
+                        string fieldName = "__" + Utility.CreateCamelCaseName(expression.Member.Name);
+                        FieldSymbol fieldSymbol = (FieldSymbol)expression.ObjectReference.EvaluatedType.GetMember(fieldName);
+                        Debug.Assert(fieldSymbol != null);
+
+                        if (expression.ObjectReference is BaseExpression) {
+                            // Create a this expression, because "this" works just as well as base.
+                            // It is explicit, because the base was explicit.
+                            return new FieldExpression(new ThisExpression(_classContext, /* explicitReference */ true),
+                                                       fieldSymbol);
+                        }
+                        return new FieldExpression(expression.ObjectReference, fieldSymbol);
+                    }
+                default:
+                    Debug.Fail("Unexpected member type to transform: " + expression.Member.Type);
+                    break;
+            }
+            return expression;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Compiler/ImplementationBuilder.cs b/src/Core/Compiler/Compiler/ImplementationBuilder.cs
new file mode 100644
index 000000000..6840b5ce9
--- /dev/null
+++ b/src/Core/Compiler/Compiler/ImplementationBuilder.cs
@@ -0,0 +1,248 @@
+// ImplementationBuilder.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Compiler {
+
+    internal sealed class ImplementationBuilder : ILocalSymbolTable {
+
+        private CompilerOptions _options;
+        private IErrorHandler _errorHandler;
+
+        private SymbolScope _rootScope;
+        private SymbolScope _currentScope;
+
+        private int _generatedSymbolCount;
+
+        public ImplementationBuilder(CompilerOptions options, IErrorHandler errorHandler) {
+            _options = options;
+            _errorHandler = errorHandler;
+        }
+
+        private SymbolImplementation BuildImplementation(ISymbolTable symbolTable, CodeMemberSymbol symbolContext, BlockStatementNode implementationNode, bool addAllParameters) {
+            _rootScope = new SymbolScope(symbolTable);
+            _currentScope = _rootScope;
+
+            List<Statement> statements = new List<Statement>();
+            StatementBuilder statementBuilder = new StatementBuilder(this, symbolContext, _errorHandler, _options);
+
+            if (symbolContext.Parameters != null) {
+                int parameterCount = symbolContext.Parameters.Count;
+                if (addAllParameters == false) {
+                    // For property getters (including indexers), we don't add the last parameter,
+                    // which happens to be the "value" parameter, which only makes sense
+                    // for the setter.
+
+                    parameterCount--;
+                }
+                for (int paramIndex = 0; paramIndex < parameterCount; paramIndex++) {
+                    _currentScope.AddSymbol(symbolContext.Parameters[paramIndex]);
+                }
+            }
+
+            if ((symbolContext.Type == SymbolType.Constructor) &&
+                ((((ConstructorSymbol)symbolContext).Visibility & MemberVisibility.Static) == 0)) {
+                Debug.Assert(symbolContext.Parent is ClassSymbol);
+                if (((ClassSymbol)symbolContext.Parent).BaseClass != null) {
+                    BaseInitializerExpression baseExpr = new BaseInitializerExpression();
+
+                    ConstructorDeclarationNode ctorNode = (ConstructorDeclarationNode)symbolContext.ParseContext;
+                    if (ctorNode.BaseArguments != null) {
+                        ExpressionBuilder expressionBuilder =
+                            new ExpressionBuilder(this, symbolContext, _errorHandler, _options);
+
+                        Debug.Assert(ctorNode.BaseArguments is ExpressionListNode);
+                        ICollection<Expression> args =
+                            expressionBuilder.BuildExpressionList((ExpressionListNode)ctorNode.BaseArguments);
+
+                        foreach (Expression paramExpr in args) {
+                            baseExpr.AddParameterValue(paramExpr);
+                        }
+                    }
+
+                    statements.Add(new ExpressionStatement(baseExpr));
+                }
+            }
+
+            foreach (StatementNode statementNode in implementationNode.Statements) {
+                Statement statement = statementBuilder.BuildStatement(statementNode);
+                if (statement != null) {
+                    statements.Add(statement);
+                }
+            }
+
+            return new SymbolImplementation(statements, _rootScope);
+        }
+
+        public SymbolImplementation BuildEventAdd(EventSymbol eventSymbol) {
+            AccessorNode addNode = ((EventDeclarationNode)eventSymbol.ParseContext).Property.SetAccessor;
+            BlockStatementNode accessorBody = addNode.Implementation;
+
+            return BuildImplementation((ISymbolTable)eventSymbol.Parent,
+                                       eventSymbol, accessorBody, /* addParameters */ true);
+        }
+
+        public SymbolImplementation BuildEventRemove(EventSymbol eventSymbol) {
+            AccessorNode removeNode = ((EventDeclarationNode)eventSymbol.ParseContext).Property.GetAccessor;
+            BlockStatementNode accessorBody = removeNode.Implementation;
+
+            return BuildImplementation((ISymbolTable)eventSymbol.Parent,
+                                       eventSymbol, accessorBody, /* addParameters */ true);
+        }
+
+        public SymbolImplementation BuildField(FieldSymbol fieldSymbol) {
+            _rootScope = new SymbolScope((ISymbolTable)fieldSymbol.Parent);
+            _currentScope = _rootScope;
+
+            Expression initializerExpression;
+
+            FieldDeclarationNode fieldDeclarationNode = (FieldDeclarationNode)fieldSymbol.ParseContext;
+            Debug.Assert(fieldDeclarationNode != null);
+
+            VariableInitializerNode initializerNode = (VariableInitializerNode)fieldDeclarationNode.Initializers[0];
+            if (initializerNode.Value != null) {
+                ExpressionBuilder expressionBuilder = new ExpressionBuilder(this, fieldSymbol, _errorHandler, _options);
+                initializerExpression = expressionBuilder.BuildExpression(initializerNode.Value);
+                if (initializerExpression is MemberExpression) {
+                    initializerExpression =
+                        expressionBuilder.TransformMemberExpression((MemberExpression)initializerExpression);
+                }
+            }
+            else {
+                object defaultValue = null;
+
+                TypeSymbol fieldType = fieldSymbol.AssociatedType;
+                SymbolSet symbolSet = fieldSymbol.SymbolSet;
+
+                if (fieldType.Type == SymbolType.Enumeration) {
+                    // The default for named values is null, so this only applies to
+                    // regular enum types
+
+                    EnumerationSymbol enumType = (EnumerationSymbol)fieldType;
+                    if (enumType.UseNamedValues == false) {
+                        defaultValue = 0;
+                    }
+                }
+                else if ((fieldType == symbolSet.ResolveIntrinsicType(IntrinsicType.Integer)) ||
+                    (fieldType == symbolSet.ResolveIntrinsicType(IntrinsicType.UnsignedInteger)) ||
+                    (fieldType == symbolSet.ResolveIntrinsicType(IntrinsicType.Long)) ||
+                    (fieldType == symbolSet.ResolveIntrinsicType(IntrinsicType.UnsignedLong)) ||
+                    (fieldType == symbolSet.ResolveIntrinsicType(IntrinsicType.Short)) ||
+                    (fieldType == symbolSet.ResolveIntrinsicType(IntrinsicType.UnsignedShort)) ||
+                    (fieldType == symbolSet.ResolveIntrinsicType(IntrinsicType.Byte)) ||
+                    (fieldType == symbolSet.ResolveIntrinsicType(IntrinsicType.SignedByte)) ||
+                    (fieldType == symbolSet.ResolveIntrinsicType(IntrinsicType.Double)) ||
+                    (fieldType == symbolSet.ResolveIntrinsicType(IntrinsicType.Single)) ||
+                    (fieldType == symbolSet.ResolveIntrinsicType(IntrinsicType.Decimal))) {
+                    defaultValue = 0;
+                }
+                else if (fieldType == symbolSet.ResolveIntrinsicType(IntrinsicType.Boolean)) {
+                    defaultValue = false;
+                }
+
+                initializerExpression =
+                    new LiteralExpression(symbolSet.ResolveIntrinsicType(IntrinsicType.Object),
+                                          defaultValue);
+            }
+
+            List<Statement> statements = new List<Statement>();
+            statements.Add(new ExpressionStatement(initializerExpression, /* isFragment */ true));
+
+            return new SymbolImplementation(statements, null);
+        }
+
+        public SymbolImplementation BuildMethod(MethodSymbol methodSymbol) {
+            BlockStatementNode methodBody = ((MethodDeclarationNode)methodSymbol.ParseContext).Implementation;
+            return BuildImplementation((ISymbolTable)methodSymbol.Parent,
+                                       methodSymbol, methodBody, /* addAllParameters */ true);
+        }
+
+        public SymbolImplementation BuildMethod(AnonymousMethodSymbol methodSymbol) {
+            BlockStatementNode methodBody = ((AnonymousMethodNode)methodSymbol.ParseContext).Implementation;
+            return BuildImplementation(methodSymbol.StackContext,
+                                       methodSymbol, methodBody, /* addAllParameters */ true);
+        }
+
+        public SymbolImplementation BuildIndexerGetter(IndexerSymbol indexerSymbol) {
+            AccessorNode getterNode = ((IndexerDeclarationNode)indexerSymbol.ParseContext).GetAccessor;
+            BlockStatementNode accessorBody = getterNode.Implementation;
+
+            return BuildImplementation((ISymbolTable)indexerSymbol.Parent,
+                                       indexerSymbol, accessorBody, /* addAllParameters */ false);
+        }
+
+        public SymbolImplementation BuildIndexerSetter(IndexerSymbol indexerSymbol) {
+            AccessorNode setterNode = ((IndexerDeclarationNode)indexerSymbol.ParseContext).SetAccessor;
+            BlockStatementNode accessorBody = setterNode.Implementation;
+
+            return BuildImplementation((ISymbolTable)indexerSymbol.Parent,
+                                       indexerSymbol, accessorBody, /* addAllParameters */ true);
+        }
+
+        public SymbolImplementation BuildPropertyGetter(PropertySymbol propertySymbol) {
+            AccessorNode getterNode = ((PropertyDeclarationNode)propertySymbol.ParseContext).GetAccessor;
+            BlockStatementNode accessorBody = getterNode.Implementation;
+
+            return BuildImplementation((ISymbolTable)propertySymbol.Parent,
+                                       propertySymbol, accessorBody, /* addAllParameters */ false);
+        }
+
+        public SymbolImplementation BuildPropertySetter(PropertySymbol propertySymbol) {
+            AccessorNode setterNode = ((PropertyDeclarationNode)propertySymbol.ParseContext).SetAccessor;
+            BlockStatementNode accessorBody = setterNode.Implementation;
+
+            return BuildImplementation((ISymbolTable)propertySymbol.Parent,
+                                       propertySymbol, accessorBody, /* addAllParameters */ true);
+        }
+
+        #region ISymbolTable Members
+        ICollection ISymbolTable.Symbols {
+            get {
+                Debug.Assert(_currentScope != null);
+                return ((ISymbolTable)_currentScope).Symbols;
+            }
+        }
+
+        Symbol ISymbolTable.FindSymbol(string name, Symbol context, SymbolFilter filter) {
+            Debug.Assert(_currentScope != null);
+            return ((ISymbolTable)_currentScope).FindSymbol(name, context, filter);
+        }
+        #endregion
+
+        #region ILocalSymbolTable Members
+        void ILocalSymbolTable.AddSymbol(LocalSymbol symbol) {
+            Debug.Assert(_currentScope != null);
+            _currentScope.AddSymbol(symbol);
+        }
+
+        string ILocalSymbolTable.CreateSymbolName(string nameHint) {
+            _generatedSymbolCount++;
+            return "$" + nameHint + _generatedSymbolCount;
+        }
+
+        void ILocalSymbolTable.PopScope() {
+            Debug.Assert(_currentScope != null);
+            _currentScope = _currentScope.Parent;
+        }
+
+        void ILocalSymbolTable.PushScope() {
+            Debug.Assert(_currentScope != null);
+            
+            SymbolScope parentScope = _currentScope;
+
+            _currentScope = new SymbolScope(parentScope);
+            parentScope.AddChildScope(_currentScope);
+        }
+        #endregion
+    }
+}
diff --git a/src/Core/Compiler/Compiler/MetadataBuilder.cs b/src/Core/Compiler/Compiler/MetadataBuilder.cs
new file mode 100644
index 000000000..17f9447f4
--- /dev/null
+++ b/src/Core/Compiler/Compiler/MetadataBuilder.cs
@@ -0,0 +1,900 @@
+// MetadataBuilder.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Xml;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+using ScriptSharp.ResourceModel;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Compiler {
+
+    internal sealed class MetadataBuilder {
+
+        private IErrorHandler _errorHandler;
+        private CompilerOptions _options;
+
+        private SymbolSet _symbols;
+        private ISymbolTable _symbolTable;
+
+        public MetadataBuilder(IErrorHandler errorHandler) {
+            Debug.Assert(errorHandler != null);
+            _errorHandler = errorHandler;
+        }
+
+        private EnumerationFieldSymbol BuildEnumField(EnumerationFieldNode fieldNode, TypeSymbol typeSymbol) {
+            Debug.Assert(typeSymbol is EnumerationSymbol);
+            EnumerationSymbol enumSymbol = (EnumerationSymbol)typeSymbol;
+
+            TypeSymbol fieldTypeSymbol;
+            if (enumSymbol.UseNamedValues) {
+                fieldTypeSymbol = _symbols.ResolveIntrinsicType(IntrinsicType.String);
+            }
+            else {
+                fieldTypeSymbol = _symbols.ResolveIntrinsicType(IntrinsicType.Integer);
+            }
+
+            EnumerationFieldSymbol fieldSymbol = new EnumerationFieldSymbol(fieldNode.Name, typeSymbol, fieldNode.Value, fieldTypeSymbol);
+            BuildMemberDetails(fieldSymbol, typeSymbol, fieldNode, fieldNode.Attributes);
+
+            return fieldSymbol;
+        }
+
+        private EventSymbol BuildEvent(EventDeclarationNode eventNode, TypeSymbol typeSymbol) {
+            TypeSymbol handlerType = typeSymbol.SymbolSet.ResolveType(eventNode.Type, _symbolTable, typeSymbol);
+            Debug.Assert(handlerType != null);
+
+            if (handlerType != null) {
+                EventSymbol eventSymbol = new EventSymbol(eventNode.Name, typeSymbol, handlerType);
+                BuildMemberDetails(eventSymbol, typeSymbol, eventNode, eventNode.Attributes);
+
+                if (eventNode.IsField) {
+                    eventSymbol.SetImplementationState(SymbolImplementationFlags.Generated);
+                }
+                else {
+                    if ((eventNode.Modifiers & Modifiers.Abstract) != 0) {
+                        eventSymbol.SetImplementationState(SymbolImplementationFlags.Abstract);
+                    }
+                    else if ((eventNode.Modifiers & Modifiers.Override) != 0) {
+                        eventSymbol.SetImplementationState(SymbolImplementationFlags.Override);
+                    }
+                }
+
+                return eventSymbol;
+            }
+
+            return null;
+        }
+
+        private FieldSymbol BuildField(FieldDeclarationNode fieldNode, TypeSymbol typeSymbol) {
+            TypeSymbol fieldType = typeSymbol.SymbolSet.ResolveType(fieldNode.Type, _symbolTable, typeSymbol);
+            Debug.Assert(fieldType != null);
+
+            if (fieldType != null) {
+                FieldSymbol symbol = new FieldSymbol(fieldNode.Name, typeSymbol, fieldType);
+                BuildMemberDetails(symbol, typeSymbol, fieldNode, fieldNode.Attributes);
+
+                if (fieldNode.Initializers.Count != 0) {
+                    VariableInitializerNode initializer = (VariableInitializerNode)fieldNode.Initializers[0];
+
+                    if ((initializer.Value != null) && (initializer.Value.NodeType != ParseNodeType.Literal)) {
+                        symbol.SetImplementationState(/* hasInitializer */ true);
+                    }
+                }
+
+                if (fieldNode.NodeType == ParseNodeType.ConstFieldDeclaration) {
+                    Debug.Assert(fieldNode.Initializers.Count == 1);
+
+                    VariableInitializerNode initializer = (VariableInitializerNode)fieldNode.Initializers[0];
+                    if ((initializer.Value != null) && (initializer.Value.NodeType == ParseNodeType.Literal)) {
+                        symbol.SetConstant();
+                        symbol.Value = ((LiteralToken)initializer.Value.Token).LiteralValue;
+                    }
+
+                    // TODO: Handle other constant cases that can be evaluated at compile
+                    //       time (eg. combining enum flags)
+                }
+
+                return symbol;
+            }
+
+            return null;
+        }
+
+        private IndexerSymbol BuildIndexer(IndexerDeclarationNode indexerNode, TypeSymbol typeSymbol) {
+            TypeSymbol indexerType = typeSymbol.SymbolSet.ResolveType(indexerNode.Type, _symbolTable, typeSymbol);
+            Debug.Assert(indexerType != null);
+
+            if (indexerType != null) {
+                IndexerSymbol indexer = new IndexerSymbol(typeSymbol, indexerType);
+                BuildMemberDetails(indexer, typeSymbol, indexerNode, indexerNode.Attributes);
+
+                if (AttributeNode.FindAttribute(indexerNode.Attributes, "IntrinsicProperty") != null) {
+                    indexer.SetIntrinsic();
+                }
+
+                SymbolImplementationFlags implFlags = SymbolImplementationFlags.Regular;
+                if (indexerNode.SetAccessor == null) {
+                    implFlags |= SymbolImplementationFlags.ReadOnly;
+                }
+                if ((indexerNode.Modifiers & Modifiers.Abstract) != 0) {
+                    implFlags |= SymbolImplementationFlags.Abstract;
+                }
+                else if ((indexerNode.Modifiers & Modifiers.Override) != 0) {
+                    implFlags |= SymbolImplementationFlags.Override;
+                }
+
+                indexer.SetImplementationState(implFlags);
+
+                Debug.Assert(indexerNode.Parameters.Count != 0);
+                foreach (ParameterNode parameterNode in indexerNode.Parameters) {
+                    ParameterSymbol paramSymbol = BuildParameter(parameterNode, indexer);
+                    if (paramSymbol != null) {
+                        paramSymbol.SetParseContext(parameterNode);
+                        indexer.AddParameter(paramSymbol);
+                    }
+                }
+
+                indexer.AddParameter(new ParameterSymbol("value", indexer, indexerType, ParameterMode.In));
+
+                return indexer;
+            }
+
+            return null;
+        }
+
+        private void BuildInterfaceAssociations(ClassSymbol classSymbol) {
+            if (classSymbol.PrimaryPartialClass != classSymbol) {
+                // Don't build interface associations for non-primary partial classes.
+                return;
+            }
+
+            ICollection<InterfaceSymbol> interfaces = classSymbol.Interfaces;
+            if ((interfaces != null) && (interfaces.Count != 0)) {
+                foreach (InterfaceSymbol interfaceSymbol in interfaces) {
+                    foreach (MemberSymbol memberSymbol in interfaceSymbol.Members) {
+                        MemberSymbol associatedSymbol = classSymbol.GetMember(memberSymbol.Name);
+                        if (associatedSymbol != null) {
+                            associatedSymbol.SetInterfaceMember(memberSymbol);
+                        }
+                    }
+                }
+            }
+        }
+
+        private void BuildMemberDetails(MemberSymbol memberSymbol, TypeSymbol typeSymbol, MemberNode memberNode, ParseNodeList attributes) {
+            if (memberSymbol.Type != SymbolType.EnumerationField) {
+                memberSymbol.SetVisibility(GetVisibility(memberNode, typeSymbol));
+            }
+
+            bool preserveCase = (AttributeNode.FindAttribute(attributes, "PreserveCase") != null);
+            memberSymbol.SetNameCasing(preserveCase);
+
+            string scriptName = GetAttributeValue(attributes, "ScriptName");
+            if (scriptName != null) {
+                memberSymbol.SetTransformedName(scriptName);
+            }
+            else if (AttributeNode.FindAttribute(attributes, "PreserveName") != null) {
+                memberSymbol.DisableNameTransformation();
+            }
+        }
+
+        private void BuildMembers(TypeSymbol typeSymbol) {
+            if (typeSymbol.Type == SymbolType.Delegate) {
+                DelegateTypeNode delegateNode = (DelegateTypeNode)typeSymbol.ParseContext;
+
+                TypeSymbol returnType = typeSymbol.SymbolSet.ResolveType(delegateNode.ReturnType, _symbolTable, typeSymbol);
+                Debug.Assert(returnType != null);
+
+                if (returnType != null) {
+                    MethodSymbol invokeMethod = new MethodSymbol("Invoke", typeSymbol, returnType, MemberVisibility.Public);
+                    invokeMethod.SetTransformedName(String.Empty);
+
+                    // Mark the method as abstract, as there is no actual implementation of the method
+                    // to be generated
+                    invokeMethod.SetImplementationState(SymbolImplementationFlags.Abstract);
+
+                    typeSymbol.AddMember(invokeMethod);
+                }
+                return;
+            }
+
+            CustomTypeNode typeNode = (CustomTypeNode)typeSymbol.ParseContext;
+
+            foreach (MemberNode member in typeNode.Members) {
+                MemberSymbol memberSymbol = null;
+                switch (member.NodeType) {
+                    case ParseNodeType.FieldDeclaration:
+                    case ParseNodeType.ConstFieldDeclaration:
+                        memberSymbol = BuildField((FieldDeclarationNode)member, typeSymbol);
+                        break;
+                    case ParseNodeType.PropertyDeclaration:
+                        memberSymbol = BuildPropertyAsField((PropertyDeclarationNode)member, typeSymbol);
+                        if (memberSymbol == null) {
+                            memberSymbol = BuildProperty((PropertyDeclarationNode)member, typeSymbol);
+                        }
+                        break;
+                    case ParseNodeType.IndexerDeclaration:
+                        memberSymbol = BuildIndexer((IndexerDeclarationNode)member, typeSymbol);
+                        break;
+                    case ParseNodeType.ConstructorDeclaration:
+                    case ParseNodeType.MethodDeclaration:
+                        if ((member.Modifiers & Modifiers.Extern) != 0) {
+                            // Extern methods are there for defining overload signatures, so
+                            // we just skip them as far as metadata goes. The validator has
+                            // taken care of the requirements/constraints around use of extern methods.
+                            continue;
+                        }
+                        memberSymbol = BuildMethod((MethodDeclarationNode)member, typeSymbol);
+                        break;
+                    case ParseNodeType.EventDeclaration:
+                        memberSymbol = BuildEvent((EventDeclarationNode)member, typeSymbol);
+                        break;
+                    case ParseNodeType.EnumerationFieldDeclaration:
+                        memberSymbol = BuildEnumField((EnumerationFieldNode)member, typeSymbol);
+                        break;
+                }
+
+                if (memberSymbol != null) {
+                    memberSymbol.SetParseContext(member);
+
+                    if ((typeSymbol.IsApplicationType == false) &&
+                        ((memberSymbol.Type == SymbolType.Constructor) ||
+                         (typeSymbol.GetMember(memberSymbol.Name) != null))) {
+                        // If the type is an imported type, then it is allowed to contain
+                        // overloads, and we're simply going to ignore its existence, as long
+                        // as one overload has been added to the member table.
+                        continue;
+                    }
+
+                    typeSymbol.AddMember(memberSymbol);
+
+                    if ((typeSymbol.Type == SymbolType.Class) && (memberSymbol.Type == SymbolType.Event)) {
+                        EventSymbol eventSymbol = (EventSymbol)memberSymbol;
+                        if (eventSymbol.DefaultImplementation) {
+                            // Add a private field that will serve as the backing member
+                            // later on in the conversion (eg. in non-event expressions)
+                            MemberVisibility visibility = MemberVisibility.PrivateInstance;
+                            if ((eventSymbol.Visibility & MemberVisibility.Static) != 0) {
+                                visibility |= MemberVisibility.Static;
+                            }
+
+                            FieldSymbol fieldSymbol =
+                                new FieldSymbol("__" + Utility.CreateCamelCaseName(eventSymbol.Name), typeSymbol,
+                                                eventSymbol.AssociatedType);
+                            fieldSymbol.SetVisibility(visibility);
+                            fieldSymbol.SetParseContext(((EventDeclarationNode)eventSymbol.ParseContext).Field);
+
+                            typeSymbol.AddMember(fieldSymbol);
+                        }
+                    }
+                }
+            }
+        }
+
+        public ICollection<TypeSymbol> BuildMetadata(ParseNodeList compilationUnits, SymbolSet symbols, CompilerOptions options) {
+            Debug.Assert(compilationUnits != null);
+            Debug.Assert(symbols != null);
+
+            _symbols = symbols;
+            _symbolTable = symbols;
+            _options = options;
+
+            string scriptName = GetAssemblyScriptName(compilationUnits);
+            if (String.IsNullOrEmpty(scriptName)) {
+                _errorHandler.ReportError("You must declare a ScriptAssembly attribute.", String.Empty);
+            }
+            else if (Utility.IsValidScriptName(scriptName) == false) {
+                string errorMessage = "The ScriptAssembly attribute referenced an invalid name '{0}'. Script names must only contain letters, numbers, dots or underscores.";
+                _errorHandler.ReportError(String.Format(errorMessage, scriptName), String.Empty);
+            }
+            symbols.ScriptName = scriptName;
+
+            string scriptPrefix = GetAssemblyScriptPrefix(compilationUnits);
+            if (String.IsNullOrEmpty(scriptPrefix) == false) {
+                if (Utility.IsValidIdentifier(scriptPrefix) == false) {
+                    string errorMessage = "The ScriptQualifier attribute referenced an invalid prefix '{0}'. Script prefix must be valid identifiers.";
+                    _errorHandler.ReportError(String.Format(errorMessage, scriptPrefix), String.Empty);
+                }
+            }
+            else {
+                scriptPrefix = scriptName.Replace(".", String.Empty);
+            }
+            symbols.ScriptPrefix = scriptPrefix;
+
+            string assemblyScriptNamespace = GetAssemblyScriptNamespace(compilationUnits);
+            List<TypeSymbol> types = new List<TypeSymbol>();
+
+            // Build all the types first.
+            // Types need to be loaded upfront so that they can be used in resolving types associated
+            // with members.
+            foreach (CompilationUnitNode compilationUnit in compilationUnits) {
+                foreach (NamespaceNode namespaceNode in compilationUnit.Members) {
+                    string namespaceName = namespaceNode.Name;
+
+                    NamespaceSymbol namespaceSymbol = symbols.GetNamespace(namespaceName);
+
+                    List<string> imports = null;
+                    Dictionary<string, string> aliases = null;
+
+                    ParseNodeList usingClauses = namespaceNode.UsingClauses;
+                    if ((usingClauses != null) && (usingClauses.Count != 0)) {
+                        foreach (ParseNode usingNode in namespaceNode.UsingClauses) {
+                            if (usingNode is UsingNamespaceNode) {
+                                if (imports == null) {
+                                    imports = new List<string>(usingClauses.Count);
+                                }
+
+                                string referencedNamespace = ((UsingNamespaceNode)usingNode).ReferencedNamespace;
+                                if (imports.Contains(referencedNamespace) == false) {
+                                    imports.Add(referencedNamespace);
+                                }
+                            }
+                            else {
+                                Debug.Assert(usingNode is UsingAliasNode);
+                                if (aliases == null) {
+                                    aliases = new Dictionary<string, string>();
+                                }
+                                UsingAliasNode aliasNode = (UsingAliasNode)usingNode;
+                                aliases[aliasNode.Alias] = aliasNode.TypeName;
+                            }
+                        }
+                    }
+
+                    // Add parent namespaces as imports in reverse order since they
+                    // are searched in that fashion.
+                    string[] namespaceParts = namespaceName.Split('.');
+                    for (int i = namespaceParts.Length - 2; i >= 0; i--) {
+                        string partialNamespace;
+                        if (i == 0) {
+                            partialNamespace = namespaceParts[0];
+                        }
+                        else {
+                            partialNamespace = String.Join(".", namespaceParts, 0, i + 1);
+                        }
+
+                        if (imports == null) {
+                            imports = new List<string>();
+                        }
+
+                        if (imports.Contains(partialNamespace) == false) {
+                            imports.Add(partialNamespace);
+                        }
+                    }
+
+                    // Build type symbols for all user-defined types
+                    foreach (TypeNode typeNode in namespaceNode.Members) {
+                        UserTypeNode userTypeNode = typeNode as UserTypeNode;
+                        if (userTypeNode == null) {
+                            continue;
+                        }
+
+                        // Check if we have overriding script namespace for this type.
+                        string typeScriptNamespace = GetScriptNamespace(userTypeNode.Attributes);
+                        if (String.IsNullOrEmpty(typeScriptNamespace)) {
+                            typeScriptNamespace = assemblyScriptNamespace;
+                        }
+                        
+                        ClassSymbol partialTypeSymbol = null;
+                        bool isPartial = false;
+
+                        if ((userTypeNode.Modifiers & Modifiers.Partial) != 0) {
+                            partialTypeSymbol = (ClassSymbol)((ISymbolTable)namespaceSymbol).FindSymbol(userTypeNode.Name, /* context */ null, SymbolFilter.Types);
+                            if ((partialTypeSymbol != null) && partialTypeSymbol.IsApplicationType) {
+                                // This class will be considered as a partial class
+                                isPartial = true;
+
+                                // Merge code model information for the partial class onto the code model node
+                                // for the primary partial class. Interesting bits of information include things
+                                // such as base class etc. that is yet to be processed.
+                                CustomTypeNode partialTypeNode = (CustomTypeNode)partialTypeSymbol.ParseContext;
+                                partialTypeNode.MergePartialType((CustomTypeNode)userTypeNode);
+
+                                // Merge interesting bits of information onto the primary type symbol as well
+                                // representing this partial class
+                                BuildType(partialTypeSymbol, userTypeNode);
+
+                                if (String.IsNullOrEmpty(typeScriptNamespace) == false) {
+                                    partialTypeSymbol.ScriptNamespace = typeScriptNamespace;
+                                }
+                            }
+                        }
+
+                        TypeSymbol typeSymbol = BuildType(userTypeNode, namespaceSymbol);
+                        if (typeSymbol != null) {
+                            typeSymbol.SetParseContext(userTypeNode);
+                            typeSymbol.SetParentSymbolTable(symbols);
+                            if (imports != null) {
+                                typeSymbol.SetImports(imports);
+                            }
+                            if (aliases != null) {
+                                typeSymbol.SetAliases(aliases);
+                            }
+
+                            if (String.IsNullOrEmpty(typeScriptNamespace) == false) {
+                                typeSymbol.ScriptNamespace = typeScriptNamespace;
+                            }
+
+                            if (isPartial == false) {
+                                namespaceSymbol.AddType(typeSymbol);
+                            }
+                            else {
+                                // Partial types don't get added to the namespace, so we don't have
+                                // duplicated named items. However, they still do get instantiated
+                                // and processed as usual.
+                                //
+                                // The members within partial classes refer to the partial type as their parent,
+                                // and hence derive context such as the list of imports scoped to the
+                                // particular type.
+                                // However, the members will get added to the primary partial type's list of
+                                // members so they can be found.
+                                // Effectively the partial class here gets created just to hold
+                                // context of type-symbol level bits of information such as the list of
+                                // imports, that are consumed when generating code for the members defined
+                                // within a specific partial class.
+                                ((ClassSymbol)typeSymbol).SetPrimaryPartialClass(partialTypeSymbol);
+                            }
+
+                            types.Add(typeSymbol);
+                        }
+                    }
+                }
+            }
+
+            // Build inheritance chains
+            foreach (TypeSymbol typeSymbol in types) {
+                if (typeSymbol.Type == SymbolType.Class) {
+                    BuildTypeInheritance((ClassSymbol)typeSymbol);
+                }
+            }
+
+            // Import members
+            foreach (TypeSymbol typeSymbol in types) {
+                BuildMembers(typeSymbol);
+            }
+
+            // Associate interface members with interface member symbols
+            foreach (TypeSymbol typeSymbol in types) {
+                if (typeSymbol.Type == SymbolType.Class) {
+                    BuildInterfaceAssociations((ClassSymbol)typeSymbol);
+                }
+            }
+
+            // Load resource values
+            if (_symbols.HasResources) {
+                foreach (TypeSymbol typeSymbol in types) {
+                    if (typeSymbol.Type == SymbolType.Resources) {
+                        BuildResources((ResourcesSymbol)typeSymbol);
+                    }
+                }
+            }
+
+            // Load documentation
+            if (_options.EnableDocComments) {
+                Stream docCommentsStream = options.DocCommentFile.GetStream();
+                if (docCommentsStream != null) {
+                    try {
+                        XmlDocument docComments = new XmlDocument();
+                        docComments.Load(docCommentsStream);
+
+                        symbols.SetComments(docComments);
+                    }
+                    finally {
+                        options.DocCommentFile.CloseStream(docCommentsStream);
+                    }
+                }
+            }
+
+            return types;
+        }
+
+        private MethodSymbol BuildMethod(MethodDeclarationNode methodNode, TypeSymbol typeSymbol) {
+            MethodSymbol method = null;
+            if (methodNode.NodeType == ParseNodeType.ConstructorDeclaration) {
+                method = new ConstructorSymbol(typeSymbol, (methodNode.Modifiers & Modifiers.Static) != 0);
+            }
+            else {
+                TypeSymbol returnType = typeSymbol.SymbolSet.ResolveType(methodNode.Type, _symbolTable, typeSymbol);
+                Debug.Assert(returnType != null);
+
+                if (returnType != null) {
+                    method = new MethodSymbol(methodNode.Name, typeSymbol, returnType);
+                    BuildMemberDetails(method, typeSymbol, methodNode, methodNode.Attributes);
+
+                    ICollection<string> conditions = null;
+                    foreach (AttributeNode attrNode in methodNode.Attributes) {
+                        if (attrNode.TypeName.Equals("Conditional", StringComparison.Ordinal)) {
+                            if (conditions == null) {
+                                conditions = new List<string>();
+                            }
+
+                            Debug.Assert(attrNode.Arguments[0] is LiteralNode);
+                            Debug.Assert(((LiteralNode)attrNode.Arguments[0]).Value is string);
+
+                            conditions.Add((string)((LiteralNode)attrNode.Arguments[0]).Value);
+                        }
+                    }
+
+                    if (conditions != null) {
+                        method.SetConditions(conditions);
+                    }
+                }
+            }
+
+            if (method != null) {
+                if ((methodNode.Modifiers & Modifiers.Abstract) != 0) {
+                    method.SetImplementationState(SymbolImplementationFlags.Abstract);
+                }
+                else if ((methodNode.Modifiers & Modifiers.Override) != 0) {
+                    method.SetImplementationState(SymbolImplementationFlags.Override);
+                }
+
+                if ((methodNode.Parameters != null) && (methodNode.Parameters.Count != 0)) {
+                    foreach (ParameterNode parameterNode in methodNode.Parameters) {
+                        ParameterSymbol paramSymbol = BuildParameter(parameterNode, method);
+                        if (paramSymbol != null) {
+                            paramSymbol.SetParseContext(parameterNode);
+                            method.AddParameter(paramSymbol);
+                        }
+                    }
+                }
+
+                if ((method.Visibility & MemberVisibility.Static) != 0) {
+                    string scriptAlias = GetAttributeValue(methodNode.Attributes, "ScriptAlias");
+                    if (scriptAlias != null) {
+                        method.SetAlias(scriptAlias);
+                    }
+                }
+            }
+
+            return method;
+        }
+
+        private ParameterSymbol BuildParameter(ParameterNode parameterNode, MethodSymbol methodSymbol) {
+            ParameterMode parameterMode = ParameterMode.In;
+
+            if ((parameterNode.Flags == ParameterFlags.Out) ||
+                (parameterNode.Flags == ParameterFlags.Ref)) {
+                parameterMode = ParameterMode.InOut;
+            }
+            else if (parameterNode.Flags == ParameterFlags.Params) {
+                parameterMode = ParameterMode.List;
+            }
+
+            TypeSymbol parameterType = methodSymbol.SymbolSet.ResolveType(parameterNode.Type, _symbolTable, methodSymbol);
+            Debug.Assert(parameterType != null);
+
+            if (parameterType != null) {
+                return new ParameterSymbol(parameterNode.Name, methodSymbol, parameterType, parameterMode);
+            }
+
+            return null;
+        }
+
+        private ParameterSymbol BuildParameter(ParameterNode parameterNode, IndexerSymbol indexerSymbol) {
+            TypeSymbol parameterType = indexerSymbol.SymbolSet.ResolveType(parameterNode.Type, _symbolTable, indexerSymbol);
+            Debug.Assert(parameterType != null);
+
+            if (parameterType != null) {
+                return new ParameterSymbol(parameterNode.Name, indexerSymbol, parameterType, ParameterMode.In);
+            }
+
+            return null;
+        }
+
+        private PropertySymbol BuildProperty(PropertyDeclarationNode propertyNode, TypeSymbol typeSymbol) {
+            TypeSymbol propertyType = typeSymbol.SymbolSet.ResolveType(propertyNode.Type, _symbolTable, typeSymbol);
+            Debug.Assert(propertyType != null);
+
+            if (propertyType != null) {
+                PropertySymbol property = new PropertySymbol(propertyNode.Name, typeSymbol, propertyType);
+                BuildMemberDetails(property, typeSymbol, propertyNode, propertyNode.Attributes);
+
+                SymbolImplementationFlags implFlags = SymbolImplementationFlags.Regular;
+                if (propertyNode.SetAccessor == null) {
+                    implFlags |= SymbolImplementationFlags.ReadOnly;
+                }
+                if ((propertyNode.Modifiers & Modifiers.Abstract) != 0) {
+                    implFlags |= SymbolImplementationFlags.Abstract;
+                }
+                else if ((propertyNode.Modifiers & Modifiers.Override) != 0) {
+                    implFlags |= SymbolImplementationFlags.Override;
+                }
+                property.SetImplementationState(implFlags);
+
+                property.AddParameter(new ParameterSymbol("value", property, propertyType, ParameterMode.In));
+
+                return property;
+            }
+
+            return null;
+        }
+
+        private FieldSymbol BuildPropertyAsField(PropertyDeclarationNode propertyNode, TypeSymbol typeSymbol) {
+            AttributeNode intrinsicPropertyAttribute = AttributeNode.FindAttribute(propertyNode.Attributes, "IntrinsicProperty");
+            if (intrinsicPropertyAttribute == null) {
+                return null;
+            }
+
+            TypeSymbol fieldType = typeSymbol.SymbolSet.ResolveType(propertyNode.Type, _symbolTable, typeSymbol);
+            Debug.Assert(fieldType != null);
+
+            if (fieldType != null) {
+                FieldSymbol symbol = new FieldSymbol(propertyNode.Name, typeSymbol, fieldType);
+                BuildMemberDetails(symbol, typeSymbol, propertyNode, propertyNode.Attributes);
+
+                string scriptAlias = GetAttributeValue(propertyNode.Attributes, "ScriptAlias");
+                if (scriptAlias != null) {
+                    symbol.SetAlias(scriptAlias);
+                }
+
+                return symbol;
+            }
+
+            return null;
+        }
+
+        private void BuildResources(ResourcesSymbol resourcesSymbol) {
+            ICollection<ResXItem> items = _symbols.GetResources(resourcesSymbol.Name).Values;
+
+            if (items.Count != 0) {
+                foreach (ResXItem item in items) {
+                    FieldSymbol fieldSymbol = resourcesSymbol.GetMember(item.Name) as FieldSymbol;
+                    Debug.Assert(fieldSymbol != null);
+
+                    if (fieldSymbol != null) {
+                        fieldSymbol.Value = item.Value;
+                    }
+                }
+            }
+        }
+
+        private TypeSymbol BuildType(UserTypeNode typeNode, NamespaceSymbol namespaceSymbol) {
+            Debug.Assert(typeNode != null);
+            Debug.Assert(namespaceSymbol != null);
+
+            TypeSymbol typeSymbol = null;
+            ParseNodeList attributes = typeNode.Attributes;
+
+            if (typeNode.Type == TokenType.Class) {
+                CustomTypeNode customTypeNode = (CustomTypeNode)typeNode;
+                Debug.Assert(customTypeNode != null);
+
+                NameNode baseTypeNameNode = null;
+                if (customTypeNode.BaseTypes.Count != 0) {
+                    baseTypeNameNode = customTypeNode.BaseTypes[0] as NameNode;
+                }
+
+                if ((baseTypeNameNode != null) && (String.CompareOrdinal(baseTypeNameNode.Name, "Record") == 0)) {
+                    typeSymbol = new RecordSymbol(typeNode.Name, namespaceSymbol);
+                }
+                else {
+                    AttributeNode resourcesAttribute = AttributeNode.FindAttribute(attributes, "Resources");
+                    if (resourcesAttribute != null) {
+                        typeSymbol = new ResourcesSymbol(typeNode.Name, namespaceSymbol);
+                    }
+                    else {
+                        typeSymbol = new ClassSymbol(typeNode.Name, namespaceSymbol);
+
+                        if ((baseTypeNameNode != null) &&
+                            (String.CompareOrdinal(baseTypeNameNode.Name, "TestClass") == 0)) {
+                            ((ClassSymbol)typeSymbol).SetTestClass();
+                        }
+                    }
+                }
+            }
+            else if (typeNode.Type == TokenType.Interface) {
+                typeSymbol = new InterfaceSymbol(typeNode.Name, namespaceSymbol);
+            }
+            else if (typeNode.Type == TokenType.Enum) {
+                bool flags = false;
+
+                AttributeNode flagsAttribute = AttributeNode.FindAttribute(typeNode.Attributes, "Flags");
+                if (flagsAttribute != null) {
+                    flags = true;
+                }
+
+                typeSymbol = new EnumerationSymbol(typeNode.Name, namespaceSymbol, flags);
+            }
+            else if (typeNode.Type == TokenType.Delegate) {
+                typeSymbol = new DelegateSymbol(typeNode.Name, namespaceSymbol);
+                typeSymbol.SetTransformedName("Function");
+                typeSymbol.SetIgnoreNamespace();
+            }
+
+            Debug.Assert(typeSymbol != null, "Unexpected type node " + typeNode.Type);
+            if (typeSymbol != null) {
+                if ((typeNode.Modifiers & Modifiers.Public) != 0) {
+                    typeSymbol.SetPublic();
+                }
+
+                BuildType(typeSymbol, typeNode);
+
+                if (namespaceSymbol.Name.EndsWith(_options.TestsSubnamespace, StringComparison.Ordinal)) {
+                    typeSymbol.SetTestType();
+                }
+            }
+
+            return typeSymbol;
+        }
+
+        private void BuildType(TypeSymbol typeSymbol, UserTypeNode typeNode) {
+            Debug.Assert(typeSymbol != null);
+            Debug.Assert(typeNode != null);
+
+            ParseNodeList attributes = typeNode.Attributes;
+
+            if (AttributeNode.FindAttribute(attributes, "Imported") != null) {
+                typeSymbol.SetImported(/* dependencyName */ null);
+            }
+
+            if (AttributeNode.FindAttribute(attributes, "IgnoreNamespace") != null) {
+                typeSymbol.SetIgnoreNamespace();
+            }
+
+            if (AttributeNode.FindAttribute(attributes, "PreserveName") != null) {
+                typeSymbol.DisableNameTransformation();
+            }
+
+            string scriptName = GetAttributeValue(attributes, "ScriptName");
+            if (scriptName != null) {
+                typeSymbol.SetTransformedName(scriptName);
+            }
+
+            if (typeNode.Type == TokenType.Class) {
+                bool globalizeMembers = false;
+                string mixinRoot = null;
+
+                AttributeNode globalMethodsAttribute = AttributeNode.FindAttribute(attributes, "GlobalMethods");
+                if (globalMethodsAttribute != null) {
+                    globalizeMembers = true;
+                }
+                else {
+                    AttributeNode mixinAttribute = AttributeNode.FindAttribute(attributes, "Mixin");
+                    if (mixinAttribute != null) {
+                        Debug.Assert(mixinAttribute.Arguments[0] is LiteralNode);
+                        Debug.Assert(((LiteralNode)mixinAttribute.Arguments[0]).Value is string);
+
+                        mixinRoot = (string)((LiteralNode)mixinAttribute.Arguments[0]).Value;
+                        globalizeMembers = true;
+                    }
+                }
+
+                if (globalizeMembers) {
+                    ((ClassSymbol)typeSymbol).SetGlobalMethods(mixinRoot);
+                }
+            }
+
+            if (typeNode.Type == TokenType.Enum) {
+                if (AttributeNode.FindAttribute(attributes, "NamedValues") != null) {
+                    ((EnumerationSymbol)typeSymbol).SetNamedValues();
+                }
+                else if (AttributeNode.FindAttribute(attributes, "NumericValues") != null) {
+                    ((EnumerationSymbol)typeSymbol).SetNumericValues();
+                }
+            }
+        }
+
+        private void BuildTypeInheritance(ClassSymbol classSymbol) {
+            if (classSymbol.PrimaryPartialClass != classSymbol) {
+                // Don't build type inheritance for non-primary partial classes.
+                return;
+            }
+
+            CustomTypeNode customTypeNode = (CustomTypeNode)classSymbol.ParseContext;
+
+            if ((customTypeNode.BaseTypes != null) && (customTypeNode.BaseTypes.Count != 0)) {
+                ClassSymbol baseClass = null;
+                List<InterfaceSymbol> interfaces = null;
+
+                foreach (NameNode node in customTypeNode.BaseTypes) {
+                    TypeSymbol baseTypeSymbol = (TypeSymbol)_symbolTable.FindSymbol(node.Name, classSymbol, SymbolFilter.Types);
+                    Debug.Assert(baseTypeSymbol != null);
+
+                    if (baseTypeSymbol.Type == SymbolType.Class) {
+                        Debug.Assert(baseClass == null);
+                        baseClass = (ClassSymbol)baseTypeSymbol;
+                    }
+                    else {
+                        Debug.Assert(baseTypeSymbol.Type == SymbolType.Interface);
+
+                        if (interfaces == null) {
+                            interfaces = new List<InterfaceSymbol>();
+                        }
+                        interfaces.Add((InterfaceSymbol)baseTypeSymbol);
+                    }
+                }
+
+                if ((baseClass != null) || (interfaces != null)) {
+                    classSymbol.SetInheritance(baseClass, interfaces);
+                }
+            }
+        }
+
+        private string GetAssemblyScriptName(ParseNodeList compilationUnits) {
+            foreach (CompilationUnitNode compilationUnit in compilationUnits) {
+                foreach (AttributeBlockNode attribBlock in compilationUnit.Attributes) {
+                    string scriptName = GetAttributeValue(attribBlock.Attributes, "ScriptAssembly");
+                    if (scriptName != null) {
+                        return scriptName;
+                    }
+                }
+            }
+            return null;
+        }
+
+        private string GetAssemblyScriptNamespace(ParseNodeList compilationUnits) {
+            foreach (CompilationUnitNode compilationUnit in compilationUnits) {
+                foreach (AttributeBlockNode attribBlock in compilationUnit.Attributes) {
+                    string scriptNamespace = GetScriptNamespace(attribBlock.Attributes);
+                    if (scriptNamespace != null) {
+                        return scriptNamespace;
+                    }
+                }
+            }
+            return null;
+        }
+
+        private string GetAssemblyScriptPrefix(ParseNodeList compilationUnits) {
+            foreach (CompilationUnitNode compilationUnit in compilationUnits) {
+                foreach (AttributeBlockNode attribBlock in compilationUnit.Attributes) {
+                    string scriptPrefix = GetAttributeValue(attribBlock.Attributes, "ScriptQualifier");
+                    if (scriptPrefix != null) {
+                        return scriptPrefix;
+                    }
+                }
+            }
+            return null;
+        }
+
+        private string GetAttributeValue(ParseNodeList attributes, string attributeName) {
+            AttributeNode node = AttributeNode.FindAttribute(attributes, attributeName);
+
+            if (node != null) {
+                Debug.Assert(node.Arguments[0] is LiteralNode);
+                Debug.Assert(((LiteralNode)node.Arguments[0]).Value is string);
+
+                return (string)((LiteralNode)node.Arguments[0]).Value;
+            }
+            return null;
+        }
+
+        private string GetScriptNamespace(ParseNodeList attributes) {
+            return GetAttributeValue(attributes, "ScriptNamespace");
+        }
+
+        private MemberVisibility GetVisibility(MemberNode node, TypeSymbol typeSymbol) {
+            if (typeSymbol.Type == SymbolType.Interface) {
+                return MemberVisibility.Public;
+            }
+
+            MemberVisibility visibility = MemberVisibility.PrivateInstance;
+
+            if (((node.Modifiers & Modifiers.Static) != 0) ||
+                (node.NodeType == ParseNodeType.ConstFieldDeclaration)) {
+                visibility |= MemberVisibility.Static;
+            }
+
+            if ((node.Modifiers & Modifiers.Public) != 0) {
+                visibility |= MemberVisibility.Public;
+            }
+            else {
+                if ((node.Modifiers & Modifiers.Protected) != 0) {
+                    visibility |= MemberVisibility.Protected;
+                }
+                if ((node.Modifiers & Modifiers.Internal) != 0) {
+                    visibility |= MemberVisibility.Internal;
+                }
+            }
+
+            return visibility;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Compiler/ResourcesBuilder.cs b/src/Core/Compiler/Compiler/ResourcesBuilder.cs
new file mode 100644
index 000000000..e2ec498cd
--- /dev/null
+++ b/src/Core/Compiler/Compiler/ResourcesBuilder.cs
@@ -0,0 +1,86 @@
+// ResourceModelBuilder.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.ResourceModel {
+
+    internal sealed class ResourcesBuilder {
+
+        private SymbolSet _symbols;
+
+        public ResourcesBuilder(SymbolSet symbols) {
+            _symbols = symbols;
+        }
+
+        public void BuildResources(ICollection<IStreamSource> sources) {
+            // Process resources in the order of neutral to most specific locale
+            // so that as string values are looked up and stored, the final value
+            // contains the most specific locale value.
+            // This is a somewhat hacky way to get the ordering right, without
+            // have to sort through sets of related resource files, and constructing
+            // a hierarchy in the right order.
+
+            // First handle all the locale-neutral resources
+            foreach (IStreamSource source in sources) {
+                string locale = Utility.GetResourceFileLocale(source.Name);
+
+                if (locale.Length == 0) {
+                    BuildResources(source);
+                }
+            }
+
+            // Next handle all the language-only resource files
+            foreach (IStreamSource source in sources) {
+                string locale = Utility.GetResourceFileLocale(source.Name);
+
+                if (locale.Length == 2) {
+                    BuildResources(source);
+                }
+            }
+
+            // Finally handle all the language+country resource files
+            foreach (IStreamSource source in sources) {
+                string locale = Utility.GetResourceFileLocale(source.Name);
+
+                if (locale.Length > 2) {
+                    BuildResources(source);
+                }
+            }
+        }
+
+        private void BuildResources(IStreamSource source) {
+            string resxMarkup = GetMarkup(source);
+            List<ResXItem> resourceItems = ResXParser.ParseResxMarkup(resxMarkup);
+
+            string resourceName = Utility.GetResourceFileName(source.Name);
+            Dictionary<string, ResXItem> existingResourceItems = _symbols.GetResources(resourceName);
+
+            foreach (ResXItem item in resourceItems) {
+                existingResourceItems[item.Name] = item;
+            }
+        }
+
+        private string GetMarkup(IStreamSource source) {
+            string markup = null;
+
+            Stream stream = source.GetStream();
+            try {
+                StreamReader reader = new StreamReader(stream);
+                markup = reader.ReadToEnd();
+            }
+            finally {
+                if (stream != null) {
+                    source.CloseStream(stream);
+                    stream = null;
+                }
+            }
+            return markup;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Compiler/StatementBuilder.cs b/src/Core/Compiler/Compiler/StatementBuilder.cs
new file mode 100644
index 000000000..a55c19043
--- /dev/null
+++ b/src/Core/Compiler/Compiler/StatementBuilder.cs
@@ -0,0 +1,399 @@
+// StatementBuilder.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Compiler {
+
+    internal sealed class StatementBuilder {
+
+        private ILocalSymbolTable _symbolTable;
+        private CodeMemberSymbol _memberContext;
+        private SymbolSet _symbolSet;
+        private IErrorHandler _errorHandler;
+
+        private ExpressionBuilder _expressionBuilder;
+
+        public StatementBuilder(ILocalSymbolTable symbolTable, CodeMemberSymbol memberContext, IErrorHandler errorHandler, CompilerOptions options) {
+            _symbolTable = symbolTable;
+            _memberContext = memberContext;
+            _symbolSet = memberContext.SymbolSet;
+            _errorHandler = errorHandler;
+
+            _expressionBuilder = new ExpressionBuilder(symbolTable, memberContext, errorHandler, options);
+        }
+
+        public Statement BuildStatement(StatementNode statementNode) {
+            Statement statement = null;
+
+            try {
+                statement = BuildStatementCore(statementNode);
+            }
+            catch {
+                string location = statementNode.Token.Location;
+                string message = "Check that your C# source compiles and that you are not using an unsupported feature. " +
+                                 "Common things to check for include use of fully-qualified names " +
+                                 "(use a using statement to import namespaces instead) or " +
+                                 "accessing private members of a type from a static member of the same type.";
+
+                statement = new ErrorStatement(message, location);
+                _errorHandler.ReportError(message, location);
+            }
+
+            return statement;
+        }
+
+        private Statement BuildStatementCore(StatementNode statementNode) {
+            Statement statement = null;
+
+            switch (statementNode.NodeType) {
+                case ParseNodeType.Block:
+                    statement = ProcessBlockStatement((BlockStatementNode)statementNode);
+                    break;
+                case ParseNodeType.EmptyStatement:
+                    statement = new EmptyStatement();
+                    break;
+                case ParseNodeType.VariableDeclaration:
+                case ParseNodeType.ConstDeclaration:
+                    statement = ProcessVariableDeclarationStatement((VariableDeclarationNode)statementNode);
+                    break;
+                case ParseNodeType.Return:
+                    statement = ProcessReturnStatement((ReturnNode)statementNode);
+                    break;
+                case ParseNodeType.ExpressionStatement:
+                    statement = ProcessExpressionStatement((ExpressionStatementNode)statementNode);
+                    break;
+                case ParseNodeType.IfElse:
+                    statement = ProcessIfElseStatement((IfElseNode)statementNode);
+                    break;
+                case ParseNodeType.While:
+                    statement = ProcessWhileStatement((WhileNode)statementNode);
+                    break;
+                case ParseNodeType.DoWhile:
+                    statement = ProcessDoWhileStatement((DoWhileNode)statementNode);
+                    break;
+                case ParseNodeType.For:
+                    statement = ProcessForStatement((ForNode)statementNode);
+                    break;
+                case ParseNodeType.Foreach:
+                    statement = ProcessForeachStatement((ForeachNode)statementNode);
+                    break;
+                case ParseNodeType.Switch:
+                    statement = ProcessSwitchStatement((SwitchNode)statementNode);
+                    break;
+                case ParseNodeType.Break:
+                    statement = new BreakStatement();
+                    break;
+                case ParseNodeType.Continue:
+                    statement = new ContinueStatement();
+                    break;
+                case ParseNodeType.Throw:
+                    statement = ProcessThrowStatement((ThrowNode)statementNode);
+                    break;
+                case ParseNodeType.Try:
+                    statement = ProcessTryCatchFinallyStatement((TryNode)statementNode);
+                    break;
+            }
+            return statement;
+        }
+
+        private Statement ProcessBlockStatement(BlockStatementNode node) {
+            BlockStatement statement = new BlockStatement();
+
+            _symbolTable.PushScope();
+
+            foreach (StatementNode childStatementNode in node.Statements) {
+                Statement childStatement = BuildStatement(childStatementNode);
+                if (childStatement != null) {
+                    statement.AddStatement(childStatement);
+                }
+            }
+
+            _symbolTable.PopScope();
+
+            return statement;
+        }
+
+        private Statement ProcessDoWhileStatement(DoWhileNode node) {
+            Expression condition = _expressionBuilder.BuildExpression(node.Condition);
+            if (condition is MemberExpression) {
+                condition = _expressionBuilder.TransformMemberExpression((MemberExpression)condition);
+            }
+
+            Statement body = BuildStatement((StatementNode)node.Body);
+
+            return new WhileStatement(condition, body, /* preCondition */ false);
+        }
+
+        private Statement ProcessExpressionStatement(ExpressionStatementNode node) {
+            Expression expression = _expressionBuilder.BuildExpression(node.Expression);
+            if (expression == null) {
+                // This happens when the expression is a method call, and the method
+                // is debug conditional
+                return null;
+            }
+
+            return new ExpressionStatement(expression);
+        }
+
+        private Statement ProcessForStatement(ForNode node) {
+            ForStatement statement = new ForStatement();
+
+            _symbolTable.PushScope();
+
+            if (node.Initializer != null) {
+                if (node.Initializer is VariableDeclarationNode) {
+                    VariableDeclarationStatement initializer = (VariableDeclarationStatement)BuildStatement((StatementNode)node.Initializer);
+                    statement.AddInitializer(initializer);
+                }
+                else {
+                    Debug.Assert(node.Initializer is ExpressionListNode);
+
+                    ICollection<Expression> initializers = _expressionBuilder.BuildExpressionList((ExpressionListNode)node.Initializer);
+                    foreach (Expression initializer in initializers) {
+                        statement.AddInitializer(initializer);
+                    }
+                }
+            }
+
+            if (node.Condition != null) {
+                Expression condition = _expressionBuilder.BuildExpression(node.Condition);
+                if (condition is MemberExpression) {
+                    condition = _expressionBuilder.TransformMemberExpression((MemberExpression)condition);
+                }
+                statement.AddCondition(condition);
+            }
+
+            if (node.Increment != null) {
+                Debug.Assert(node.Increment is ExpressionListNode);
+
+                ICollection<Expression> increments = _expressionBuilder.BuildExpressionList((ExpressionListNode)node.Increment);
+                foreach (Expression increment in increments) {
+                    statement.AddIncrement(increment);
+                }
+            }
+
+            Statement body = BuildStatement((StatementNode)node.Body);
+            statement.AddBody(body);
+
+            _symbolTable.PopScope();
+
+            return statement;
+        }
+
+        private Statement ProcessForeachStatement(ForeachNode node) {
+            TypeSymbol type = _symbolSet.ResolveType(node.Type, _symbolTable, _memberContext);
+            Debug.Assert(type != null);
+
+            bool dictionaryContainer = (type.Name == "DictionaryEntry") || (type.Name == "KeyValuePair`2");
+
+            Expression collectionExpression = _expressionBuilder.BuildExpression(node.Container);
+            if (collectionExpression is MemberExpression) {
+                collectionExpression = _expressionBuilder.TransformMemberExpression((MemberExpression)collectionExpression);
+            }
+
+            ForInStatement statement;
+            if (dictionaryContainer) {
+                string dictionaryVariableName = _symbolTable.CreateSymbolName("dict");
+                VariableSymbol dictionaryVariable = new VariableSymbol(dictionaryVariableName, _memberContext,
+                                                                       collectionExpression.EvaluatedType);
+
+                statement = new ForInStatement(collectionExpression, dictionaryVariable);
+
+                string keyVariableName = _symbolTable.CreateSymbolName("key");
+                VariableSymbol keyVariable = new VariableSymbol(keyVariableName, _memberContext,
+                                                                _symbolSet.ResolveIntrinsicType(IntrinsicType.String));
+                statement.SetLoopVariable(keyVariable);
+            }
+            else {
+                statement = new ForInStatement(collectionExpression);
+
+                string enumeratorVariableName = _symbolTable.CreateSymbolName("enum");
+                VariableSymbol enumVariable = new VariableSymbol(enumeratorVariableName, _memberContext,
+                                                                 _symbolSet.ResolveIntrinsicType(IntrinsicType.IEnumerator));
+                statement.SetLoopVariable(enumVariable);
+            }
+
+            _symbolTable.PushScope();
+
+            VariableSymbol itemVariable = new VariableSymbol(node.Name.Name, _memberContext, type);
+            _symbolTable.AddSymbol(itemVariable);
+            statement.SetItemVariable(itemVariable);
+
+            Statement body = BuildStatement((StatementNode)node.Body);
+            statement.AddBody(body);
+
+            _symbolTable.PopScope();
+
+            return statement;
+        }
+
+        private Statement ProcessIfElseStatement(IfElseNode node) {
+            Expression condition = _expressionBuilder.BuildExpression(node.Condition);
+            if (condition is MemberExpression) {
+                condition = _expressionBuilder.TransformMemberExpression((MemberExpression)condition);
+            }
+
+            Statement ifStatement = BuildStatement((StatementNode)node.IfBlock);
+            Statement elseStatement = null;
+
+            if (node.ElseBlock != null) {
+                elseStatement = BuildStatement((StatementNode)node.ElseBlock);
+            }
+
+            return new IfElseStatement(condition, ifStatement, elseStatement);
+        }
+
+        private Statement ProcessReturnStatement(ReturnNode node) {
+            Expression returnValue = null;
+
+            if (node.Value != null) {
+                returnValue = _expressionBuilder.BuildExpression(node.Value);
+                if (returnValue is MemberExpression) {
+                    returnValue = _expressionBuilder.TransformMemberExpression((MemberExpression)returnValue);
+                }
+            }
+
+            return new ReturnStatement(returnValue);
+        }
+
+        private Statement ProcessSwitchStatement(SwitchNode node) {
+            Expression condition = _expressionBuilder.BuildExpression(node.Condition);
+            if (condition is MemberExpression) {
+                condition = _expressionBuilder.TransformMemberExpression((MemberExpression)condition);
+            }
+
+            SwitchStatement statement = new SwitchStatement(condition);
+
+            foreach (SwitchSectionNode switchSectionNode in node.Cases) {
+                SwitchGroup group = new SwitchGroup();
+
+                foreach (StatementNode caseNode in switchSectionNode.Labels) {
+                    if (caseNode is CaseLabelNode) {
+                        CaseLabelNode labelNode = (CaseLabelNode)caseNode;
+                        Expression labelValue = _expressionBuilder.BuildExpression(labelNode.Value);
+                        if (labelValue is MemberExpression) {
+                            labelValue = _expressionBuilder.TransformMemberExpression((MemberExpression)labelValue);
+                        }
+
+                        group.AddCase(labelValue);
+                    }
+                    else {
+                        Debug.Assert(caseNode is DefaultLabelNode);
+                        group.AddDefaultCase();
+                    }
+                }
+
+                foreach (StatementNode statementNode in switchSectionNode.Statements) {
+                    Statement childStatement = BuildStatement(statementNode);
+                    if (childStatement != null) {
+                        group.AddStatement(childStatement);
+                    }
+                }
+
+                statement.AddSwitchGroup(group);
+            }
+
+            return statement;
+        }
+
+        private Statement ProcessThrowStatement(ThrowNode node) {
+            Debug.Assert(node.Value != null);
+
+            Expression valueExpression = _expressionBuilder.BuildExpression(node.Value);
+            if (valueExpression is MemberExpression) {
+                valueExpression = _expressionBuilder.TransformMemberExpression((MemberExpression)valueExpression);
+            }
+            return new ThrowStatement(valueExpression);
+        }
+
+        private Statement ProcessTryCatchFinallyStatement(TryNode node) {
+            Debug.Assert(node.CatchClauses.Count < 2);
+            Debug.Assert((node.CatchClauses.Count == 1) || (node.FinallyClause != null));
+
+            TryCatchFinallyStatement statement = new TryCatchFinallyStatement();
+
+            Statement body = BuildStatement((StatementNode)node.Body);
+            statement.AddBody(body);
+
+            if (node.CatchClauses.Count == 1) {
+                CatchNode catchNode = (CatchNode)node.CatchClauses[0];
+
+                VariableSymbol exceptionVariableSymbol = null;
+                if (catchNode.Name != null) {
+                    TypeSymbol exceptionVariableType =
+                        _symbolSet.ResolveType(catchNode.Type, _symbolTable, _memberContext);
+                    Debug.Assert(exceptionVariableType != null);
+
+                    exceptionVariableSymbol =
+                        new VariableSymbol(catchNode.Name.Name, _memberContext, exceptionVariableType);
+                }
+                else {
+                    TypeSymbol exceptionVariableType =
+                        _symbolSet.ResolveIntrinsicType(IntrinsicType.Exception);
+                    Debug.Assert(exceptionVariableType != null);
+
+                    exceptionVariableSymbol =
+                        new VariableSymbol(_symbolTable.CreateSymbolName("e"), _memberContext, exceptionVariableType);
+                }
+
+                _symbolTable.PushScope();
+                _symbolTable.AddSymbol(exceptionVariableSymbol);
+
+                Statement catchStatement = BuildStatement((StatementNode)catchNode.Body);
+                statement.AddCatch(exceptionVariableSymbol, catchStatement);
+
+                _symbolTable.PopScope();
+            }
+
+            if (node.FinallyClause != null) {
+                Statement finallyStatement = BuildStatement((StatementNode)node.FinallyClause);
+                statement.AddFinally(finallyStatement);
+            }
+
+            return statement;
+        }
+
+        private Statement ProcessVariableDeclarationStatement(VariableDeclarationNode node) {
+            VariableDeclarationStatement statement = new VariableDeclarationStatement();
+            TypeSymbol variableType = _symbolSet.ResolveType(node.Type, _symbolTable, _memberContext);
+
+            foreach (VariableInitializerNode initializerNode in node.Initializers) {
+                string name = initializerNode.Name.Name;
+
+                VariableSymbol symbol = new VariableSymbol(name, _memberContext, variableType);
+                if (initializerNode.Value != null) {
+                    Expression value = _expressionBuilder.BuildExpression(initializerNode.Value);
+                    if (value is MemberExpression) {
+                        value = _expressionBuilder.TransformMemberExpression((MemberExpression)value);
+                    }
+                    symbol.SetValue(value);
+                }
+
+                _symbolTable.AddSymbol(symbol);
+
+                statement.AddVariable(symbol);
+            }
+            return statement;
+        }
+
+        private Statement ProcessWhileStatement(WhileNode node) {
+            Expression condition = _expressionBuilder.BuildExpression(node.Condition);
+            if (condition is MemberExpression) {
+                condition = _expressionBuilder.TransformMemberExpression((MemberExpression)condition);
+            }
+
+            Statement body = BuildStatement((StatementNode)node.Body);
+
+            return new WhileStatement(condition, body, /* preCondition */ true);
+        }
+    }
+}
diff --git a/src/Core/Compiler/CompilerOptions.cs b/src/Core/Compiler/CompilerOptions.cs
new file mode 100644
index 000000000..f309fbb76
--- /dev/null
+++ b/src/Core/Compiler/CompilerOptions.cs
@@ -0,0 +1,237 @@
+// CompilerOptions.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+
+namespace ScriptSharp {
+
+    /// <summary>
+    /// Script# compiler options.
+    /// </summary>
+    public sealed class CompilerOptions {
+
+        private ICollection<string> _references;
+        private ICollection<string> _defines;
+        private ICollection<IStreamSource> _sources;
+        private ICollection<IStreamSource> _resources;
+        private IStreamSource _templateFile;
+        private IStreamSource _scriptFile;
+        private IStreamSource _docCommentFile;
+        private string _scriptNameSuffix;
+        private bool _debugFlavor;
+        private bool _includeTests;
+        private bool _minimize;
+
+        private string _testsSubnamespace;
+
+        private List<string> _executionDependencies;
+        private List<string> _referencedDependencies;
+
+        private bool _hasTestTypes;
+
+        // TODO: Get rid of internal test mode/type...
+        private bool _internalTestMode;
+        private string _internalTestType;
+
+        public CompilerOptions() {
+            _testsSubnamespace = ".Tests";
+        }
+
+        public bool DebugFlavor {
+            get {
+                return _debugFlavor;
+            }
+            set {
+                _debugFlavor = value;
+            }
+        }
+
+        public ICollection<string> Defines {
+            get {
+                return _defines;
+            }
+            set {
+                _defines = value;
+            }
+        }
+
+        public IStreamSource DocCommentFile {
+            get {
+                return _docCommentFile;
+            }
+            set {
+                _docCommentFile = value;
+            }
+        }
+
+        public bool EnableDocComments {
+            get {
+                if (DebugFlavor) {
+                    return (_docCommentFile != null);
+                }
+                return false;
+            }
+        }
+
+        public IEnumerable<string> ExecutionDependencies {
+            get {
+                return _executionDependencies;
+            }
+        }
+
+        public bool HasTestTypes {
+            get {
+                return _hasTestTypes;
+            }
+            set {
+                _hasTestTypes = value;
+            }
+        }
+
+        public bool IncludeTests {
+            get {
+                return _includeTests;
+            }
+            set {
+                _includeTests = value;
+            }
+        }
+
+        public bool InternalTestMode {
+            get {
+                return _internalTestMode;
+            }
+            set {
+                _internalTestMode = value;
+            }
+        }
+
+        public string InternalTestType {
+            get {
+                return _internalTestType;
+            }
+            set {
+                _internalTestType = value;
+            }
+        }
+
+        public bool Minimize {
+            get {
+                if (!DebugFlavor) {
+                    return _minimize;
+                }
+                return false;
+            }
+            set {
+                _minimize = value;
+            }
+        }
+
+        public ICollection<string> References {
+            get {
+                return _references;
+            }
+            set {
+                _references = value;
+                _referencedDependencies = null;
+            }
+        }
+
+        public ICollection<IStreamSource> Resources {
+            get {
+                return _resources;
+            }
+            set {
+                _resources = value;
+            }
+        }
+
+        public IStreamSource ScriptFile {
+            get {
+                return _scriptFile;
+            }
+            set {
+                _scriptFile = value;
+            }
+        }
+
+        public string ScriptNameSuffix {
+            get {
+                return _scriptNameSuffix ?? String.Empty;
+            }
+            set {
+                _scriptNameSuffix = value;
+            }
+        }
+
+        public ICollection<IStreamSource> Sources {
+            get {
+                return _sources;
+            }
+            set {
+                _sources = value;
+            }
+        }
+
+        public IStreamSource TemplateFile {
+            get {
+                return _templateFile;
+            }
+            set {
+                _templateFile = value;
+            }
+        }
+
+        public string TestsSubnamespace {
+            get {
+                return _testsSubnamespace;
+            }
+            set {
+                _testsSubnamespace = value;
+            }
+        }
+
+        public void AddExecutionDependency(string scriptName) {
+            if (_executionDependencies == null) {
+                _executionDependencies = new List<string>();
+            }
+            if (_executionDependencies.Contains(scriptName) == false) {
+                _executionDependencies.Add(scriptName);
+            }
+        }
+
+        public void AddReferencedDependency(string scriptName) {
+            if (_referencedDependencies == null) {
+                _referencedDependencies = new List<string>();
+            }
+            _referencedDependencies.Add(scriptName);
+        }
+
+        public bool Validate(out string errorMessage) {
+            errorMessage = String.Empty;
+
+            if (References.Count == 0) {
+                errorMessage = "You must specify a list of valid assembly references.";
+                return false;
+            }
+
+            if (Sources.Count == 0) {
+                errorMessage = "You must specify a list of valid source files.";
+                return false;
+            }
+
+            if (ScriptFile == null) {
+                errorMessage = "You must specify a valid output script file.";
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Generator/CodeGenerator.cs b/src/Core/Compiler/Generator/CodeGenerator.cs
new file mode 100644
index 000000000..f237dc2f4
--- /dev/null
+++ b/src/Core/Compiler/Generator/CodeGenerator.cs
@@ -0,0 +1,68 @@
+// CodeGenerator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using ScriptSharp;
+using ScriptSharp.Compiler;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Generator {
+
+    internal static class CodeGenerator {
+
+        private static void GenerateImplementationScript(ScriptGenerator generator, MemberSymbol symbol, SymbolImplementation implementation) {
+            foreach (Statement statement in implementation.Statements) {
+                StatementGenerator.GenerateStatement(generator, symbol, statement);
+            }
+        }
+
+        public static void GenerateScript(ScriptGenerator generator, EventSymbol symbol, bool add) {
+            SymbolImplementation accessorImpl;
+            if (add) {
+                accessorImpl = symbol.AdderImplementation;
+            }
+            else {
+                accessorImpl = symbol.RemoverImplementation;
+            }
+            GenerateImplementationScript(generator, symbol, accessorImpl);
+        }
+
+        public static void GenerateScript(ScriptGenerator generator, FieldSymbol symbol) {
+            GenerateImplementationScript(generator, symbol, symbol.Implementation);
+        }
+
+        public static void GenerateScript(ScriptGenerator generator, MethodSymbol symbol) {
+            GenerateImplementationScript(generator, symbol, symbol.Implementation);
+        }
+
+        public static void GenerateScript(ScriptGenerator generator, AnonymousMethodSymbol symbol) {
+            GenerateImplementationScript(generator, symbol, symbol.Implementation);
+        }
+
+        public static void GenerateScript(ScriptGenerator generator, PropertySymbol symbol, bool getter) {
+            SymbolImplementation accessorImpl;
+            if (getter) {
+                accessorImpl = symbol.GetterImplementation;
+            }
+            else {
+                accessorImpl = symbol.SetterImplementation;
+            }
+            GenerateImplementationScript(generator, symbol, accessorImpl);
+        }
+
+        public static void GenerateScript(ScriptGenerator generator, IndexerSymbol symbol, bool getter) {
+            SymbolImplementation accessorImpl;
+            if (getter) {
+                accessorImpl = symbol.GetterImplementation;
+            }
+            else {
+                accessorImpl = symbol.SetterImplementation;
+            }
+            GenerateImplementationScript(generator, symbol, accessorImpl);
+        }
+    }
+}
diff --git a/src/Core/Compiler/Generator/DocCommentGenerator.cs b/src/Core/Compiler/Generator/DocCommentGenerator.cs
new file mode 100644
index 000000000..bc6ce1f2e
--- /dev/null
+++ b/src/Core/Compiler/Generator/DocCommentGenerator.cs
@@ -0,0 +1,264 @@
+// DocCommentGenerator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+namespace ScriptSharp.Generator {
+
+    using System;
+    using System.Diagnostics;
+    using System.IO;
+    using System.Text;
+    using System.Xml;
+    using ScriptSharp.ScriptModel;
+
+    internal static class DocCommentGenerator {
+
+        public static void GenerateComment(ScriptGenerator generator, Symbol symbol) {
+            ScriptTextWriter writer = generator.Writer;
+
+            switch (symbol.Type) {
+                case SymbolType.Class:
+                    GenerateClassComment(writer, (ClassSymbol)symbol);
+                    break;
+                case SymbolType.Enumeration:
+                    GenerateEnumerationComment(writer, (EnumerationSymbol)symbol);
+                    break;
+                case SymbolType.Event:
+                    GenerateEventComment(writer, (EventSymbol)symbol);
+                    break;
+                case SymbolType.Indexer:
+                    GenerateIndexerComment(writer, (IndexerSymbol)symbol);
+                    break;
+                case SymbolType.Interface:
+                    GenerateInterfaceComment(writer, (InterfaceSymbol)symbol);
+                    break;
+                case SymbolType.Method:
+                    GenerateMethodComment(writer, (MethodSymbol)symbol);
+                    break;
+                case SymbolType.Property:
+                    GeneratePropertyComment(writer, (PropertySymbol)symbol);
+                    break;
+                default:
+                    Debug.Fail("Unexpected symbol type");
+                    break;
+            }
+        }
+
+        private static void GenerateClassComment(ScriptTextWriter writer, ClassSymbol classSymbol) {
+            GenerateSummaryComment(writer, classSymbol);
+
+            if ((classSymbol.Constructor != null) &&
+                (classSymbol.Constructor.Parameters != null)) {
+                foreach (ParameterSymbol parameterSymbol in classSymbol.Constructor.Parameters) {
+                    GenerateParameterComment(writer, parameterSymbol);
+                }
+            }
+
+            foreach (MemberSymbol memberSymbol in classSymbol.Members) {
+                FieldSymbol fieldSymbol = memberSymbol as FieldSymbol;
+                if (fieldSymbol != null) {
+                    GenerateFieldComment(writer, fieldSymbol);
+                }
+            }
+        }
+
+        private static void GenerateFormattedComment(ScriptTextWriter writer, string text) {
+            foreach (string line in text.Split(new char[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)) {
+                string trimmedLine = line.Trim();
+
+                if (!String.IsNullOrEmpty(trimmedLine)) {
+                    writer.WriteLine("/// {0}", trimmedLine);
+                }
+            }
+        }
+
+        private static void GenerateInterfaceComment(ScriptTextWriter writer, InterfaceSymbol interfaceSymbol) {
+            writer.WriteNewLine();
+            writer.Indent++;
+
+            GenerateSummaryComment(writer, interfaceSymbol);
+
+            writer.Indent--;
+        }
+
+        private static void GenerateParameterComment(ScriptTextWriter writer, ParameterSymbol parameterSymbol) {
+            writer.Write("/// <param name=\"{0}\"", parameterSymbol.GeneratedName);
+
+            GenerateTypeAttributes(writer, parameterSymbol.ValueType);
+
+            writer.WriteLine(">");
+
+            GenerateFormattedComment(writer, parameterSymbol.Documentation);
+
+            writer.WriteLine("/// </param>");
+        }
+
+        private static void GenerateEventComment(ScriptTextWriter writer, EventSymbol eventSymbol) {
+            GenerateSummaryComment(writer, eventSymbol);
+
+            writer.WriteLine("/// <param name=\"{0}\" type=\"Function\" />", eventSymbol.Parameters[0].Name);
+        }
+
+        private static void GenerateEnumerationComment(ScriptTextWriter writer, EnumerationSymbol enumSymbol) {
+            writer.WriteNewLine();
+            writer.Indent++;
+
+            GenerateSummaryComment(writer, enumSymbol);
+
+            foreach (MemberSymbol memberSymbol in enumSymbol.Members) {
+                EnumerationFieldSymbol fieldSymbol = memberSymbol as EnumerationFieldSymbol;
+                if (fieldSymbol != null) {
+                    writer.WriteLine(
+                        "/// <field name=\"{0}\" type=\"Number\" integer=\"true\" static=\"true\">",
+                        fieldSymbol.GeneratedName);
+
+                    GenerateFormattedComment(writer, fieldSymbol.Documentation);
+
+                    writer.WriteLine("/// </field>");
+                }
+            }
+
+            writer.Indent--;
+        }
+
+        private static void GenerateFieldComment(ScriptTextWriter writer, FieldSymbol fieldSymbol) {
+            writer.Write("/// <field name=\"{0}\"", fieldSymbol.GeneratedName);
+
+            GenerateTypeAttributes(writer, fieldSymbol.AssociatedType);
+
+            if ((fieldSymbol.Visibility & MemberVisibility.Static) != 0) {
+                writer.Write(" static=\"true\"");
+            }
+
+            writer.WriteLine(">");
+
+            GenerateFormattedComment(writer, fieldSymbol.Documentation);
+
+            writer.WriteLine("/// </field>");
+        }
+
+        private static void GenerateIndexerComment(ScriptTextWriter writer, IndexerSymbol indexerSymbol) {
+            GenerateSummaryComment(writer, indexerSymbol);
+
+            if (indexerSymbol.Parameters != null) {
+                foreach (ParameterSymbol parameterSymbol in indexerSymbol.Parameters) {
+                    GenerateParameterComment(writer, parameterSymbol);
+                }
+            }
+
+            GenerateReturnsComment(writer, indexerSymbol.AssociatedType);
+        }
+
+        private static void GenerateMethodComment(ScriptTextWriter writer, MethodSymbol methodSymbol) {
+            GenerateSummaryComment(writer, methodSymbol);
+
+            if (methodSymbol.Parameters != null) {
+                foreach (ParameterSymbol parameterSymbol in methodSymbol.Parameters) {
+                    GenerateParameterComment(writer, parameterSymbol);
+                }
+            }
+
+            GenerateReturnsComment(writer, methodSymbol.AssociatedType);
+        }
+
+        private static void GeneratePropertyComment(ScriptTextWriter writer, PropertySymbol propertySymbol) {
+            GenerateSummaryComment(writer, propertySymbol);
+
+            writer.Write("/// <value");
+
+            GenerateTypeAttributes(writer, propertySymbol.AssociatedType);
+
+            writer.WriteLine("></value>");
+        }
+
+        private static void GenerateReturnsComment(ScriptTextWriter writer, TypeSymbol typeSymbol) {
+            if (IsVoid(typeSymbol)) {
+                return;
+            }
+
+            writer.Write("/// <returns");
+
+            GenerateTypeAttributes(writer, typeSymbol);
+
+            writer.WriteLine("></returns>");
+        }
+
+        private static void GenerateSummaryComment(ScriptTextWriter writer, Symbol symbol) {
+            string documentation = symbol.Documentation;
+
+            if (String.IsNullOrEmpty(documentation) == false) {
+                writer.WriteLine("/// <summary>");
+                GenerateFormattedComment(writer, documentation);
+                writer.WriteLine("/// </summary>");
+            }
+        }
+
+        private static void GenerateTypeAttributes(ScriptTextWriter writer, TypeSymbol typeSymbol) {
+            if (IsDomElement(typeSymbol)) {
+                writer.Write(" type=\"Object\" domElement=\"true\"");
+            }
+            else {
+                writer.Write(" type=\"{0}\"", typeSymbol.FullGeneratedName);
+            }
+
+            if (IsInteger(typeSymbol)) {
+                writer.Write(" integer=\"true\"");
+            }
+
+            if (typeSymbol.IsArray) {
+                ClassSymbol classSymbol = (ClassSymbol)typeSymbol;
+
+                TypeSymbol elementTypeSymbol = classSymbol.Indexer.AssociatedType;
+
+                if (IsDomElement(elementTypeSymbol)) {
+                    writer.Write(" elementType=\"Object\" elementDomElement=\"true\"");
+                }
+                else {
+                    writer.Write(" elementType=\"{0}\"", elementTypeSymbol.GeneratedName);
+                }
+
+                if (IsInteger(elementTypeSymbol)) {
+                    writer.Write(" elementInteger=\"true\"");
+                }
+            }
+        }
+
+        private static bool IsDomElement(TypeSymbol typeSymbol) {
+            ClassSymbol classSymbol = typeSymbol as ClassSymbol;
+
+            while (classSymbol != null) {
+                // TODO: This is a dependency on Script.Web.dll that we should remove.
+                //       For now, changed SymbolSet.FindSymbol to handle the case
+                //       where a namespace being looked up might not be defined.
+
+                if (IsSymbol(classSymbol, "System.Html.Element")) {
+                    return true;
+                }
+
+                classSymbol = classSymbol.BaseClass;
+            }
+
+            return false;
+        }
+
+        private static bool IsInteger(TypeSymbol typeSymbol) {
+            return (IsSymbol(typeSymbol, "System.Byte") ||
+                IsSymbol(typeSymbol, "System.Int16") ||
+                IsSymbol(typeSymbol, "System.Int32") ||
+                IsSymbol(typeSymbol, "System.Int64") ||
+                IsSymbol(typeSymbol, "System.SByte") ||
+                IsSymbol(typeSymbol, "System.UInt16") ||
+                IsSymbol(typeSymbol, "System.UInt32") ||
+                IsSymbol(typeSymbol, "System.UInt64"));
+        }
+
+        private static bool IsSymbol(TypeSymbol typeSymbol, string name) {
+            return typeSymbol.SymbolSet.IsSymbol(typeSymbol, name);
+        }
+
+        private static bool IsVoid(TypeSymbol typeSymbol) {
+            return IsSymbol(typeSymbol, "System.Void");
+        }
+    }
+}
diff --git a/src/Core/Compiler/Generator/ExpressionGenerator.cs b/src/Core/Compiler/Generator/ExpressionGenerator.cs
new file mode 100644
index 000000000..f66a2581d
--- /dev/null
+++ b/src/Core/Compiler/Generator/ExpressionGenerator.cs
@@ -0,0 +1,886 @@
+// ExpressionGenerator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using ScriptSharp;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Generator {
+
+    internal static class ExpressionGenerator {
+
+        private static void GenerateBaseInitializerExpression(ScriptGenerator generator, MemberSymbol symbol, BaseInitializerExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            Debug.Assert(symbol.Parent is ClassSymbol);
+
+            writer.Write(((ClassSymbol)symbol.Parent).FullGeneratedName);
+            writer.Write(".initializeBase(this");
+            if (expression.Parameters != null) {
+                writer.Write(",");
+                writer.WriteTrimmed(" [ ");
+                GenerateExpressionList(generator, symbol, expression.Parameters);
+                writer.WriteTrimmed(" ]");
+            }
+            writer.Write(")");
+        }
+
+        private static void GenerateBinaryExpression(ScriptGenerator generator, MemberSymbol symbol, BinaryExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            if (expression.Operator == Operator.Equals) {
+                PropertyExpression propExpression = expression.LeftOperand as PropertyExpression;
+                if (propExpression != null) {
+                    Debug.Assert(propExpression.Type == ExpressionType.PropertySet);
+
+                    if (propExpression.ObjectReference is BaseExpression) {
+                        Debug.Assert(symbol.Parent is ClassSymbol);
+
+                        writer.Write(((ClassSymbol)symbol.Parent).FullGeneratedName);
+                        writer.Write(".callBaseMethod(this, 'set_");
+                        writer.Write(propExpression.Property.GeneratedName);
+                        writer.Write("',");
+                        writer.WriteTrimmed(" [ ");
+                        GenerateExpression(generator, symbol, expression.RightOperand);
+                        writer.WriteTrimmed(" ])");
+                    }
+                    else {
+                        GenerateExpression(generator, symbol, propExpression.ObjectReference);
+                        writer.Write(".set_");
+                        writer.Write(propExpression.Property.GeneratedName);
+                        writer.Write("(");
+                        GenerateExpression(generator, symbol, expression.RightOperand);
+                        writer.Write(")");
+                    }
+
+                    return;
+                }
+
+                IndexerExpression indexExpression = expression.LeftOperand as IndexerExpression;
+                if ((indexExpression != null) &&
+                    !indexExpression.Indexer.IsIntrinsic) {
+                    Debug.Assert(indexExpression.Type == ExpressionType.Indexer);
+
+                    if (indexExpression.ObjectReference is BaseExpression) {
+                        Debug.Assert(symbol.Parent is ClassSymbol);
+
+                        writer.Write(((ClassSymbol)symbol.Parent).FullGeneratedName);
+                        writer.Write(".callBaseMethod(this, 'set_");
+                        writer.Write(indexExpression.Indexer.GeneratedName);
+                        writer.Write("',");
+                        writer.WriteTrimmed(" [ ");
+                        GenerateExpressionList(generator, symbol, indexExpression.Indices);
+                        writer.WriteTrimmed(", ");
+                        GenerateExpression(generator, symbol, expression.RightOperand);
+                        writer.WriteTrimmed(" ])");
+                    }
+                    else {
+                        IndexerSymbol indexerSymbol = indexExpression.Indexer;
+
+                        GenerateExpression(generator, symbol, indexExpression.ObjectReference);
+                        writer.Write(".set_");
+                        writer.Write(indexerSymbol.GeneratedName);
+                        writer.Write("(");
+                        GenerateExpressionList(generator, symbol, indexExpression.Indices);
+                        writer.WriteTrimmed(", ");
+                        GenerateExpression(generator, symbol, expression.RightOperand);
+                        writer.Write(")");
+                    }
+
+                    return;
+                }
+            }
+            else if ((expression.Operator == Operator.PlusEquals) ||
+                     (expression.Operator == Operator.MinusEquals) ||
+                     (expression.Operator == Operator.MultiplyEquals) ||
+                     (expression.Operator == Operator.DivideEquals) ||
+                     (expression.Operator == Operator.ModEquals) ||
+                     (expression.Operator == Operator.BitwiseOrEquals) ||
+                     (expression.Operator == Operator.BitwiseAndEquals) ||
+                     (expression.Operator == Operator.BitwiseXorEquals) ||
+                     (expression.Operator == Operator.ShiftLeftEquals) ||
+                     (expression.Operator == Operator.ShiftRightEquals) ||
+                     (expression.Operator == Operator.UnsignedShiftRightEquals)) {
+                PropertyExpression propExpression = expression.LeftOperand as PropertyExpression;
+                if (propExpression != null) {
+                    Debug.Assert(propExpression.Type == ExpressionType.PropertyGet);
+
+                    GenerateExpression(generator, symbol, propExpression.ObjectReference);
+                    writer.Write(".set_");
+                    writer.Write(propExpression.Property.GeneratedName);
+                    writer.Write("(");
+                    GenerateExpression(generator, symbol, propExpression.ObjectReference);
+                    writer.Write(".get_");
+                    writer.Write(propExpression.Property.GeneratedName);
+                    writer.WriteTrimmed("()");
+                    writer.WriteTrimmed(OperatorConverter.OperatorToString(expression.Operator - 1));
+                    GenerateExpression(generator, symbol, expression.RightOperand);
+                    writer.Write(")");
+
+                    return;
+                }
+            }
+            else if ((expression.Operator == Operator.Is) ||
+                     (expression.Operator == Operator.As)) {
+                TypeExpression typeExpression = expression.RightOperand as TypeExpression;
+                Debug.Assert(typeExpression != null);
+
+                writer.Write("Type.");
+                if (expression.Operator == Operator.Is) {
+                    writer.Write("canCast(");
+                }
+                else {
+                    writer.Write("safeCast(");
+                }
+
+                GenerateExpression(generator, symbol, expression.LeftOperand);
+
+                writer.WriteTrimmed(", ");
+                writer.Write(typeExpression.AssociatedType.FullGeneratedName);
+                writer.Write(")");
+
+                return;
+            }
+            else if ((expression.Operator == Operator.EqualEqualEqual) ||
+                     (expression.Operator == Operator.NotEqualEqual)) {
+                LiteralExpression literalExpression = expression.RightOperand as LiteralExpression;
+                if (literalExpression != null) {
+                    // Optimize generated script to perform loose equality checks for false-y values
+                    // (null, false, 0, empty string)
+
+                    // TODO: This should really be happening at compilation time, rather than generation
+                    //       time. Because this is happening at generation time, we get something like
+                    //       if (!!x) when if(x) would suffice just so we can get
+                    //       foo(!!x) where foo is a method expecting a boolean.
+                    //       Doing this at compilation time would allow handling if scenarios specially.
+
+                    bool optimizable = false;
+                    bool checkForFalse = false;
+
+                    if (literalExpression.Value is bool) {
+                        optimizable = true;
+
+                        bool compareValue = (bool)literalExpression.Value;
+                        if ((compareValue && (expression.Operator == Operator.NotEqualEqual)) ||
+                            (!compareValue && (expression.Operator == Operator.EqualEqualEqual))) {
+                            checkForFalse = true;
+                        }
+                    }
+                    else if ((literalExpression.Value is int) && (((int)literalExpression.Value) == 0)) {
+                        optimizable = true;
+                        checkForFalse = (expression.Operator == Operator.EqualEqualEqual);
+                    }
+                    else if ((literalExpression.Value is string) && ((string)literalExpression.Value == String.Empty)) {
+                        optimizable = true;
+                        checkForFalse = (expression.Operator == Operator.EqualEqualEqual);
+                    }
+
+                    if (optimizable) {
+                        bool parenthesize = false;
+                        
+                        writer.Write(checkForFalse ? "!" : "!!");
+                        if ((expression.LeftOperand.Parenthesized == false) &&
+                            ((expression.LeftOperand.Type == ExpressionType.Binary) ||
+                                (expression.LeftOperand.Type == ExpressionType.Conditional) ||
+                                (expression.LeftOperand.Type == ExpressionType.InlineScript))) {
+                            parenthesize = true;
+                            writer.Write("(");
+                        }
+                        GenerateExpression(generator, symbol, expression.LeftOperand);
+                        if (parenthesize) {
+                            writer.Write(")");
+                        }
+                        return;
+                    }
+                }
+            }
+
+            GenerateExpression(generator, symbol, expression.LeftOperand);
+            writer.WriteTrimmed(OperatorConverter.OperatorToString(expression.Operator));
+            GenerateExpression(generator, symbol, expression.RightOperand);
+        }
+
+        private static void GenerateConditionalExpression(ScriptGenerator generator, MemberSymbol symbol, ConditionalExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            if (expression.Condition.Parenthesized == false) {
+                writer.Write("(");
+            }
+            ExpressionGenerator.GenerateExpression(generator, symbol, expression.Condition);
+            if (expression.Condition.Parenthesized == false) {
+                writer.Write(")");
+            }
+            writer.WriteTrimmed(" ? ");
+            ExpressionGenerator.GenerateExpression(generator, symbol, expression.TrueValue);
+            writer.WriteTrimmed(" : ");
+            ExpressionGenerator.GenerateExpression(generator, symbol, expression.FalseValue);
+        }
+
+        private static void GenerateDelegateExpression(ScriptGenerator generator, MemberSymbol symbol, DelegateExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            bool createDelegate = false;
+
+            if ((expression.Method.Visibility & MemberVisibility.Static) == 0) {
+                createDelegate = true;
+
+                writer.Write("ss.Delegate.create(");
+                ExpressionGenerator.GenerateExpression(generator, symbol, expression.ObjectReference);
+                writer.WriteTrimmed(", ");
+            }
+
+            AnonymousMethodSymbol anonymousMethod = expression.Method as AnonymousMethodSymbol;
+            if (anonymousMethod == null) {
+                // TODO: This probably needs to handle global method roots...
+
+                if (expression.Method.IsGlobalMethod == false) {
+                    ExpressionGenerator.GenerateExpression(generator, symbol, expression.ObjectReference);
+                    writer.Write(".");
+                }
+                writer.Write(expression.Method.GeneratedName);
+            }
+            else {
+                writer.Write("function(");
+                if ((anonymousMethod.Parameters != null) && (anonymousMethod.Parameters.Count != 0)) {
+                    bool obfuscateParams = generator.Options.Minimize;
+                    string obfuscationPrefix = null;
+
+                    int paramIndex = 0;
+                    foreach (ParameterSymbol parameterSymbol in anonymousMethod.Parameters) {
+                        if (paramIndex > 0) {
+                            writer.WriteTrimmed(", ");
+                        }
+                        if (obfuscateParams) {
+                            if (paramIndex == 0) {
+                                obfuscationPrefix = "$p" + anonymousMethod.Depth.ToString(CultureInfo.InvariantCulture) + "_";
+                            }
+                            parameterSymbol.SetTransformedName(obfuscationPrefix + paramIndex);
+                        }
+                        writer.Write(parameterSymbol.GeneratedName);
+
+                        paramIndex++;
+                    }
+                }
+                writer.Write(")");
+                writer.WriteTrimmed(" {");
+                writer.WriteLine();
+                writer.Indent++;
+                CodeGenerator.GenerateScript(generator, anonymousMethod);
+                writer.Indent--;
+                writer.Write("}");
+            }
+
+            if (createDelegate) {
+                writer.Write(")");
+            }
+        }
+
+        private static void GenerateEnumerationFieldExpression(ScriptGenerator generator, MemberSymbol symbol, EnumerationFieldExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            ExpressionGenerator.GenerateExpression(generator, symbol, expression.ObjectReference);
+            writer.Write(".");
+            writer.Write(expression.Field.GeneratedName);
+        }
+
+        private static void GenerateEventExpression(ScriptGenerator generator, MemberSymbol symbol, EventExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            ExpressionGenerator.GenerateExpression(generator, symbol, expression.ObjectReference);
+            if (expression.Type == ExpressionType.EventAdd) {
+                writer.Write(".add_");
+            }
+            else {
+                writer.Write(".remove_");
+            }
+            writer.Write(expression.Event.GeneratedName);
+            writer.Write("(");
+            ExpressionGenerator.GenerateExpression(generator, symbol, expression.Handler);
+            writer.Write(")");
+        }
+
+        public static void GenerateExpression(ScriptGenerator generator, MemberSymbol symbol, Expression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            if (expression.Parenthesized) {
+                writer.Write("(");
+            }
+
+            switch (expression.Type) {
+                case ExpressionType.Literal:
+                    GenerateLiteralExpression(generator, symbol, (LiteralExpression)expression);
+                    break;
+                case ExpressionType.Local:
+                    GenerateLocalExpression(generator, symbol, (LocalExpression)expression);
+                    break;
+                case ExpressionType.Member:
+                    Debug.Fail("MemberExpression missed from conversion to higher level expression.");
+                    break;
+                case ExpressionType.Field:
+                    GenerateFieldExpression(generator, symbol, (FieldExpression)expression);
+                    break;
+                case ExpressionType.EnumerationField:
+                    GenerateEnumerationFieldExpression(generator, symbol, (EnumerationFieldExpression)expression);
+                    break;
+                case ExpressionType.PropertyGet:
+                    GeneratePropertyExpression(generator, symbol, (PropertyExpression)expression);
+                    break;
+                case ExpressionType.PropertySet:
+                    Debug.Fail("PropertyExpression(set) should be covered as part of BinaryExpression logic.");
+                    break;
+                case ExpressionType.MethodInvoke:
+                case ExpressionType.DelegateInvoke:
+                    GenerateMethodExpression(generator, symbol, (MethodExpression)expression);
+                    break;
+                case ExpressionType.BaseInitializer:
+                    GenerateBaseInitializerExpression(generator, symbol, (BaseInitializerExpression)expression);
+                    break;
+                case ExpressionType.EventAdd:
+                case ExpressionType.EventRemove:
+                    GenerateEventExpression(generator, symbol, (EventExpression)expression);
+                    break;
+                case ExpressionType.Indexer:
+                    GenerateIndexerExpression(generator, symbol, (IndexerExpression)expression);
+                    break;
+                case ExpressionType.This:
+                    GenerateThisExpression(generator, symbol, (ThisExpression)expression);
+                    break;
+                case ExpressionType.Base:
+                    Debug.Fail("BaseExpression not handled by container expression.");
+                    break;
+                case ExpressionType.New:
+                    GenerateNewExpression(generator, symbol, (NewExpression)expression);
+                    break;
+                case ExpressionType.Unary:
+                    GenerateUnaryExpression(generator, symbol, (UnaryExpression)expression);
+                    break;
+                case ExpressionType.Binary:
+                    GenerateBinaryExpression(generator, symbol, (BinaryExpression)expression);
+                    break;
+                case ExpressionType.Conditional:
+                    GenerateConditionalExpression(generator, symbol, (ConditionalExpression)expression);
+                    break;
+                case ExpressionType.Type:
+                    GenerateTypeExpression(generator, symbol, (TypeExpression)expression);
+                    break;
+                case ExpressionType.Delegate:
+                    GenerateDelegateExpression(generator, symbol, (DelegateExpression)expression);
+                    break;
+                case ExpressionType.LateBound:
+                    GenerateLateBoundExpression(generator, symbol, (LateBoundExpression)expression);
+                    break;
+                case ExpressionType.InlineScript:
+                    GenerateInlineScriptExpression(generator, symbol, (InlineScriptExpression)expression);
+                    break;
+                default:
+                    Debug.Fail("Unexpected expression type: " + expression.Type);
+                    break;
+            }
+
+            if (expression.Parenthesized) {
+                writer.Write(")");
+            }
+        }
+
+        public static void GenerateExpressionList(ScriptGenerator generator, MemberSymbol symbol, ICollection<Expression> expressions) {
+            ScriptTextWriter writer = generator.Writer;
+
+            bool firstExpression = true;
+            foreach (Expression expression in expressions) {
+                if (firstExpression == false) {
+                    writer.WriteTrimmed(", ");
+                }
+                GenerateExpression(generator, symbol, expression);
+                firstExpression = false;
+            }
+        }
+
+        private static void GenerateExpressionListAsNameValuePairs(ScriptGenerator generator, MemberSymbol symbol, ICollection<Expression> expressions) {
+            Debug.Assert(expressions.Count % 2 == 0);
+
+            ScriptTextWriter writer = generator.Writer;
+
+            bool firstExpression = true;
+            bool valueExpression = false;
+
+            foreach (Expression expression in expressions) {
+                if ((firstExpression == false) && (valueExpression == false)) {
+                    writer.WriteTrimmed(", ");
+                }
+
+                if (valueExpression) {
+                    writer.WriteTrimmed(": ");
+                    GenerateExpression(generator, symbol, expression);
+
+                    valueExpression = false;
+                }
+                else {
+                    Debug.Assert(expression.Type == ExpressionType.Literal);
+                    Debug.Assert(((LiteralExpression)expression).Value is string);
+
+                    string name = (string)((LiteralExpression)expression).Value;
+
+                    if (Utility.IsValidIdentifier(name)) {
+                        writer.Write(name);
+                    }
+                    else {
+                        writer.Write(Utility.QuoteString(name));
+                    }
+
+                    valueExpression = true;
+                }
+
+                firstExpression = false;
+            }
+        }
+
+        private static void GenerateFieldExpression(ScriptGenerator generator, MemberSymbol symbol, FieldExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            if (expression.Field.IsGlobalField) {
+                writer.Write(expression.Field.GeneratedName);
+            }
+            else {
+                ExpressionGenerator.GenerateExpression(generator, symbol, expression.ObjectReference);
+                writer.Write(".");
+                writer.Write(expression.Field.GeneratedName);
+            }
+        }
+
+        private static void GenerateIndexerExpression(ScriptGenerator generator, MemberSymbol symbol, IndexerExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            if (expression.Indexer.IsIntrinsic) {
+                GenerateExpression(generator, symbol, expression.ObjectReference);
+                writer.Write("[");
+                GenerateExpressionList(generator, symbol, expression.Indices);
+                writer.Write("]");
+            }
+            else if (expression.ObjectReference is BaseExpression) {
+                Debug.Assert(symbol.Parent is ClassSymbol);
+
+                writer.Write(((ClassSymbol)symbol.Parent).FullGeneratedName);
+                writer.Write(".callBaseMethod(this, 'get_");
+                writer.Write(expression.Indexer.GeneratedName);
+                writer.Write("',");
+                writer.WriteTrimmed(" [ ");
+                GenerateExpressionList(generator, symbol, expression.Indices);
+                writer.WriteTrimmed(" ])");
+            }
+            else {
+                GenerateExpression(generator, expression.Indexer, expression.ObjectReference);
+                writer.Write(".get_");
+                writer.Write(expression.Indexer.GeneratedName);
+                writer.Write("(");
+                GenerateExpressionList(generator, expression.Indexer, expression.Indices);
+                writer.Write(")");
+            }
+        }
+
+        private static void GenerateInlineScriptExpression(ScriptGenerator generator, MemberSymbol symbol, InlineScriptExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            string script = expression.Script;
+            ICollection<Expression> parameters = expression.Parameters;
+
+            if (parameters != null) {
+                Debug.Assert(parameters.Count != 0);
+
+                string[] parameterScripts = new string[parameters.Count];
+                int i = 0;
+
+                foreach (Expression parameterExpression in parameters) {
+                    StringWriter sw = new StringWriter();
+
+                    try {
+                        writer.StartLocalWriting(sw);
+                        ExpressionGenerator.GenerateExpression(generator, symbol, parameterExpression);
+
+                        parameterScripts[i] = sw.ToString();
+                        i++;
+                    }
+                    finally {
+                        writer.StopLocalWriting();
+                    }
+                }
+
+                script = String.Format(script, parameterScripts);
+            }
+
+            writer.Write(script);
+        }
+
+        private static void GenerateLateBoundExpression(ScriptGenerator generator, MemberSymbol symbol, LateBoundExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+            string name = null;
+
+            LiteralExpression literalNameExpression = expression.NameExpression as LiteralExpression;
+            if (literalNameExpression != null) {
+                Debug.Assert(literalNameExpression.Value is string);
+
+                name = (string)literalNameExpression.Value;
+                Debug.Assert(String.IsNullOrEmpty(name) == false);
+            }
+
+            if (expression.Operation == LateBoundOperation.DeleteField) {
+                writer.Write("delete ");
+            }
+
+            if (expression.Operation == LateBoundOperation.GetScriptType) {
+                writer.Write("typeof(");
+            }
+            else if (expression.Operation == LateBoundOperation.HasMethod) {
+                writer.Write("(typeof(");
+            }
+            else if (expression.Operation == LateBoundOperation.HasField) {
+                writer.Write("(");
+                GenerateExpression(generator, symbol, expression.NameExpression);
+                writer.Write(" in ");
+            }
+
+            if (expression.ObjectReference != null) {
+                GenerateExpression(generator, symbol, expression.ObjectReference);
+            }
+
+            switch (expression.Operation) {
+                case LateBoundOperation.InvokeMethod:
+                    if (Utility.IsValidIdentifier(name)) {
+                        if (expression.ObjectReference != null) {
+                            writer.Write(".");
+                        }
+                        writer.Write(name);
+                    }
+                    else {
+                        writer.Write("[");
+                        GenerateExpression(generator, symbol, expression.NameExpression);
+                        writer.Write("]");
+                    }
+
+                    writer.Write("(");
+                    if (expression.Parameters.Count != 0) {
+                        GenerateExpressionList(generator, symbol, expression.Parameters);
+                    }
+                    writer.Write(")");
+
+                    break;
+                case LateBoundOperation.GetField:
+                    if (Utility.IsValidIdentifier(name)) {
+                        writer.Write(".");
+                        writer.Write(name);
+                    }
+                    else {
+                        writer.Write("[");
+                        GenerateExpression(generator, symbol, expression.NameExpression);
+                        writer.Write("]");
+                    }
+                    break;
+                case LateBoundOperation.SetField:
+                    if (Utility.IsValidIdentifier(name)) {
+                        writer.Write(".");
+                        writer.Write(name);
+                    }
+                    else {
+                        writer.Write("[");
+                        GenerateExpression(generator, symbol, expression.NameExpression);
+                        writer.Write("]");
+                    }
+
+                    writer.WriteTrimmed(" = ");
+                    GenerateExpressionList(generator, symbol, expression.Parameters);
+                    break;
+                case LateBoundOperation.DeleteField:
+                    if (Utility.IsValidIdentifier(name)) {
+                        writer.Write(".");
+                        writer.Write(name);
+                    }
+                    else {
+                        writer.Write("[");
+                        GenerateExpression(generator, symbol, expression.NameExpression);
+                        writer.Write("]");
+                    }
+                    break;
+                case LateBoundOperation.GetScriptType:
+                    writer.Write(")");
+                    break;
+                case LateBoundOperation.HasField:
+                    writer.Write(")");
+                    break;
+                case LateBoundOperation.HasMethod:
+                    if (Utility.IsValidIdentifier(name)) {
+                        if (expression.ObjectReference != null) {
+                            writer.Write(".");
+                        }
+                        writer.Write(name);
+                    }
+                    else {
+                        writer.Write("[");
+                        GenerateExpression(generator, symbol, expression.NameExpression);
+                        writer.Write("]");
+                    }
+
+                    writer.Write(")");
+                    writer.WriteTrimmed(" === ");
+                    writer.Write("'function'");
+                    writer.Write(")");
+                    break;
+            }
+        }
+
+        private static void GenerateLiteralExpression(ScriptGenerator generator, MemberSymbol symbol, LiteralExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            object value = expression.Value;
+            string textValue = null;
+
+            if (value == null) {
+                textValue = "null";
+            }
+            else {
+                if (value is bool) {
+                    if ((bool)value) {
+                        textValue = "true";
+                    }
+                    else {
+                        textValue = "false";
+                    }
+                }
+                else if ((value is char) || (value is string)) {
+                    textValue = Utility.QuoteString(value.ToString());
+                }
+                else if (value is TypeSymbol) {
+                    textValue = ((TypeSymbol)value).FullGeneratedName;
+                }
+                else if (value is Expression[]) {
+                    Expression[] values = (Expression[])value;
+                    if (values.Length == 0) {
+                        textValue = "[]";
+                    }
+                    else {
+                        writer.WriteTrimmed("[ ");
+                        GenerateExpressionList(generator, symbol, (Expression[])value);
+                        writer.WriteTrimmed(" ]");
+                    }
+                }
+                else {
+                    textValue = Convert.ToString(value, CultureInfo.InvariantCulture);
+                }
+            }
+
+            if (textValue != null) {
+                writer.Write(textValue);
+            }
+        }
+
+        private static void GenerateLocalExpression(ScriptGenerator generator, MemberSymbol symbol, LocalExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+            writer.Write(expression.Symbol.GeneratedName);
+        }
+
+        private static void GenerateMethodExpression(ScriptGenerator generator, MemberSymbol symbol, MethodExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            if (expression.Method.SkipGeneration) {
+                // If this method is to be skipped from generation, just generate the
+                // left-hand-side object reference, and skip everything past it, including
+                // the dot.
+
+                GenerateExpression(generator, symbol, expression.ObjectReference);
+                return;
+            }
+
+            if (expression.ObjectReference is BaseExpression) {
+                Debug.Assert(symbol.Parent is ClassSymbol);
+                Debug.Assert(expression.Method.IsGlobalMethod == false);
+
+                writer.Write(((ClassSymbol)symbol.Parent).FullGeneratedName);
+                writer.Write(".callBaseMethod(this, '");
+                writer.Write(expression.Method.GeneratedName);
+                writer.Write("'");
+                if ((expression.Parameters != null) && (expression.Parameters.Count != 0)) {
+                    writer.Write(",");
+                    writer.WriteTrimmed(" [ ");
+                    GenerateExpressionList(generator, symbol, expression.Parameters);
+                    writer.WriteTrimmed(" ]");
+                }
+                writer.Write(")");
+            }
+            else {
+                if (expression.Method.IsGlobalMethod) {
+                    if (expression.Method.Parent is ClassSymbol) {
+                        string mixinRoot = ((ClassSymbol)expression.Method.Parent).MixinRoot;
+                        if (String.IsNullOrEmpty(mixinRoot) == false) {
+                            writer.Write(mixinRoot);
+                            writer.Write(".");
+                        }
+                    }
+                }
+                else {
+                    GenerateExpression(generator, symbol, expression.ObjectReference);
+                    if (expression.Method.GeneratedName.Length != 0) {
+                        writer.Write(".");
+                    }
+                }
+
+                if (expression.Method.GeneratedName.Length != 0) {
+                    writer.Write(expression.Method.GeneratedName);
+                }
+                writer.Write("(");
+                if (expression.Parameters != null) {
+                    GenerateExpressionList(generator, symbol, expression.Parameters);
+                }
+                writer.Write(")");
+            }
+        }
+
+        private static void GenerateNewExpression(ScriptGenerator generator, MemberSymbol symbol, NewExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            if (expression.IsSpecificType) {
+                string type = expression.AssociatedType.FullGeneratedName;
+                if (type.Equals("Array")) {
+                    if (expression.Parameters == null) {
+                        writer.Write("[]");
+                    }
+                    else if ((expression.Parameters.Count == 1) &&
+                             (expression.Parameters[0].EvaluatedType == symbol.SymbolSet.ResolveIntrinsicType(IntrinsicType.Integer))) {
+                        writer.Write("new Array(");
+                        GenerateExpression(generator, symbol, expression.Parameters[0]);
+                        writer.Write(")");
+                    }
+                    else {
+                        writer.Write("[");
+                        GenerateExpressionList(generator, symbol, expression.Parameters);
+                        writer.Write("]");
+                    }
+                    return;
+                }
+                else if (type.Equals("Object")) {
+                    if (expression.Parameters == null) {
+                        writer.Write("{}");
+                    }
+                    else {
+                        writer.WriteTrimmed("{ ");
+                        GenerateExpressionListAsNameValuePairs(generator, symbol, expression.Parameters);
+                        writer.WriteTrimmed(" }");
+                    }
+                    return;
+                }
+                else if (expression.AssociatedType.Type == SymbolType.Record) {
+                    if (expression.AssociatedType.IgnoreNamespace == false) {
+                        writer.Write(expression.AssociatedType.GeneratedNamespace);
+                        writer.Write(".");
+                    }
+                    writer.Write("$create_");
+                    writer.Write(expression.AssociatedType.GeneratedName);
+                    writer.Write("(");
+                    if (expression.Parameters != null) {
+                        GenerateExpressionList(generator, symbol, expression.Parameters);
+                    }
+                    writer.Write(")");
+
+                    return;
+                }
+            }
+
+            writer.Write("new ");
+            if (expression.IsSpecificType) {
+                writer.Write(expression.AssociatedType.FullGeneratedName);
+            }
+            else {
+                GenerateExpression(generator, symbol, expression.TypeExpression);
+            }
+            writer.Write("(");
+            if (expression.Parameters != null) {
+                GenerateExpressionList(generator, symbol, expression.Parameters);
+            }
+            writer.Write(")");
+        }
+
+        private static void GeneratePropertyExpression(ScriptGenerator generator, MemberSymbol symbol, PropertyExpression expression) {
+            Debug.Assert(expression.Type == ExpressionType.PropertyGet);
+            ScriptTextWriter writer = generator.Writer;
+
+            if (expression.ObjectReference is BaseExpression) {
+                Debug.Assert(symbol.Parent is ClassSymbol);
+
+                writer.Write(((ClassSymbol)symbol.Parent).FullGeneratedName);
+                writer.Write(".callBaseMethod(this, 'get_");
+                writer.Write(expression.Property.GeneratedName);
+                writer.Write("')");
+            }
+            else {
+                ExpressionGenerator.GenerateExpression(generator, symbol, expression.ObjectReference);
+                writer.Write(".get_");
+                writer.Write(expression.Property.GeneratedName);
+                writer.Write("()");
+            }
+        }
+
+        private static void GenerateThisExpression(ScriptGenerator generator, MemberSymbol symbol, ThisExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+            writer.Write("this");
+        }
+
+        private static void GenerateTypeExpression(ScriptGenerator generator, MemberSymbol symbol, TypeExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+            writer.Write(expression.AssociatedType.FullGeneratedName);
+        }
+
+        private static void GenerateUnaryExpression(ScriptGenerator generator, MemberSymbol symbol, UnaryExpression expression) {
+            ScriptTextWriter writer = generator.Writer;
+
+            PropertyExpression propExpression = expression.Operand as PropertyExpression;
+            if ((propExpression != null) &&
+                ((expression.Operator == Operator.PreIncrement) || (expression.Operator == Operator.PostIncrement) ||
+                 (expression.Operator == Operator.PreDecrement) || (expression.Operator == Operator.PostDecrement))) {
+                Debug.Assert(propExpression.Type == ExpressionType.PropertyGet);
+
+                string fudgeOperator;
+
+                GenerateExpression(generator, symbol, propExpression.ObjectReference);
+                writer.Write(".set_");
+                writer.Write(propExpression.Property.GeneratedName);
+                writer.Write("(");
+                GenerateExpression(generator, symbol, propExpression.ObjectReference);
+                writer.Write(".get_");
+                writer.Write(propExpression.Property.GeneratedName);
+                writer.Write("()");
+                if ((expression.Operator == Operator.PreIncrement) || (expression.Operator == Operator.PostIncrement)) {
+                    writer.WriteTrimmed(" + ");
+                    fudgeOperator = " - ";
+                }
+                else {
+                    writer.WriteTrimmed(" - ");
+                    fudgeOperator = " + ";
+                }
+                writer.Write("1");
+                writer.Write(")");
+
+                if ((expression.Operator == Operator.PreIncrement) || (expression.Operator == Operator.PreDecrement)) {
+                    writer.WriteTrimmed(fudgeOperator);
+                    writer.Write("1");
+                }
+
+                return;
+            }
+
+            if ((expression.Operator == Operator.PreIncrement) ||
+                (expression.Operator == Operator.PreDecrement)) {
+                ExpressionGenerator.GenerateExpression(generator, symbol, expression.Operand);
+                writer.Write(OperatorConverter.OperatorToString(expression.Operator));
+            }
+            else {
+                writer.Write(OperatorConverter.OperatorToString(expression.Operator));
+                ExpressionGenerator.GenerateExpression(generator, symbol, expression.Operand);
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Generator/MemberGenerator.cs b/src/Core/Compiler/Generator/MemberGenerator.cs
new file mode 100644
index 000000000..a9181fb7c
--- /dev/null
+++ b/src/Core/Compiler/Generator/MemberGenerator.cs
@@ -0,0 +1,513 @@
+// MemberGenerator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using ScriptSharp;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Generator {
+
+    internal static class MemberGenerator {
+
+        private static void GenerateEvent(ScriptGenerator generator, string typeName, EventSymbol eventSymbol) {
+            ScriptTextWriter writer = generator.Writer;
+
+            ParameterSymbol valueParameter = eventSymbol.Parameters[0];
+            if (generator.Options.Minimize) {
+                bool obfuscateParams = !eventSymbol.IsPublic;
+                if (obfuscateParams) {
+                    valueParameter.SetTransformedName("$p0");
+                }
+            }
+
+            string eventName = eventSymbol.GeneratedName;
+            string fieldName = eventName;
+            if (eventSymbol.DefaultImplementation) {
+                fieldName = "__" + Utility.CreateCamelCaseName(eventSymbol.Name);
+
+                Debug.Assert(eventSymbol.Parent.Type == SymbolType.Class);
+
+                Symbol fieldSymbol = ((ClassSymbol)eventSymbol.Parent).GetMember(fieldName);
+                Debug.Assert((fieldSymbol != null) && (fieldSymbol.Type == SymbolType.Field));
+
+                fieldName = fieldSymbol.GeneratedName;
+            }
+
+            string fieldReference;
+            if ((eventSymbol.Visibility & MemberVisibility.Static) == 0) {
+                fieldReference = "this.";
+            }
+            else {
+                fieldReference = typeName + ".";
+            }
+            fieldReference += fieldName;
+
+            bool instanceMember = true;
+            if ((eventSymbol.Visibility & MemberVisibility.Static) != 0) {
+                instanceMember = false;
+                writer.Write(typeName);
+                writer.Write(".");
+            }
+
+            writer.Write("add_");
+            writer.Write(eventName);
+            if (instanceMember) {
+                writer.WriteTrimmed(": ");
+            }
+            else {
+                writer.WriteTrimmed(" = ");
+            }
+            writer.Write("function");
+            if (generator.Options.DebugFlavor) {
+                writer.Write(" ");
+                writer.Write(typeName.Replace(".", "_"));
+                writer.Write("$add_");
+                writer.Write(eventName);
+            }
+            writer.Write("(");
+            writer.Write(valueParameter.GeneratedName);
+            writer.Write(")");
+            writer.WriteTrimmed(" {");
+            writer.WriteNewLine();
+            writer.Indent++;
+
+            if (generator.Options.EnableDocComments) {
+                DocCommentGenerator.GenerateComment(generator, eventSymbol);
+            }
+
+            if (eventSymbol.DefaultImplementation) {
+                writer.Write(fieldReference);
+                writer.WriteTrimmed(" = ");
+                writer.Write("ss.Delegate.combine(");
+                writer.Write(fieldReference);
+                writer.WriteTrimmed(", ");
+                writer.Write(valueParameter.GeneratedName);
+                writer.Write(");");
+                writer.WriteNewLine();
+            }
+            else {
+                CodeGenerator.GenerateScript(generator, eventSymbol, /* add */ true);
+            }
+            writer.Indent--;
+            writer.Write("}");
+
+            if (instanceMember == false) {
+                writer.WriteSignificantNewLine();
+            }
+
+            if (instanceMember) {
+                writer.Write(",");
+                writer.WriteNewLine();
+            }
+            else {
+                writer.Write(typeName);
+                writer.Write(".");
+            }
+            writer.Write("remove_");
+            writer.Write(eventName);
+            if (instanceMember) {
+                writer.WriteTrimmed(": ");
+            }
+            else {
+                writer.WriteTrimmed(" = ");
+            }
+            writer.Write("function");
+            if (generator.Options.DebugFlavor) {
+                writer.Write(" ");
+                writer.Write(typeName.Replace(".", "_"));
+                writer.Write("$remove_");
+                writer.Write(eventName);
+            }
+            writer.Write("(");
+            writer.Write(valueParameter.GeneratedName);
+            writer.Write(")");
+            writer.WriteTrimmed(" {");
+            writer.WriteNewLine();
+            writer.Indent++;
+
+            if (generator.Options.EnableDocComments) {
+                DocCommentGenerator.GenerateComment(generator, eventSymbol);
+            }
+
+            if (eventSymbol.DefaultImplementation) {
+                writer.Write(fieldReference);
+                writer.WriteTrimmed(" = ");
+                writer.Write("ss.Delegate.remove(");
+                writer.Write(fieldReference);
+                writer.WriteTrimmed(", ");
+                writer.Write(valueParameter.GeneratedName);
+                writer.Write(");");
+                writer.WriteNewLine();
+            }
+            else {
+                CodeGenerator.GenerateScript(generator, eventSymbol, /* add */ false);
+            }
+            writer.Indent--;
+            writer.Write("}");
+
+            if (instanceMember == false) {
+                writer.WriteSignificantNewLine();
+            }
+        }
+
+        private static void GenerateField(ScriptGenerator generator, string typeName, FieldSymbol fieldSymbol) {
+            ScriptTextWriter writer = generator.Writer;
+
+            bool instanceMember = true;
+            if ((fieldSymbol.Visibility & MemberVisibility.Static) != 0) {
+                instanceMember = false;
+                writer.Write(typeName);
+                writer.Write(".");
+            }
+
+            writer.Write(fieldSymbol.GeneratedName);
+            if (instanceMember) {
+                writer.WriteTrimmed(": ");
+            }
+            else {
+                writer.WriteTrimmed(" = ");
+            }
+            CodeGenerator.GenerateScript(generator, fieldSymbol);
+
+            if (instanceMember == false) {
+                writer.Write(";");
+                writer.WriteNewLine();
+            }
+        }
+
+        private static void GenerateIndexer(ScriptGenerator generator, string typeName, PropertySymbol indexerSymbol) {
+            if (indexerSymbol.IsAbstract) {
+                return;
+            }
+
+            ScriptTextWriter writer = generator.Writer;
+
+            bool instanceMember = true;
+            if ((indexerSymbol.Visibility & MemberVisibility.Static) != 0) {
+                instanceMember = false;
+                writer.Write(typeName);
+                writer.Write(".");
+            }
+
+            bool obfuscateParams = !indexerSymbol.IsPublic;
+            if (obfuscateParams && generator.Options.Minimize) {
+                for (int i = 0; i < indexerSymbol.Parameters.Count; i++) {
+                    ParameterSymbol parameterSymbol = indexerSymbol.Parameters[i];
+                    parameterSymbol.SetTransformedName("$p" + i);
+                }
+            }
+
+            writer.Write("get_");
+            writer.Write(indexerSymbol.GeneratedName);
+            if (instanceMember) {
+                writer.WriteTrimmed(": ");
+            }
+            else {
+                writer.WriteTrimmed(" = ");
+            }
+
+            writer.Write("function");
+            if (generator.Options.DebugFlavor) {
+                writer.Write(" ");
+                writer.Write(typeName.Replace(".", "_"));
+                writer.Write("$get_");
+                writer.Write(indexerSymbol.GeneratedName);
+            }
+
+            writer.Write("(");
+
+            for (int i = 0; i < indexerSymbol.Parameters.Count - 1; i++) {
+                ParameterSymbol parameterSymbol = indexerSymbol.Parameters[i];
+                if (i > 0) {
+                    writer.WriteTrimmed(", ");
+                }
+                writer.Write(parameterSymbol.GeneratedName);
+            }
+
+            writer.Write(")");
+            writer.WriteTrimmed(" {");
+            writer.WriteNewLine();
+            writer.Indent++;
+
+            if (generator.Options.EnableDocComments) {
+                DocCommentGenerator.GenerateComment(generator, indexerSymbol);
+            }
+
+            CodeGenerator.GenerateScript(generator, (IndexerSymbol)indexerSymbol, /* getter */ true);
+            writer.Indent--;
+            writer.Write("}");
+
+            if (instanceMember == false) {
+                writer.WriteSignificantNewLine();
+            }
+
+            if (indexerSymbol.IsReadOnly == false) {
+                if (instanceMember) {
+                    writer.Write(",");
+                    writer.WriteNewLine();
+                }
+                else {
+                    writer.Write(typeName);
+                    writer.Write(".");
+                }
+
+                writer.Write("set_");
+                writer.Write(indexerSymbol.GeneratedName);
+                if (instanceMember) {
+                    writer.WriteTrimmed(": ");
+                }
+                else {
+                    writer.WriteTrimmed(" = ");
+                }
+                writer.Write("function");
+                if (generator.Options.DebugFlavor) {
+                    writer.Write(" ");
+                    writer.Write(typeName.Replace(".", "_"));
+                    writer.Write("$set_");
+                    writer.Write(indexerSymbol.GeneratedName);
+                }
+                writer.Write("(");
+                for (int i = 0; i < indexerSymbol.Parameters.Count; i++) {
+                    ParameterSymbol parameterSymbol = indexerSymbol.Parameters[i];
+                    if (i > 0) {
+                        writer.WriteTrimmed(", ");
+                    }
+                    writer.Write(parameterSymbol.GeneratedName);
+                }
+                writer.Write(")");
+                writer.WriteTrimmed(" {");
+                writer.WriteNewLine();
+                writer.Indent++;
+
+                if (generator.Options.EnableDocComments) {
+                    DocCommentGenerator.GenerateComment(generator, indexerSymbol);
+                }
+
+                CodeGenerator.GenerateScript(generator, (IndexerSymbol)indexerSymbol, /* getter */ false);
+                writer.Write("return ");
+                writer.Write(indexerSymbol.Parameters[indexerSymbol.Parameters.Count - 1].GeneratedName);
+                writer.Write(";");
+                writer.WriteNewLine();
+                writer.Indent--;
+                writer.Write("}");
+
+                if (instanceMember == false) {
+                    writer.WriteSignificantNewLine();
+                }
+            }
+        }
+
+        private static void GenerateMethod(ScriptGenerator generator, string typeName, MethodSymbol methodSymbol) {
+            if (methodSymbol.IsAbstract) {
+                return;
+            }
+
+            ScriptTextWriter writer = generator.Writer;
+
+            bool instanceMember = ((methodSymbol.Visibility & MemberVisibility.Static) == 0);
+            if (instanceMember == false) {
+                if (methodSymbol.IsGlobalMethod) {
+                    string mixinRoot = null;
+                    if (methodSymbol.Parent.Type == SymbolType.Class) {
+                        mixinRoot = ((ClassSymbol)methodSymbol.Parent).MixinRoot;
+                    }
+                    if (String.IsNullOrEmpty(mixinRoot)) {
+                        mixinRoot = "window";
+                    }
+
+                    writer.Write(mixinRoot);
+                }
+                else {
+                    writer.Write(typeName);
+                }
+
+                writer.Write(".");
+            }
+
+            writer.Write(methodSymbol.GeneratedName);
+            if (instanceMember) {
+                writer.WriteTrimmed(": ");
+            }
+            else {
+                writer.WriteTrimmed(" = ");
+            }
+
+            writer.Write("function");
+            if (generator.Options.DebugFlavor) {
+                writer.Write(" ");
+                writer.Write(typeName.Replace(".", "_"));
+                writer.Write("$");
+                writer.Write(methodSymbol.GeneratedName);
+            }
+            writer.Write("(");
+            if (methodSymbol.Parameters != null) {
+                bool obfuscateParams = false;
+                if (generator.Options.Minimize) {
+                    obfuscateParams = !methodSymbol.IsPublic;
+                }
+
+                int paramIndex = 0;
+                foreach (ParameterSymbol parameterSymbol in methodSymbol.Parameters) {
+                    if (paramIndex > 0) {
+                        writer.WriteTrimmed(", ");
+                    }
+                    if (obfuscateParams) {
+                        parameterSymbol.SetTransformedName("$p" + paramIndex);
+                    }
+                    writer.Write(parameterSymbol.GeneratedName);
+
+                    paramIndex++;
+                }
+            }
+            writer.WriteTrimmed(") ");
+            writer.Write("{");
+            writer.WriteNewLine();
+            writer.Indent++;
+
+            if (generator.Options.EnableDocComments) {
+                DocCommentGenerator.GenerateComment(generator, methodSymbol);
+            }
+
+            CodeGenerator.GenerateScript(generator, methodSymbol);
+            writer.Indent--;
+            writer.Write("}");
+
+            if (instanceMember == false) {
+                writer.WriteSignificantNewLine();
+            }
+        }
+
+        private static void GenerateProperty(ScriptGenerator generator, string typeName, PropertySymbol propertySymbol) {
+            if (propertySymbol.IsAbstract) {
+                return;
+            }
+
+            ScriptTextWriter writer = generator.Writer;
+
+            bool instanceMember = true;
+            if ((propertySymbol.Visibility & MemberVisibility.Static) != 0) {
+                instanceMember = false;
+                writer.Write(typeName);
+                writer.Write(".");
+            }
+
+            writer.Write("get_");
+            writer.Write(propertySymbol.GeneratedName);
+            if (instanceMember) {
+                writer.WriteTrimmed(": ");
+            }
+            else {
+                writer.WriteTrimmed(" = ");
+            }
+            writer.Write("function");
+            if (generator.Options.DebugFlavor) {
+                writer.Write(" ");
+                writer.Write(typeName.Replace(".", "_"));
+                writer.Write("$get_");
+                writer.Write(propertySymbol.GeneratedName);
+            }
+            writer.Write("()");
+            writer.WriteTrimmed(" {");
+            writer.WriteNewLine();
+            writer.Indent++;
+
+            if (generator.Options.EnableDocComments) {
+                DocCommentGenerator.GenerateComment(generator, propertySymbol);
+            }
+
+            CodeGenerator.GenerateScript(generator, propertySymbol, /* getter */ true);
+            writer.Indent--;
+            writer.Write("}");
+
+            if (instanceMember == false) {
+                writer.WriteSignificantNewLine();
+            }
+
+            if (propertySymbol.IsReadOnly == false) {
+                ParameterSymbol valueParameter = propertySymbol.Parameters[0];
+                if (generator.Options.Minimize) {
+                    bool obfuscateParams = !propertySymbol.IsPublic;
+                    if (obfuscateParams) {
+                        valueParameter.SetTransformedName("$p0");
+                    }
+                }
+
+                if (instanceMember) {
+                    writer.Write(",");
+                    writer.WriteNewLine();
+                }
+                else {
+                    writer.Write(typeName);
+                    writer.Write(".");
+                }
+
+                writer.Write("set_");
+                writer.Write(propertySymbol.GeneratedName);
+                if (instanceMember) {
+                    writer.WriteTrimmed(": ");
+                }
+                else {
+                    writer.WriteTrimmed(" = ");
+                }
+                writer.Write("function");
+                if (generator.Options.DebugFlavor) {
+                    writer.Write(" ");
+                    writer.Write(typeName.Replace(".", "_"));
+                    writer.Write("$set_");
+                    writer.Write(propertySymbol.GeneratedName);
+                }
+                writer.Write("(");
+                writer.Write(valueParameter.GeneratedName);
+                writer.Write(")");
+                writer.WriteTrimmed(" {");
+                writer.WriteNewLine();
+                writer.Indent++;
+
+                if (generator.Options.EnableDocComments) {
+                    DocCommentGenerator.GenerateComment(generator, propertySymbol);
+                }
+
+                CodeGenerator.GenerateScript(generator, propertySymbol, /* getter */ false);
+                writer.Write("return ");
+                writer.Write(valueParameter.GeneratedName);
+                writer.Write(";");
+                writer.WriteNewLine();
+                writer.Indent--;
+                writer.Write("}");
+
+                if (instanceMember == false) {
+                    writer.WriteSignificantNewLine();
+                }
+            }
+        }
+
+        public static void GenerateScript(ScriptGenerator generator, MemberSymbol memberSymbol) {
+            Debug.Assert(memberSymbol.Parent is TypeSymbol);
+            TypeSymbol typeSymbol = (TypeSymbol)memberSymbol.Parent;
+
+            string typeName = typeSymbol.FullGeneratedName;
+
+            switch (memberSymbol.Type) {
+                case SymbolType.Field:
+                    GenerateField(generator, typeName, (FieldSymbol)memberSymbol);
+                    break;
+                case SymbolType.Indexer:
+                    GenerateIndexer(generator, typeName, (IndexerSymbol)memberSymbol);
+                    break;
+                case SymbolType.Property:
+                    GenerateProperty(generator, typeName, (PropertySymbol)memberSymbol);
+                    break;
+                case SymbolType.Method:
+                    GenerateMethod(generator, typeName, (MethodSymbol)memberSymbol);
+                    break;
+                case SymbolType.Event:
+                    GenerateEvent(generator, typeName, (EventSymbol)memberSymbol);
+                    break;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Generator/NamespaceGenerator.cs b/src/Core/Compiler/Generator/NamespaceGenerator.cs
new file mode 100644
index 000000000..b1d09bc89
--- /dev/null
+++ b/src/Core/Compiler/Generator/NamespaceGenerator.cs
@@ -0,0 +1,65 @@
+// NamespaceGenerator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using ScriptSharp;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Generator {
+
+    internal static class NamespaceGenerator {
+
+        public static void GenerateScript(ScriptGenerator generator, NamespaceSymbol namespaceSymbol, Dictionary<string,bool> generatedNamespaces) {
+            Debug.Assert(generator != null);
+            Debug.Assert(namespaceSymbol != null);
+            Debug.Assert(namespaceSymbol.HasApplicationTypes);
+
+            ScriptTextWriter writer = generator.Writer;
+
+            // First generate enums and interfaces which do not have cross-dependencies
+            // (Classes for example, might have dependencies on enums)
+
+            foreach (TypeSymbol type in namespaceSymbol.Types) {
+                if (type.IsApplicationType) {
+                    if (type.IsTestType && (generator.Options.IncludeTests == false)) {
+                        continue;
+                    }
+
+                    string namespaceName = type.GeneratedNamespace;
+                    if ((namespaceName.Length != 0) &&
+                        (generatedNamespaces.ContainsKey(namespaceName) == false)) {
+                        writer.Write("Type.registerNamespace('");
+                        writer.Write(namespaceName);
+                        writer.Write("');");
+                        writer.WriteNewLine();
+                        writer.WriteNewLine();
+                        generatedNamespaces[namespaceName] = true;
+                    }
+                }
+                
+                if (type.IsApplicationType &&
+                    ((type.Type == SymbolType.Enumeration) ||
+                     (type.Type == SymbolType.Interface) ||
+                     (type.Type == SymbolType.Record) ||
+                     (type.Type == SymbolType.Resources))) {
+                    TypeGenerator.GenerateScript(generator, type);
+                }
+            }
+
+            foreach (TypeSymbol type in namespaceSymbol.Types) {
+                if (type.IsApplicationType && (type.Type == SymbolType.Class)) {
+                    if (type.IsTestType && (generator.Options.IncludeTests == false)) {
+                        continue;
+                    }
+
+                    TypeGenerator.GenerateScript(generator, type);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Generator/ScriptGenerator.cs b/src/Core/Compiler/Generator/ScriptGenerator.cs
new file mode 100644
index 000000000..849b55fa8
--- /dev/null
+++ b/src/Core/Compiler/Generator/ScriptGenerator.cs
@@ -0,0 +1,108 @@
+// ScriptGenerator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.IO;
+using ScriptSharp;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Generator {
+
+    internal sealed class ScriptGenerator {
+
+        private ScriptTextWriter _writer;
+        private CompilerOptions _options;
+        private IErrorHandler _errorHandler;
+
+        private List<ClassSymbol> _classes;
+
+        public ScriptGenerator(TextWriter writer, CompilerOptions options, IErrorHandler errorHandler) {
+            Debug.Assert(writer != null);
+            _writer = new ScriptTextWriter(writer, options);
+
+            _options = options;
+            _errorHandler = errorHandler;
+
+            _classes = new List<ClassSymbol>();
+        }
+
+        public IErrorHandler ErrorHandler {
+            get {
+                return _errorHandler;
+            }
+        }
+
+        public CompilerOptions Options {
+            get {
+                return _options;
+            }
+        }
+
+        public ScriptTextWriter Writer {
+            get {
+                return _writer;
+            }
+        }
+
+        public void AddGeneratedClass(ClassSymbol classSymbol) {
+            Debug.Assert(classSymbol != null);
+            _classes.Add(classSymbol);
+        }
+
+        private void GenerateClassRegistration(ClassSymbol classSymbol, List<ClassSymbol> generatedClasses) {
+            Debug.Assert(classSymbol != null);
+
+            if (generatedClasses.Contains(classSymbol)) {
+                return;
+            }
+
+            ClassSymbol baseClass = classSymbol.BaseClass;
+            if ((baseClass != null) && baseClass.IsApplicationType) {
+                GenerateClassRegistration(baseClass, generatedClasses);
+            }
+
+            TypeGenerator.GenerateClassRegistrationScript(this, classSymbol);
+            generatedClasses.Add(classSymbol);
+        }
+
+        public void GenerateScript(SymbolSet symbolSet) {
+            Debug.Assert(symbolSet != null);
+
+            Dictionary<string, bool> generatedNamespaces = new Dictionary<string, bool>();
+            foreach (NamespaceSymbol namespaceSymbol in symbolSet.Namespaces) {
+                if (namespaceSymbol.HasApplicationTypes) {
+                    NamespaceGenerator.GenerateScript(this, namespaceSymbol, generatedNamespaces);
+                }
+            }
+
+            List<ClassSymbol> generatedClasses = new List<ClassSymbol>(_classes.Count);
+            foreach (ClassSymbol generatedClass in _classes) {
+                if (generatedClass.HasGlobalMethods == false) {
+                    GenerateClassRegistration(generatedClass, generatedClasses);
+                }
+            }
+
+            // TODO: Couple of line-breaks would be nice here
+            //       but only if there are any classes with static
+            //       ctors or members
+
+            foreach (ClassSymbol generatedClass in _classes) {
+                TypeGenerator.GenerateClassConstructorScript(this, generatedClass);
+            }
+
+            if (Options.IncludeTests) {
+                foreach (ClassSymbol generatedClass in _classes) {
+                    if (generatedClass.IsTestClass) {
+                        TestGenerator.GenerateScript(this, generatedClass);
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Generator/ScriptTextWriter.cs b/src/Core/Compiler/Generator/ScriptTextWriter.cs
new file mode 100644
index 000000000..4eadfdc66
--- /dev/null
+++ b/src/Core/Compiler/Generator/ScriptTextWriter.cs
@@ -0,0 +1,289 @@
+// IndentedTextWriter.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+namespace ScriptSharp.Generator {
+
+    internal sealed class ScriptTextWriter : TextWriter {
+
+        private TextWriter _writer;
+        private bool _minimize;
+
+        private int _indentLevel;
+        private bool _tabsPending;
+        private string _tabString;
+
+        private TextWriter _globalWriter;
+        private int _globalIndentLevel;
+        private bool _globalTabsPending;
+
+        public ScriptTextWriter(TextWriter writer, CompilerOptions options)
+            : base(CultureInfo.InvariantCulture) {
+            _writer = writer;
+            _globalWriter = writer;
+
+#if DEBUG
+            _minimize = options.Minimize && (options.InternalTestMode == false);
+#else
+            _minimize = options.Minimize;
+#endif
+            if (_minimize) {
+                NewLine = "\n";
+            }
+
+            _tabString = "    ";
+            _indentLevel = 0;
+            _tabsPending = false;
+        }
+
+        public override Encoding Encoding {
+            get {
+                return _writer.Encoding;
+            }
+        }
+
+        public override string NewLine {
+            get {
+                return _writer.NewLine;
+            }
+            set {
+                _writer.NewLine = value;
+            }
+        }
+
+        public int Indent {
+            get {
+                return _indentLevel;
+            }
+            set {
+                Debug.Assert(value >= 0);
+                if (value < 0) {
+                    value = 0;
+                }
+                _indentLevel = value;
+            }
+        }
+
+        public override void Close() {
+            _writer.Close();
+        }
+
+        public override void Flush() {
+            _writer.Flush();
+        }
+
+        private void OutputTabs() {
+            if (_tabsPending) {
+                if (_minimize == false) {
+                    for (int i = 0; i < _indentLevel; i++) {
+                        _writer.Write(_tabString);
+                    }
+                }
+                _tabsPending = false;
+            }
+        }
+
+        public void StartLocalWriting(TextWriter writer) {
+            Debug.Assert(writer != null);
+            Debug.Assert(_writer == _globalWriter);
+            _writer = writer;
+
+            _globalIndentLevel = _indentLevel;
+            _indentLevel = 0;
+
+            _globalTabsPending = _tabsPending;
+            _tabsPending = false;
+        }
+
+        public void StopLocalWriting() {
+            _writer = _globalWriter;
+            _indentLevel = _globalIndentLevel;
+            _tabsPending = _globalTabsPending;
+        }
+
+        public override void Write(string s) {
+            OutputTabs();
+            _writer.Write(s);
+        }
+
+        public override void Write(bool value) {
+            OutputTabs();
+            _writer.Write(value);
+        }
+
+        public override void Write(char value) {
+            OutputTabs();
+            _writer.Write(value);
+        }
+
+        public override void Write(char[] buffer) {
+            OutputTabs();
+            _writer.Write(buffer);
+        }
+
+        public override void Write(char[] buffer, int index, int count) {
+            OutputTabs();
+            _writer.Write(buffer, index, count);
+        }
+
+        public override void Write(double value) {
+            OutputTabs();
+            _writer.Write(value);
+        }
+
+        public override void Write(float value) {
+            OutputTabs();
+            _writer.Write(value);
+        }
+
+        public override void Write(int value) {
+            OutputTabs();
+            _writer.Write(value);
+        }
+
+        public override void Write(long value) {
+            OutputTabs();
+            _writer.Write(value);
+        }
+
+        public override void Write(object value) {
+            OutputTabs();
+            _writer.Write(value);
+        }
+
+        public override void Write(string format, object arg0) {
+            OutputTabs();
+            _writer.Write(format, arg0);
+        }
+
+        public override void Write(string format, object arg0, object arg1) {
+            OutputTabs();
+            _writer.Write(format, arg0, arg1);
+        }
+
+        public override void Write(string format, params object[] arg) {
+            OutputTabs();
+            _writer.Write(format, arg);
+        }
+
+        public void WriteLineNoTabs(string s) {
+            _writer.WriteLine(s);
+        }
+
+        public override void WriteLine(string s) {
+            OutputTabs();
+            _writer.WriteLine(s);
+            _tabsPending = true;
+        }
+
+        public override void WriteLine() {
+            OutputTabs();
+            _writer.WriteLine();
+            _tabsPending = true;
+        }
+
+        public override void WriteLine(bool value) {
+            OutputTabs();
+            _writer.WriteLine(value);
+            _tabsPending = true;
+        }
+
+        public override void WriteLine(char value) {
+            OutputTabs();
+            _writer.WriteLine(value);
+            _tabsPending = true;
+        }
+
+        public override void WriteLine(char[] buffer) {
+            OutputTabs();
+            _writer.WriteLine(buffer);
+            _tabsPending = true;
+        }
+
+        public override void WriteLine(char[] buffer, int index, int count) {
+            OutputTabs();
+            _writer.WriteLine(buffer, index, count);
+            _tabsPending = true;
+        }
+
+        public override void WriteLine(double value) {
+            OutputTabs();
+            _writer.WriteLine(value);
+            _tabsPending = true;
+        }
+
+        public override void WriteLine(float value) {
+            OutputTabs();
+            _writer.WriteLine(value);
+            _tabsPending = true;
+        }
+
+        public override void WriteLine(int value) {
+            OutputTabs();
+            _writer.WriteLine(value);
+            _tabsPending = true;
+        }
+
+        public override void WriteLine(long value) {
+            OutputTabs();
+            _writer.WriteLine(value);
+            _tabsPending = true;
+        }
+
+        public override void WriteLine(object value) {
+            OutputTabs();
+            _writer.WriteLine(value);
+            _tabsPending = true;
+        }
+
+        public override void WriteLine(string format, object arg0) {
+            OutputTabs();
+            _writer.WriteLine(format, arg0);
+            _tabsPending = true;
+        }
+
+        public override void WriteLine(string format, object arg0, object arg1) {
+            OutputTabs();
+            _writer.WriteLine(format, arg0, arg1);
+            _tabsPending = true;
+        }
+
+        public override void WriteLine(string format, params object[] arg) {
+            OutputTabs();
+            _writer.WriteLine(format, arg);
+            _tabsPending = true;
+        }
+
+        public override void WriteLine(UInt32 value) {
+            OutputTabs();
+            _writer.WriteLine(value);
+            _tabsPending = true;
+        }
+
+        public void WriteSignificantNewLine() {
+            WriteLine();
+        }
+
+        public void WriteNewLine() {
+            if (_minimize == false) {
+                WriteLine();
+            }
+        }
+
+        public void WriteTrimmed(string text) {
+            if (_minimize == false) {
+                Write(text);
+            }
+            else {
+                Write(text.Trim());
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Generator/StatementGenerator.cs b/src/Core/Compiler/Generator/StatementGenerator.cs
new file mode 100644
index 000000000..ff5261917
--- /dev/null
+++ b/src/Core/Compiler/Generator/StatementGenerator.cs
@@ -0,0 +1,420 @@
+// StatementGenerator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Generator {
+
+    internal static class StatementGenerator {
+
+        private static void GenerateBlockStatement(ScriptGenerator generator, MemberSymbol symbol, BlockStatement statement) {
+            ScriptTextWriter writer = generator.Writer;
+
+            foreach (Statement s in statement.Statements) {
+                GenerateStatement(generator, symbol, s);
+            }
+        }
+
+        private static void GenerateBreakStatement(ScriptGenerator generator, MemberSymbol symbol, BreakStatement statement) {
+            ScriptTextWriter writer = generator.Writer;
+            writer.Write("break;");
+            writer.WriteNewLine();
+        }
+
+        private static void GenerateContinueStatement(ScriptGenerator generator, MemberSymbol symbol, ContinueStatement statement) {
+            ScriptTextWriter writer = generator.Writer;
+            writer.Write("continue;");
+            writer.WriteNewLine();
+        }
+
+        private static void GenerateErrorStatement(ScriptGenerator generator, MemberSymbol symbol, ErrorStatement statement) {
+            ScriptTextWriter writer = generator.Writer;
+            writer.Write("// ERROR: ");
+            writer.Write(statement.Message);
+            writer.WriteSignificantNewLine();
+            writer.Write("// ERROR: at ");
+            writer.Write(statement.Location);
+            writer.WriteSignificantNewLine();
+        }
+
+        private static void GenerateExpressionStatement(ScriptGenerator generator, MemberSymbol symbol, ExpressionStatement statement) {
+            ScriptTextWriter writer = generator.Writer;
+
+            ExpressionGenerator.GenerateExpression(generator, symbol, statement.Expression);
+            if (statement.IsFragment == false) {
+                writer.Write(";");
+                writer.WriteNewLine();
+            }
+        }
+
+        private static void GenerateForStatement(ScriptGenerator generator, MemberSymbol symbol, ForStatement statement) {
+            if (statement.Body == null) {
+                return;
+            }
+
+            ScriptTextWriter writer = generator.Writer;
+
+            writer.WriteTrimmed("for ");
+            writer.Write("(");
+            if (statement.Initializers != null) {
+                ExpressionGenerator.GenerateExpressionList(generator, symbol, statement.Initializers);
+            }
+            else if (statement.Variables != null) {
+                GenerateVariableDeclarations(generator, symbol, statement.Variables);
+            }
+            writer.WriteTrimmed("; ");
+            if (statement.Condition != null) {
+                ExpressionGenerator.GenerateExpression(generator, symbol, statement.Condition);
+            }
+            writer.WriteTrimmed("; ");
+            if (statement.Increments != null) {
+                ExpressionGenerator.GenerateExpressionList(generator, symbol, statement.Increments);
+            }
+            writer.WriteTrimmed(") ");
+            writer.Write("{");
+            writer.WriteNewLine();
+            writer.Indent++;
+            GenerateStatement(generator, symbol, statement.Body);
+            writer.Indent--;
+            writer.Write("}");
+            writer.WriteNewLine();
+        }
+
+        private static void GenerateForInStatement(ScriptGenerator generator, MemberSymbol symbol, ForInStatement statement) {
+            ScriptTextWriter writer = generator.Writer;
+
+            if (statement.IsDictionaryEnumeration) {
+                writer.Write("var ");
+                writer.Write(statement.DictionaryVariable.GeneratedName);
+                writer.WriteTrimmed(" = ");
+                ExpressionGenerator.GenerateExpression(generator, symbol, statement.CollectionExpression);
+                writer.Write(";");
+                writer.WriteNewLine();
+
+                writer.WriteTrimmed("for ");
+                writer.Write("(var ");
+                writer.Write(statement.LoopVariable.GeneratedName);
+                writer.Write(" in ");
+                writer.Write(statement.DictionaryVariable.GeneratedName);
+                writer.WriteTrimmed(") ");
+                writer.Write("{");
+                writer.WriteNewLine();
+                writer.Indent++;
+                writer.Write("var ");
+                writer.Write(statement.ItemVariable.GeneratedName);
+                writer.WriteTrimmed(" = ");
+                writer.WriteTrimmed("{ ");
+                writer.WriteTrimmed("key: ");
+                writer.Write(statement.LoopVariable.GeneratedName);
+                writer.WriteTrimmed(", ");
+                writer.WriteTrimmed("value: ");
+                writer.Write(statement.DictionaryVariable.GeneratedName);
+                writer.Write("[");
+                writer.Write(statement.LoopVariable.GeneratedName);
+                writer.Write("]");
+                writer.WriteTrimmed(" };");
+                writer.WriteNewLine();
+                GenerateStatement(generator, symbol, statement.Body);
+                writer.Indent--;
+                writer.Write("}");
+                writer.WriteNewLine();
+            }
+            else {
+                writer.Write("var ");
+                writer.Write(statement.LoopVariable.GeneratedName);
+                writer.WriteTrimmed(" = ");
+
+                writer.Write("ss.IEnumerator.getEnumerator(");
+                ExpressionGenerator.GenerateExpression(generator, symbol, statement.CollectionExpression);
+                writer.Write(");");
+
+                writer.WriteNewLine();
+
+                writer.WriteTrimmed("while ");
+                writer.Write("(");
+                writer.Write(statement.LoopVariable.GeneratedName);
+                writer.WriteTrimmed(".moveNext()) ");
+                writer.Write("{");
+                writer.WriteNewLine();
+                writer.Indent++;
+
+                writer.Write("var ");
+                writer.Write(statement.ItemVariable.GeneratedName);
+                writer.WriteTrimmed(" = ");
+                writer.Write(statement.LoopVariable.GeneratedName);
+                writer.Write(".current;");
+                writer.WriteNewLine();
+
+                GenerateStatement(generator, symbol, statement.Body);
+
+                writer.Indent--;
+                writer.Write("}");
+                writer.WriteNewLine();
+            }
+        }
+
+        private static void GenerateIfElseStatement(ScriptGenerator generator, MemberSymbol symbol, IfElseStatement statement) {
+            if ((statement.IfStatement == null) && (statement.ElseStatement == null)) {
+                return;
+            }
+
+            ScriptTextWriter writer = generator.Writer;
+
+            writer.WriteTrimmed("if ");
+            writer.Write("(");
+            ExpressionGenerator.GenerateExpression(generator, symbol, statement.Condition);
+            writer.WriteTrimmed(") ");
+            writer.Write("{");
+            writer.WriteNewLine();
+            if (statement.IfStatement != null) {
+                writer.Indent++;
+                GenerateStatement(generator, symbol, statement.IfStatement);
+                writer.Indent--;
+            }
+            writer.Write("}");
+            writer.WriteNewLine();
+            if (statement.ElseStatement != null) {
+                bool writeEndBlock = false;
+
+                if (statement.ElseStatement is IfElseStatement) {
+                    writer.Write("else ");
+                }
+                else {
+                    writer.WriteTrimmed("else ");
+                    writer.Write("{");
+                    writer.WriteNewLine();
+                    writeEndBlock = true;
+                    writer.Indent++;
+                }
+                GenerateStatement(generator, symbol, statement.ElseStatement);
+                if (writeEndBlock) {
+                    writer.Indent--;
+                    writer.Write("}");
+                    writer.WriteNewLine();
+                }
+            }
+        }
+
+        private static void GenerateReturnStatement(ScriptGenerator generator, MemberSymbol symbol, ReturnStatement statement) {
+            ScriptTextWriter writer = generator.Writer;
+
+            if (statement.Value != null) {
+                writer.Write("return ");
+                ExpressionGenerator.GenerateExpression(generator, symbol, statement.Value);
+                writer.Write(";");
+                writer.WriteNewLine();
+            }
+            else {
+                writer.Write("return;");
+                writer.WriteNewLine();
+            }
+        }
+
+        public static void GenerateStatement(ScriptGenerator generator, MemberSymbol symbol, Statement statement) {
+            switch (statement.Type) {
+                case StatementType.Block:
+                    GenerateBlockStatement(generator, symbol, (BlockStatement)statement);
+                    break;
+                case StatementType.Empty:
+                    break;
+                case StatementType.VariableDeclaration:
+                    GenerateVariableDeclarationStatement(generator, symbol, (VariableDeclarationStatement)statement);
+                    break;
+                case StatementType.Return:
+                    GenerateReturnStatement(generator, symbol, (ReturnStatement)statement);
+                    break;
+                case StatementType.Expression:
+                    GenerateExpressionStatement(generator, symbol, (ExpressionStatement)statement);
+                    break;
+                case StatementType.IfElse:
+                    GenerateIfElseStatement(generator, symbol, (IfElseStatement)statement);
+                    break;
+                case StatementType.While:
+                    GenerateWhileStatement(generator, symbol, (WhileStatement)statement);
+                    break;
+                case StatementType.For:
+                    GenerateForStatement(generator, symbol, (ForStatement)statement);
+                    break;
+                case StatementType.ForIn:
+                    GenerateForInStatement(generator, symbol, (ForInStatement)statement);
+                    break;
+                case StatementType.Switch:
+                    GenerateSwitchStatement(generator, symbol, (SwitchStatement)statement);
+                    break;
+                case StatementType.Break:
+                    GenerateBreakStatement(generator, symbol, (BreakStatement)statement);
+                    break;
+                case StatementType.Continue:
+                    GenerateContinueStatement(generator, symbol, (ContinueStatement)statement);
+                    break;
+                case StatementType.Throw:
+                    GenerateThrowStatement(generator, symbol, (ThrowStatement)statement);
+                    break;
+                case StatementType.TryCatchFinally:
+                    GenerateTryCatchFinallyStatement(generator, symbol, (TryCatchFinallyStatement)statement);
+                    break;
+                case StatementType.Error:
+                    GenerateErrorStatement(generator, symbol, (ErrorStatement)statement);
+                    break;
+                default:
+                    Debug.Fail("Unexpected statement type: " + statement.Type);
+                    break;
+            }
+        }
+
+        private static void GenerateSwitchStatement(ScriptGenerator generator, MemberSymbol symbol, SwitchStatement statement) {
+            ScriptTextWriter writer = generator.Writer;
+
+            writer.WriteTrimmed("switch ");
+            writer.Write("(");
+            ExpressionGenerator.GenerateExpression(generator, symbol, statement.Condition);
+            writer.WriteTrimmed(") ");
+            writer.Write("{");
+            writer.WriteNewLine();
+            writer.Indent++;
+            foreach (SwitchGroup group in statement.Groups) {
+                if (group.Cases != null) {
+                    foreach (Expression caseExpression in group.Cases) {
+                        writer.Write("case ");
+                        ExpressionGenerator.GenerateExpression(generator, symbol, caseExpression);
+                        writer.Write(":");
+                        writer.WriteNewLine();
+                    }
+                }
+
+                if (group.IncludeDefault) {
+                    writer.Write("default:");
+                    writer.WriteNewLine();
+                }
+
+                writer.Indent++;
+                foreach (Statement childStatement in group.Statements) {
+                    GenerateStatement(generator, symbol, childStatement);
+                }
+                writer.Indent--;
+            }
+            writer.Indent--;
+            writer.Write("}");
+            writer.WriteNewLine();
+        }
+
+        private static void GenerateThrowStatement(ScriptGenerator generator, MemberSymbol symbol, ThrowStatement statement) {
+            ScriptTextWriter writer = generator.Writer;
+
+            writer.Write("throw ");
+            ExpressionGenerator.GenerateExpression(generator, symbol, statement.Value);
+            writer.Write(";");
+            writer.WriteNewLine();
+        }
+
+        private static void GenerateTryCatchFinallyStatement(ScriptGenerator generator, MemberSymbol symbol, TryCatchFinallyStatement statement) {
+            ScriptTextWriter writer = generator.Writer;
+
+            writer.WriteTrimmed("try ");
+            writer.Write("{");
+            writer.WriteNewLine();
+            writer.Indent++;
+            GenerateStatement(generator, symbol, statement.Body);
+            writer.Indent--;
+            writer.Write("}");
+            writer.WriteNewLine();
+            if (statement.Catch != null) {
+                writer.WriteTrimmed("catch ");
+                writer.Write("(");
+                writer.Write(statement.ExceptionVariable.GeneratedName);
+                writer.WriteTrimmed(") ");
+                writer.Write("{");
+                writer.WriteNewLine();
+                writer.Indent++;
+                GenerateStatement(generator, symbol, statement.Catch);
+                writer.Indent--;
+                writer.Write("}");
+                writer.WriteNewLine();
+            }
+            if (statement.Finally != null) {
+                writer.WriteTrimmed("finally ");
+                writer.Write("{");
+                writer.WriteNewLine();
+                writer.Indent++;
+                GenerateStatement(generator, symbol, statement.Finally);
+                writer.Indent--;
+                writer.Write("}");
+                writer.WriteNewLine();
+            }
+        }
+
+        private static void GenerateVariableDeclarations(ScriptGenerator generator, MemberSymbol symbol, VariableDeclarationStatement statement) {
+            ScriptTextWriter writer = generator.Writer;
+
+            bool firstVariable = true;
+
+            writer.Write("var ");
+            foreach (VariableSymbol variableSymbol in statement.Variables) {
+                if (firstVariable == false) {
+                    writer.WriteTrimmed(", ");
+                }
+
+                writer.Write(variableSymbol.GeneratedName);
+
+                if (variableSymbol.Value != null) {
+                    writer.WriteTrimmed(" = ");
+                    ExpressionGenerator.GenerateExpression(generator, symbol, variableSymbol.Value);
+                }
+
+                firstVariable = false;
+            }
+        }
+
+        private static void GenerateVariableDeclarationStatement(ScriptGenerator generator, MemberSymbol symbol, VariableDeclarationStatement statement) {
+            ScriptTextWriter writer = generator.Writer;
+
+            GenerateVariableDeclarations(generator, symbol, statement);
+            writer.Write(";");
+            writer.WriteNewLine();
+        }
+
+        private static void GenerateWhileStatement(ScriptGenerator generator, MemberSymbol symbol, WhileStatement statement) {
+            if (statement.Body == null) {
+                return;
+            }
+
+            ScriptTextWriter writer = generator.Writer;
+
+            if (statement.PreCondition) {
+                writer.WriteTrimmed("while ");
+                writer.Write("(");
+                ExpressionGenerator.GenerateExpression(generator, symbol, statement.Condition);
+                writer.WriteTrimmed(") ");
+                writer.Write("{");
+                writer.WriteNewLine();
+            }
+            else {
+                writer.WriteTrimmed("do ");
+                writer.Write("{");
+                writer.WriteNewLine();
+            }
+
+            writer.Indent++;
+            GenerateStatement(generator, symbol, statement.Body);
+            writer.Indent--;
+
+            if (statement.PreCondition) {
+                writer.Write("}");
+                writer.WriteNewLine();
+            }
+            else {
+                writer.WriteTrimmed("} ");
+                writer.WriteTrimmed("while ");
+                writer.Write("(");
+                ExpressionGenerator.GenerateExpression(generator, symbol, statement.Condition);
+                writer.Write(");");
+                writer.WriteNewLine();
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Generator/TestGenerator.cs b/src/Core/Compiler/Generator/TestGenerator.cs
new file mode 100644
index 000000000..04fac6ff5
--- /dev/null
+++ b/src/Core/Compiler/Generator/TestGenerator.cs
@@ -0,0 +1,80 @@
+// TestGenerator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using ScriptSharp;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Generator {
+
+    internal static class TestGenerator {
+
+        public static void GenerateScript(ScriptGenerator generator, ClassSymbol testClassSymbol) {
+            Debug.Assert(generator != null);
+
+            List<MethodSymbol> testMethods = new List<MethodSymbol>();
+            bool hasSetup = false;
+            bool hasCleanup = false;
+
+            foreach (MemberSymbol member in testClassSymbol.Members) {
+                if (member.Type == SymbolType.Method) {
+                    if (String.CompareOrdinal(member.Name, "Setup") == 0) {
+                        hasSetup = true;
+                    }
+                    else if (String.CompareOrdinal(member.Name, "Cleanup") == 0) {
+                        hasCleanup = true;
+                    }
+                    else if (member.Name.StartsWith("Test", StringComparison.Ordinal)) {
+                        testMethods.Add((MethodSymbol)member);
+                    }
+                }
+            }
+
+            ScriptTextWriter writer = generator.Writer;
+
+            writer.WriteLine();
+            writer.Write("module('");
+            writer.Write(testClassSymbol.GeneratedName);
+            writer.WriteLine("', {");
+            writer.Indent++;
+            writer.WriteLine("setup: function() {");
+            writer.Indent++;
+            writer.Write("this.instance = new ");
+            writer.Write(testClassSymbol.FullGeneratedName);
+            writer.WriteLine("();");
+            if (hasSetup) {
+                writer.WriteLine("this.instance.setup();");
+            }
+            writer.Indent--;
+            writer.WriteLine("},");
+            writer.WriteLine("teardown: function() {");
+            writer.Indent++;
+            if (hasCleanup) {
+                writer.WriteLine("this.instance.cleanup();");
+            }
+            writer.WriteLine("delete this.instance;");
+            writer.Indent--;
+            writer.WriteLine("}");
+            writer.Indent--;
+            writer.WriteLine("});");
+            writer.WriteLine();
+
+            foreach (MethodSymbol testMethod in testMethods) {
+                writer.Write("test('");
+                writer.Write(testMethod.GeneratedName);
+                writer.WriteLine("', function() {");
+                writer.Indent++;
+                writer.Write("this.instance.");
+                writer.Write(testMethod.GeneratedName);
+                writer.WriteLine("();");
+                writer.Indent--;
+                writer.WriteLine("});");
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Generator/TypeGenerator.cs b/src/Core/Compiler/Generator/TypeGenerator.cs
new file mode 100644
index 000000000..eb667d64b
--- /dev/null
+++ b/src/Core/Compiler/Generator/TypeGenerator.cs
@@ -0,0 +1,526 @@
+// TypeGenerator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using ScriptSharp;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Generator {
+
+    internal static class TypeGenerator {
+
+        private static void GenerateClass(ScriptGenerator generator, ClassSymbol classSymbol) {
+            if (classSymbol.HasGlobalMethods) {
+                GenerateGlobalMethods(generator, classSymbol);
+                generator.AddGeneratedClass(classSymbol);
+                return;
+            }
+
+            ScriptTextWriter writer = generator.Writer;
+            string name = classSymbol.FullGeneratedName;
+
+            if (classSymbol.Namespace.Length == 0) {
+                writer.Write("window.");
+            }
+
+            writer.Write(name);
+            writer.WriteTrimmed(" = ");
+            writer.Write("function");
+            if (generator.Options.DebugFlavor) {
+                writer.Write(" ");
+                writer.Write(name.Replace(".", "_"));
+            }
+            writer.Write("(");
+            if ((classSymbol.Constructor != null) && (classSymbol.Constructor.Parameters != null)) {
+                bool firstParameter = true;
+                foreach (ParameterSymbol parameterSymbol in classSymbol.Constructor.Parameters) {
+                    if (firstParameter == false) {
+                        writer.WriteTrimmed(", ");
+                    }
+                    writer.Write(parameterSymbol.GeneratedName);
+                    firstParameter = false;
+                }
+            }
+            writer.WriteTrimmed(") ");
+            writer.Write("{");
+            writer.WriteNewLine();
+            writer.Indent++;
+
+            if (generator.Options.EnableDocComments) {
+                DocCommentGenerator.GenerateComment(generator, classSymbol);
+            }
+
+            foreach (MemberSymbol memberSymbol in classSymbol.Members) {
+                if ((memberSymbol.Type == SymbolType.Field) &&
+                    (memberSymbol.Visibility & MemberVisibility.Static) == 0) {
+                    FieldSymbol fieldSymbol = (FieldSymbol)memberSymbol;
+                    if (fieldSymbol.HasInitializer) {
+                        writer.Write("this.");
+                        writer.Write(fieldSymbol.GeneratedName);
+                        writer.WriteTrimmed(" = ");
+                        CodeGenerator.GenerateScript(generator, fieldSymbol);
+                        writer.Write(";");
+                        writer.WriteNewLine();
+                    }
+                }
+            }
+            if (classSymbol.Constructor != null) {
+                CodeGenerator.GenerateScript(generator, classSymbol.Constructor);
+            }
+            else if (classSymbol.BaseClass != null) {
+                writer.Write(classSymbol.FullGeneratedName);
+                writer.Write(".initializeBase(this);");
+                writer.WriteNewLine();
+            }
+            writer.Indent--;
+            writer.Write("}");
+            writer.WriteSignificantNewLine();
+
+            foreach (MemberSymbol memberSymbol in classSymbol.Members) {
+                if ((memberSymbol.Type != SymbolType.Field) &&
+                    (memberSymbol.Visibility & MemberVisibility.Static) != 0) {
+                    MemberGenerator.GenerateScript(generator, memberSymbol);
+                }
+            }
+
+            bool hasPrototypeMembers = false;
+            bool firstMember = true;
+            bool lastMemberWasField = true;
+            foreach (MemberSymbol memberSymbol in classSymbol.Members) {
+                if ((memberSymbol.Visibility & MemberVisibility.Static) == 0) {
+                    if ((memberSymbol.Type == SymbolType.Field) &&
+                        ((FieldSymbol)memberSymbol).HasInitializer) {
+                        continue;
+                    }
+
+                    if ((memberSymbol is CodeMemberSymbol) &&
+                        ((CodeMemberSymbol)memberSymbol).IsAbstract) {
+                        continue;
+                    }
+
+                    if (hasPrototypeMembers == false) {
+                        hasPrototypeMembers = true;
+
+                        writer.Write(name);
+                        writer.Write(".prototype");
+                        writer.WriteTrimmed(" = ");
+                        writer.Write("{");
+                        writer.WriteNewLine();
+                        writer.Indent++;
+                    }
+
+                    if (firstMember == false) {
+                        writer.Write(",");
+                        writer.WriteNewLine();
+                    }
+                    if ((lastMemberWasField == false) || !(memberSymbol is FieldSymbol)) {
+                        writer.WriteNewLine();
+                    }
+
+                    MemberGenerator.GenerateScript(generator, memberSymbol);
+                    lastMemberWasField = (memberSymbol is FieldSymbol);
+                    firstMember = false;
+                }
+            }
+
+            if (classSymbol.Indexer != null) {
+                if (hasPrototypeMembers == false) {
+                    hasPrototypeMembers = true;
+
+                    writer.Write(name);
+                    writer.Write(".prototype");
+                    writer.WriteTrimmed(" = ");
+                    writer.Write("{");
+                    writer.WriteNewLine();
+                    writer.Indent++;
+                
+                }
+                if (firstMember == false) {
+                    writer.Write(",");
+                    writer.WriteNewLine();
+                }
+
+                MemberGenerator.GenerateScript(generator, classSymbol.Indexer);
+            }
+
+            if (hasPrototypeMembers) {
+                writer.Indent--;
+                writer.WriteNewLine();
+                writer.Write("}");
+                writer.WriteSignificantNewLine();
+            }
+
+            generator.AddGeneratedClass(classSymbol);
+        }
+
+        private static void GenerateDelegate(ScriptGenerator generator, DelegateSymbol delegateSymbol) {
+            // No-op
+            // There is currently nothing to generate for a particular delegate type
+        }
+
+        private static void GenerateEnumeration(ScriptGenerator generator, EnumerationSymbol enumSymbol) {
+            ScriptTextWriter writer = generator.Writer;
+
+            if (enumSymbol.Namespace.Length == 0) {
+                writer.Write("window.");
+            }
+
+            writer.Write(enumSymbol.FullGeneratedName);
+            writer.WriteTrimmed(" = ");
+            writer.Write("function()");
+            writer.WriteTrimmed(" { ");
+
+            if (generator.Options.EnableDocComments) {
+                DocCommentGenerator.GenerateComment(generator, enumSymbol);
+            }
+
+            writer.Write("};");
+            writer.WriteNewLine();
+            writer.Write(enumSymbol.FullGeneratedName);
+            writer.Write(".prototype = {");
+            writer.Indent++;
+
+            bool firstValue = true;
+            foreach (MemberSymbol memberSymbol in enumSymbol.Members) {
+                EnumerationFieldSymbol fieldSymbol = memberSymbol as EnumerationFieldSymbol;
+                if (fieldSymbol == null) {
+                    continue;
+                }
+
+                if (firstValue == false) {
+                    writer.WriteTrimmed(", ");
+                }
+
+                writer.WriteNewLine();
+                writer.Write(fieldSymbol.GeneratedName);
+                writer.WriteTrimmed(": ");
+                if (enumSymbol.UseNamedValues) {
+                    writer.Write(Utility.QuoteString(enumSymbol.CreateNamedValue(fieldSymbol)));
+                }
+                else {
+                    writer.Write(fieldSymbol.Value);
+                }
+                firstValue = false;
+            }
+
+            writer.Indent--;
+            writer.WriteNewLine();
+            writer.WriteTrimmed("}");
+            writer.WriteSignificantNewLine();
+
+            writer.Write(enumSymbol.FullGeneratedName);
+            writer.Write(".registerEnum('");
+            writer.Write(enumSymbol.FullGeneratedName);
+            writer.WriteTrimmed("', ");
+            writer.Write(enumSymbol.Flags ? "true" : "false");
+            writer.Write(");");
+            writer.WriteNewLine();
+        }
+
+        private static void GenerateInterface(ScriptGenerator generator, InterfaceSymbol interfaceSymbol) {
+            ScriptTextWriter writer = generator.Writer;
+            string interfaceName = interfaceSymbol.FullGeneratedName;
+
+            if (interfaceSymbol.Namespace.Length == 0) {
+                writer.Write("window.");
+            }
+
+            writer.Write(interfaceName);
+            writer.WriteTrimmed(" = ");
+            writer.Write("function()");
+            writer.WriteTrimmed(" { ");
+
+            if (generator.Options.EnableDocComments) {
+                DocCommentGenerator.GenerateComment(generator, interfaceSymbol);
+            }
+
+            writer.Write("};");
+            writer.WriteNewLine();
+
+            if (generator.Options.DebugFlavor) {
+                writer.Write(interfaceName);
+                writer.Write(".prototype = {");
+                writer.WriteLine();
+                writer.Indent++;
+                bool firstMember = true;
+                foreach (MemberSymbol member in interfaceSymbol.Members) {
+                    if (firstMember == false) {
+                        writer.Write(",");
+                        writer.WriteLine();
+                    }
+
+                    if (member.Type == SymbolType.Property) {
+                        writer.Write("get_");
+                        writer.Write(member.GeneratedName);
+                        writer.WriteTrimmed(" : ");
+                        writer.Write("null");
+
+                        if (((PropertySymbol)member).IsReadOnly == false) {
+                            writer.Write(",");
+                            writer.WriteLine();
+
+                            writer.Write("set_");
+                            writer.Write(member.GeneratedName);
+                            writer.WriteTrimmed(" : ");
+                            writer.Write("null");
+                        }
+                    }
+                    else if (member.Type == SymbolType.Event) {
+                        writer.Write("add_");
+                        writer.Write(member.GeneratedName);
+                        writer.WriteTrimmed(" : ");
+                        writer.Write("null,");
+                        writer.WriteLine();
+
+                        writer.Write("remove_");
+                        writer.Write(member.GeneratedName);
+                        writer.WriteTrimmed(" : ");
+                        writer.Write("null");
+                    }
+                    else {
+                        writer.Write(member.GeneratedName);
+                        writer.WriteTrimmed(" : ");
+                        writer.Write("null");
+                    }
+                    firstMember = false;
+                }
+                writer.Indent--;
+                writer.WriteLine();
+                writer.Write("}");
+                writer.WriteSignificantNewLine();
+            }
+
+            writer.Write(interfaceName);
+            writer.Write(".registerInterface('");
+            writer.Write(interfaceName);
+            writer.Write("');");
+            writer.WriteNewLine();
+        }
+
+        public static void GenerateClassConstructorScript(ScriptGenerator generator, ClassSymbol classSymbol) {
+            // NOTE: This is emitted last in the script file, and separate from the initial class definition
+            //       because it needs to be emitted after the class registration.
+
+            foreach (MemberSymbol memberSymbol in classSymbol.Members) {
+                if ((memberSymbol.Type == SymbolType.Field) &&
+                    ((memberSymbol.Visibility & MemberVisibility.Static) != 0)) {
+                    if (((FieldSymbol)memberSymbol).IsConstant &&
+                        ((memberSymbol.Visibility & (MemberVisibility.Public | MemberVisibility.Protected)) == 0)) {
+                        // PrivateInstance/Internal constant fields are omitted since they have been inlined
+                        continue;
+                    }
+
+                    MemberGenerator.GenerateScript(generator, memberSymbol);
+                }
+            }
+
+            if (classSymbol.StaticConstructor != null) {
+                ScriptTextWriter writer = generator.Writer;
+
+                SymbolImplementation implementation = classSymbol.StaticConstructor.Implementation;
+                bool requiresFunctionScope = implementation.DeclaresVariables;
+
+                if (requiresFunctionScope) {
+                    writer.Write("(function");
+                    writer.WriteTrimmed(" () ");
+                    writer.Write("{");
+                    writer.WriteNewLine();
+                    writer.Indent++;
+                }
+                CodeGenerator.GenerateScript(generator, classSymbol.StaticConstructor);
+                if (requiresFunctionScope) {
+                    writer.Indent--;
+                    writer.Write("})();");
+                    writer.WriteSignificantNewLine();
+                }
+            }
+        }
+
+        public static void GenerateClassRegistrationScript(ScriptGenerator generator, ClassSymbol classSymbol) {
+            // NOTE: This is emitted towards the end of the script file as opposed to immediately after the
+            //       class definition, because it allows us to reference other class (base class, interfaces)
+            //       without having to do a manual topological sort to get the ordering of class definitions
+            //       that would be needed otherwise.
+
+            ScriptTextWriter writer = generator.Writer;
+            string name = classSymbol.FullGeneratedName;
+
+            writer.Write(name);
+            writer.Write(".registerClass('");
+            writer.Write(name);
+            writer.Write("'");
+
+            // TODO: We need to introduce the notion of a base class that only exists in the metadata
+            //       and not at runtime. At that point this check of IsTestClass can be generalized.
+            if (classSymbol.IsTestClass) {
+                writer.Write(");");
+                writer.WriteNewLine();
+
+                return;
+            }
+
+            if (classSymbol.BaseClass != null) {
+                writer.WriteTrimmed(", ");
+                writer.Write(classSymbol.BaseClass.FullGeneratedName);
+            }
+
+            if (classSymbol.Interfaces != null) {
+                if (classSymbol.BaseClass == null) {
+                    writer.WriteTrimmed(", ");
+                    writer.Write("null");
+                }
+                foreach (InterfaceSymbol interfaceSymbol in classSymbol.Interfaces) {
+                    writer.WriteTrimmed(", ");
+                    writer.Write(interfaceSymbol.FullGeneratedName);
+                }
+            }
+
+            writer.Write(");");
+            writer.WriteNewLine();
+        }
+
+        private static void GenerateGlobalMethods(ScriptGenerator generator, ClassSymbol classSymbol) {
+            foreach (MemberSymbol memberSymbol in classSymbol.Members) {
+                Debug.Assert(memberSymbol.Type == SymbolType.Method);
+                Debug.Assert((memberSymbol.Visibility & MemberVisibility.Static) != 0);
+
+                MemberGenerator.GenerateScript(generator, memberSymbol);
+            }
+        }
+
+        private static void GenerateRecord(ScriptGenerator generator, RecordSymbol recordSymbol) {
+            ScriptTextWriter writer = generator.Writer;
+            string recordName = recordSymbol.GeneratedName;
+
+            if ((recordSymbol.Namespace.Length == 0) || recordSymbol.IgnoreNamespace) {
+                writer.Write("window.");
+            }
+            else {
+                writer.Write(recordSymbol.GeneratedNamespace);
+                writer.Write(".");
+            }
+            writer.Write("$create_");
+            writer.Write(recordName);
+            writer.WriteTrimmed(" = ");
+            writer.Write("function");
+            if (generator.Options.DebugFlavor) {
+                writer.Write(" ");
+                writer.Write(recordSymbol.FullGeneratedName.Replace(".", "_"));
+            }
+            writer.Write("(");
+            if (recordSymbol.Constructor != null) {
+                ConstructorSymbol ctorSymbol = recordSymbol.Constructor;
+
+                if (ctorSymbol.Parameters != null) {
+                    bool firstParameter = true;
+                    foreach (ParameterSymbol parameterSymbol in ctorSymbol.Parameters) {
+                        if (firstParameter == false) {
+                            writer.WriteTrimmed(", ");
+                        }
+                        writer.Write(parameterSymbol.GeneratedName);
+                        firstParameter = false;
+                    }
+                }
+            }
+            writer.WriteTrimmed(")");
+            writer.WriteTrimmed(" {");
+            if (recordSymbol.Constructor != null) {
+                writer.Indent++;
+                writer.WriteNewLine();
+                writer.Write("var $o");
+                writer.WriteTrimmed(" = ");
+                writer.WriteTrimmed("{ ");
+                writer.Write("};");
+                writer.WriteNewLine();
+                CodeGenerator.GenerateScript(generator, recordSymbol.Constructor);
+                writer.Write("return $o;");
+                writer.WriteNewLine();
+                writer.Indent--;
+            }
+            else {
+                writer.WriteTrimmed(" return {}; ");
+            }
+            writer.Write("}");
+            writer.WriteSignificantNewLine();
+        }
+
+        private static void GenerateResources(ScriptGenerator generator, ResourcesSymbol resourcesSymbol) {
+            ScriptTextWriter writer = generator.Writer;
+            string resourcesName = resourcesSymbol.FullGeneratedName;
+
+            writer.Write(resourcesName);
+            writer.WriteTrimmed(" = ");
+            writer.WriteTrimmed("{ ");
+            writer.WriteNewLine();
+            writer.Indent++;
+
+            bool firstValue = true;
+            foreach (FieldSymbol member in resourcesSymbol.Members) {
+                Debug.Assert(member.Value is string);
+
+                if (firstValue == false) {
+                    writer.Write(",");
+                    writer.WriteLine();
+                }
+
+                writer.Write(member.GeneratedName);
+                writer.WriteTrimmed(": ");
+                writer.Write(Utility.QuoteString((string)member.Value));
+
+                firstValue = false;
+            }
+
+            writer.Indent--;
+            writer.WriteLine();
+            writer.Write("};");
+            writer.WriteNewLine();
+        }
+
+        public static void GenerateScript(ScriptGenerator generator, TypeSymbol typeSymbol) {
+            Debug.Assert(generator != null);
+            Debug.Assert(typeSymbol != null);
+            Debug.Assert(typeSymbol.IsApplicationType);
+
+            if ((typeSymbol.Type == SymbolType.Enumeration) && (typeSymbol.IsPublic == false)) {
+                // Internal enums can be skipped since their values have been inlined.
+                return;
+            }
+
+            ScriptTextWriter writer = generator.Writer;
+
+            if (generator.Options.Minimize == false) {
+                writer.WriteLine(new String('/', 80));
+                writer.WriteLine("// " + typeSymbol.FullGeneratedName);
+                writer.WriteLine();
+            }
+
+            switch (typeSymbol.Type) {
+                case SymbolType.Class:
+                    GenerateClass(generator, (ClassSymbol)typeSymbol);
+                    break;
+                case SymbolType.Interface:
+                    GenerateInterface(generator, (InterfaceSymbol)typeSymbol);
+                    break;
+                case SymbolType.Enumeration:
+                    GenerateEnumeration(generator, (EnumerationSymbol)typeSymbol);
+                    break;
+                case SymbolType.Delegate:
+                    GenerateDelegate(generator, (DelegateSymbol)typeSymbol);
+                    break;
+                case SymbolType.Record:
+                    GenerateRecord(generator, (RecordSymbol)typeSymbol);
+                    break;
+                case SymbolType.Resources:
+                    GenerateResources(generator, (ResourcesSymbol)typeSymbol);
+                    break;
+            }
+
+            writer.WriteNewLine();
+            writer.WriteNewLine();
+        }
+    }
+}
diff --git a/src/Core/Compiler/IErrorHandler.cs b/src/Core/Compiler/IErrorHandler.cs
new file mode 100644
index 000000000..d32617103
--- /dev/null
+++ b/src/Core/Compiler/IErrorHandler.cs
@@ -0,0 +1,14 @@
+// IErrorHandler.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp {
+
+    public interface IErrorHandler {
+
+        void ReportError(string errorMessage, string location);
+    }
+}
diff --git a/src/Core/Compiler/IScriptInfo.cs b/src/Core/Compiler/IScriptInfo.cs
new file mode 100644
index 000000000..89b246adb
--- /dev/null
+++ b/src/Core/Compiler/IScriptInfo.cs
@@ -0,0 +1,15 @@
+// IScriptInfo.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.IO;
+
+namespace ScriptSharp {
+
+    internal interface IScriptInfo {
+
+        string GetValue(string name);
+    }
+}
diff --git a/src/Core/Compiler/IStreamResolver.cs b/src/Core/Compiler/IStreamResolver.cs
new file mode 100644
index 000000000..8835c50ee
--- /dev/null
+++ b/src/Core/Compiler/IStreamResolver.cs
@@ -0,0 +1,15 @@
+// IStreamResolver.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.IO;
+
+namespace ScriptSharp {
+
+    public interface IStreamResolver {
+
+        IStreamSource ResolveInclude(IStreamSource baseStream, string includePath);
+    }
+}
diff --git a/src/Core/Compiler/IStreamSource.cs b/src/Core/Compiler/IStreamSource.cs
new file mode 100644
index 000000000..a092089ce
--- /dev/null
+++ b/src/Core/Compiler/IStreamSource.cs
@@ -0,0 +1,25 @@
+// IStreamSource.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.IO;
+
+namespace ScriptSharp {
+
+    public interface IStreamSource {
+
+        string FullName {
+            get;
+        }
+
+        string Name {
+            get;
+        }
+
+        void CloseStream(Stream stream);
+
+        Stream GetStream();
+    }
+}
diff --git a/src/Core/Compiler/Importer/IL/ArrayType.cs b/src/Core/Compiler/Importer/IL/ArrayType.cs
new file mode 100644
index 000000000..a45221092
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/ArrayType.cs
@@ -0,0 +1,159 @@
+//
+// ArrayType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Text;
+using MD = ScriptSharp.Importer.IL.Metadata;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+	internal /* public */ struct ArrayDimension {
+
+		int? lower_bound;
+		int? upper_bound;
+
+		public int? LowerBound {
+			get { return lower_bound; }
+			set { lower_bound = value; }
+		}
+
+		public int? UpperBound {
+			get { return upper_bound; }
+			set { upper_bound = value; }
+		}
+
+		public bool IsSized {
+			get { return lower_bound.HasValue || upper_bound.HasValue; }
+		}
+
+		public ArrayDimension (int? lowerBound, int? upperBound)
+		{
+			this.lower_bound = lowerBound;
+			this.upper_bound = upperBound;
+		}
+
+		public override string ToString ()
+		{
+			return !IsSized
+				? string.Empty
+				: lower_bound + "..." + upper_bound;
+		}
+	}
+
+    internal /* public */ sealed class ArrayType : TypeSpecification {
+
+		Collection<ArrayDimension> dimensions;
+
+		public Collection<ArrayDimension> Dimensions {
+			get {
+				if (dimensions != null)
+					return dimensions;
+
+				dimensions = new Collection<ArrayDimension> ();
+				dimensions.Add (new ArrayDimension ());
+				return dimensions;
+			}
+		}
+
+		public int Rank {
+			get { return dimensions == null ? 1 : dimensions.Count; }
+		}
+
+		public bool IsVector {
+			get {
+				if (dimensions == null)
+					return true;
+
+				if (dimensions.Count > 1)
+					return false;
+
+				var dimension = dimensions [0];
+
+				return !dimension.IsSized;
+			}
+		}
+
+		public override bool IsValueType {
+			get { return false; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override string Name {
+			get { return base.Name + Suffix; }
+		}
+
+		public override string FullName {
+			get { return base.FullName + Suffix; }
+		}
+
+		string Suffix {
+			get {
+				if (IsVector)
+					return "[]";
+
+				var suffix = new StringBuilder ();
+				suffix.Append ("[");
+				for (int i = 0; i < dimensions.Count; i++) {
+					if (i > 0)
+						suffix.Append (",");
+
+					suffix.Append (dimensions [i].ToString ());
+				}
+				suffix.Append ("]");
+
+				return suffix.ToString ();
+			}
+		}
+
+		public override bool IsArray {
+			get { return true; }
+		}
+
+		public ArrayType (TypeReference type)
+			: base (type)
+		{
+			Mixin.CheckType (type);
+			this.etype = MD.ElementType.Array;
+		}
+
+		public ArrayType (TypeReference type, int rank)
+			: this (type)
+		{
+			Mixin.CheckType (type);
+
+			if (rank == 1)
+				return;
+
+			dimensions = new Collection<ArrayDimension> (rank);
+			for (int i = 0; i < rank; i++)
+				dimensions.Add (new ArrayDimension ());
+			this.etype = MD.ElementType.Array;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/AssemblyDefinition.cs b/src/Core/Compiler/Importer/IL/AssemblyDefinition.cs
new file mode 100644
index 000000000..e928d0106
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/AssemblyDefinition.cs
@@ -0,0 +1,189 @@
+//
+// AssemblyDefinition.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class AssemblyDefinition : ICustomAttributeProvider, ISecurityDeclarationProvider {
+
+		AssemblyNameDefinition name;
+
+		internal ModuleDefinition main_module;
+		Collection<ModuleDefinition> modules;
+		Collection<CustomAttribute> custom_attributes;
+		Collection<SecurityDeclaration> security_declarations;
+
+		public AssemblyNameDefinition Name {
+			get { return name; }
+			set { name = value; }
+		}
+
+		public string FullName {
+			get { return name != null ? name.FullName : string.Empty; }
+		}
+
+		public MetadataToken MetadataToken {
+			get { return new MetadataToken (TokenType.Assembly, 1); }
+			set { }
+		}
+
+		public Collection<ModuleDefinition> Modules {
+			get {
+				if (modules != null)
+					return modules;
+
+				if (main_module.HasImage)
+					return modules = main_module.Read (this, (_, reader) => reader.ReadModules ());
+
+				return modules = new Collection<ModuleDefinition> (1) { main_module };
+			}
+		}
+
+		public ModuleDefinition MainModule {
+			get { return main_module; }
+		}
+
+		public MethodDefinition EntryPoint {
+			get { return main_module.EntryPoint; }
+			set { main_module.EntryPoint = value; }
+		}
+
+		public bool HasCustomAttributes {
+			get {
+				if (custom_attributes != null)
+					return custom_attributes.Count > 0;
+
+				return this.GetHasCustomAttributes (main_module);
+			}
+		}
+
+		public Collection<CustomAttribute> CustomAttributes {
+			get { return custom_attributes ?? (custom_attributes = this.GetCustomAttributes (main_module)); }
+		}
+
+		public bool HasSecurityDeclarations {
+			get {
+				if (security_declarations != null)
+					return security_declarations.Count > 0;
+
+				return this.GetHasSecurityDeclarations (main_module);
+			}
+		}
+
+		public Collection<SecurityDeclaration> SecurityDeclarations {
+			get { return security_declarations ?? (security_declarations = this.GetSecurityDeclarations (main_module)); }
+		}
+
+		internal AssemblyDefinition ()
+		{
+		}
+
+#if !IL_READ_ONLY
+		public static AssemblyDefinition CreateAssembly (AssemblyNameDefinition assemblyName, string moduleName, ModuleKind kind)
+		{
+			return CreateAssembly (assemblyName, moduleName, new ModuleParameters { Kind = kind });
+		}
+
+		public static AssemblyDefinition CreateAssembly (AssemblyNameDefinition assemblyName, string moduleName, ModuleParameters parameters)
+		{
+			if (assemblyName == null)
+				throw new ArgumentNullException ("assemblyName");
+			if (moduleName == null)
+				throw new ArgumentNullException ("moduleName");
+			Mixin.CheckParameters (parameters);
+			if (parameters.Kind == ModuleKind.NetModule)
+				throw new ArgumentException ("kind");
+
+			var assembly = ModuleDefinition.CreateModule (moduleName, parameters).Assembly;
+			assembly.Name = assemblyName;
+
+			return assembly;
+		}
+#endif
+
+		public static AssemblyDefinition ReadAssembly (string fileName)
+		{
+			return ReadAssembly (ModuleDefinition.ReadModule (fileName));
+		}
+
+		public static AssemblyDefinition ReadAssembly (string fileName, ReaderParameters parameters)
+		{
+			return ReadAssembly (ModuleDefinition.ReadModule (fileName, parameters));
+		}
+
+		public static AssemblyDefinition ReadAssembly (Stream stream)
+		{
+			return ReadAssembly (ModuleDefinition.ReadModule (stream));
+		}
+
+		public static AssemblyDefinition ReadAssembly (Stream stream, ReaderParameters parameters)
+		{
+			return ReadAssembly (ModuleDefinition.ReadModule (stream, parameters));
+		}
+
+		static AssemblyDefinition ReadAssembly (ModuleDefinition module)
+		{
+			var assembly = module.Assembly;
+			if (assembly == null)
+				throw new ArgumentException ();
+
+			return assembly;
+		}
+
+#if !IL_READ_ONLY
+        public void Write (string fileName)
+		{
+			Write (fileName, new WriterParameters ());
+		}
+
+		public void Write (Stream stream)
+		{
+			Write (stream, new WriterParameters ());
+		}
+
+		public void Write (string fileName, WriterParameters parameters)
+		{
+			main_module.Write (fileName, parameters);
+		}
+
+		public void Write (Stream stream, WriterParameters parameters)
+		{
+			main_module.Write (stream, parameters);
+		}
+#endif
+
+		public override string ToString ()
+		{
+			return this.FullName;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/AssemblyFlags.cs b/src/Core/Compiler/Importer/IL/AssemblyFlags.cs
new file mode 100644
index 000000000..966540752
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/AssemblyFlags.cs
@@ -0,0 +1,41 @@
+//
+// AssemblyFlags.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+	[Flags]
+    internal /* public */ enum AssemblyAttributes : uint {
+		PublicKey					 	= 0x0001,
+		SideBySideCompatible			= 0x0000,
+		Retargetable					= 0x0100,
+		DisableJITCompileOptimizer		= 0x4000,
+		EnableJITCompileTracking		= 0x8000,
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/AssemblyHashAlgorithm.cs b/src/Core/Compiler/Importer/IL/AssemblyHashAlgorithm.cs
new file mode 100644
index 000000000..31f6c581c
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/AssemblyHashAlgorithm.cs
@@ -0,0 +1,36 @@
+//
+// AssemblyHashAlgorithm.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ enum AssemblyHashAlgorithm : uint {
+		None		= 0x0000,
+		Reserved	= 0x8003,	// MD5
+		SHA1		= 0x8004
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/AssemblyLinkedResource.cs b/src/Core/Compiler/Importer/IL/AssemblyLinkedResource.cs
new file mode 100644
index 000000000..8979a55a8
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/AssemblyLinkedResource.cs
@@ -0,0 +1,57 @@
+//
+// AssemblyLinkedResource.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class AssemblyLinkedResource : Resource {
+
+		AssemblyNameReference reference;
+
+		public AssemblyNameReference Assembly {
+			get { return reference; }
+			set { reference = value; }
+		}
+
+		public override ResourceType ResourceType {
+			get { return ResourceType.AssemblyLinked; }
+		}
+
+		public AssemblyLinkedResource (string name, ManifestResourceAttributes flags)
+			: base (name, flags)
+		{
+		}
+
+		public AssemblyLinkedResource (string name, ManifestResourceAttributes flags, AssemblyNameReference reference)
+			: base (name, flags)
+		{
+			this.reference = reference;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/AssemblyNameDefinition.cs b/src/Core/Compiler/Importer/IL/AssemblyNameDefinition.cs
new file mode 100644
index 000000000..9f0017c54
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/AssemblyNameDefinition.cs
@@ -0,0 +1,50 @@
+//
+// AssemblyNameDefinition.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class AssemblyNameDefinition : AssemblyNameReference {
+
+		public override byte [] Hash {
+			get { return Empty<byte>.Array; }
+		}
+
+		internal AssemblyNameDefinition ()
+		{
+			this.token = new MetadataToken (TokenType.Assembly, 1);
+		}
+
+		public AssemblyNameDefinition (string name, Version version)
+			: base (name, version)
+		{
+			this.token = new MetadataToken (TokenType.Assembly, 1);
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/AssemblyNameReference.cs b/src/Core/Compiler/Importer/IL/AssemblyNameReference.cs
new file mode 100644
index 000000000..9d0b5c00d
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/AssemblyNameReference.cs
@@ -0,0 +1,263 @@
+//
+// AssemblyNameReference.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Globalization;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ class AssemblyNameReference : IMetadataScope {
+
+		string name;
+		string culture;
+		Version version;
+		uint attributes;
+		byte [] public_key;
+		byte [] public_key_token;
+		AssemblyHashAlgorithm hash_algorithm;
+		byte [] hash;
+
+		internal MetadataToken token;
+
+		string full_name;
+
+		public string Name {
+			get { return name; }
+			set {
+				name = value;
+				full_name = null;
+			}
+		}
+
+		public string Culture {
+			get { return culture; }
+			set {
+				culture = value;
+				full_name = null;
+			}
+		}
+
+		public Version Version {
+			get { return version; }
+			set {
+				 version = value;
+				 full_name = null;
+			}
+		}
+
+		public AssemblyAttributes Attributes {
+			get { return (AssemblyAttributes) attributes; }
+			set { attributes = (uint) value; }
+		}
+
+		public bool HasPublicKey {
+			get { return attributes.GetAttributes ((uint) AssemblyAttributes.PublicKey); }
+			set { attributes = attributes.SetAttributes ((uint) AssemblyAttributes.PublicKey, value); }
+		}
+
+		public bool IsSideBySideCompatible {
+			get { return attributes.GetAttributes ((uint) AssemblyAttributes.SideBySideCompatible); }
+			set { attributes = attributes.SetAttributes ((uint) AssemblyAttributes.SideBySideCompatible, value); }
+		}
+
+		public bool IsRetargetable {
+			get { return attributes.GetAttributes ((uint) AssemblyAttributes.Retargetable); }
+			set { attributes = attributes.SetAttributes ((uint) AssemblyAttributes.Retargetable, value); }
+		}
+
+		public byte [] PublicKey {
+			get { return public_key; }
+			set {
+				public_key = value;
+				HasPublicKey = !public_key.IsNullOrEmpty ();
+				public_key_token = Empty<byte>.Array;
+				full_name = null;
+			}
+		}
+
+		public byte [] PublicKeyToken {
+			get {
+				if (public_key_token.IsNullOrEmpty () && !public_key.IsNullOrEmpty ()) {
+					var hash = HashPublicKey ();
+					// we need the last 8 bytes in reverse order
+					public_key_token = new byte [8];
+					Array.Copy (hash, (hash.Length - 8), public_key_token, 0, 8);
+					Array.Reverse (public_key_token, 0, 8);
+				}
+				return public_key_token;
+			}
+			set {
+				public_key_token = value;
+				full_name = null;
+			}
+		}
+
+		byte [] HashPublicKey ()
+		{
+			HashAlgorithm algorithm;
+
+			switch (hash_algorithm) {
+			case AssemblyHashAlgorithm.Reserved:
+#if SILVERLIGHT
+				throw new NotSupportedException ();
+#else
+				algorithm = MD5.Create ();
+				break;
+#endif
+			default:
+				// None default to SHA1
+#if SILVERLIGHT
+				algorithm = new SHA1Managed ();
+				break;
+#else
+				algorithm = SHA1.Create ();
+				break;
+#endif
+			}
+
+			using (algorithm)
+				return algorithm.ComputeHash (public_key);
+		}
+
+		public virtual MetadataScopeType MetadataScopeType {
+			get { return MetadataScopeType.AssemblyNameReference; }
+		}
+
+		public string FullName {
+			get {
+				if (full_name != null)
+					return full_name;
+
+				const string sep = ", ";
+
+				var builder = new StringBuilder ();
+				builder.Append (name);
+				if (version != null) {
+					builder.Append (sep);
+					builder.Append ("Version=");
+					builder.Append (version.ToString ());
+				}
+				builder.Append (sep);
+				builder.Append ("Culture=");
+				builder.Append (string.IsNullOrEmpty (culture) ? "neutral" : culture);
+				builder.Append (sep);
+				builder.Append ("PublicKeyToken=");
+
+				if (this.PublicKeyToken != null && public_key_token.Length > 0) {
+					for (int i = 0 ; i < public_key_token.Length ; i++) {
+						builder.Append (public_key_token [i].ToString ("x2"));
+					}
+				} else
+					builder.Append ("null");
+
+				return full_name = builder.ToString ();
+			}
+		}
+
+		public static AssemblyNameReference Parse (string fullName)
+		{
+			if (fullName == null)
+				throw new ArgumentNullException ("fullName");
+			if (fullName.Length == 0)
+				throw new ArgumentException ("Name can not be empty");
+
+			var name = new AssemblyNameReference ();
+			var tokens = fullName.Split (',');
+			for (int i = 0; i < tokens.Length; i++) {
+				var token = tokens [i].Trim ();
+
+				if (i == 0) {
+					name.Name = token;
+					continue;
+				}
+
+				var parts = token.Split ('=');
+				if (parts.Length != 2)
+					throw new ArgumentException ("Malformed name");
+
+				switch (parts [0]) {
+				case "Version":
+					name.Version = new Version (parts [1]);
+					break;
+				case "Culture":
+					name.Culture = parts [1];
+					break;
+				case "PublicKeyToken":
+					string pk_token = parts [1];
+					if (pk_token == "null")
+						break;
+
+					name.PublicKeyToken = new byte [pk_token.Length / 2];
+					for (int j = 0; j < name.PublicKeyToken.Length; j++) {
+						name.PublicKeyToken [j] = Byte.Parse (pk_token.Substring (j * 2, 2), NumberStyles.HexNumber);
+					}
+					break;
+				}
+			}
+
+			return name;
+		}
+
+		public AssemblyHashAlgorithm HashAlgorithm {
+			get { return hash_algorithm; }
+			set { hash_algorithm = value; }
+		}
+
+		public virtual byte [] Hash {
+			get { return hash; }
+			set { hash = value; }
+		}
+
+		public MetadataToken MetadataToken {
+			get { return token; }
+			set { token = value; }
+		}
+
+		internal AssemblyNameReference ()
+		{
+		}
+
+		public AssemblyNameReference (string name, Version version)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+
+			this.name = name;
+			this.version = version;
+			this.hash_algorithm = AssemblyHashAlgorithm.None;
+			this.token = new MetadataToken (TokenType.AssemblyRef);
+		}
+
+		public override string ToString ()
+		{
+			return this.FullName;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/AssemblyReader.cs b/src/Core/Compiler/Importer/IL/AssemblyReader.cs
new file mode 100644
index 000000000..b43337f62
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/AssemblyReader.cs
@@ -0,0 +1,3062 @@
+//
+// AssemblyReader.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+using ScriptSharp.Collections.Generic;
+using ScriptSharp.Importer.IL.Cil;
+using ScriptSharp.Importer.IL.Metadata;
+using ScriptSharp.Importer.IL.PE;
+
+using RVA = System.UInt32;
+
+namespace ScriptSharp.Importer.IL {
+
+	abstract class ModuleReader {
+
+		readonly protected Image image;
+		readonly protected ModuleDefinition module;
+
+		protected ModuleReader (Image image, ReadingMode mode)
+		{
+			this.image = image;
+			this.module = new ModuleDefinition (image);
+			this.module.ReadingMode = mode;
+		}
+
+		protected abstract void ReadModule ();
+
+		protected void ReadModuleManifest (MetadataReader reader)
+		{
+			reader.Populate (module);
+
+			ReadAssembly (reader);
+		}
+
+		void ReadAssembly (MetadataReader reader)
+		{
+			var name = reader.ReadAssemblyNameDefinition ();
+			if (name == null) {
+				module.kind = ModuleKind.NetModule;
+				return;
+			}
+
+			var assembly = new AssemblyDefinition ();
+			assembly.Name = name;
+
+			module.assembly = assembly;
+			assembly.main_module = module;
+		}
+
+		public static ModuleDefinition CreateModuleFrom (Image image, ReaderParameters parameters)
+		{
+			var module = ReadModule (image, parameters);
+
+			ReadSymbols (module, parameters);
+
+			if (parameters.AssemblyResolver != null)
+				module.assembly_resolver = parameters.AssemblyResolver;
+
+			return module;
+		}
+
+		static void ReadSymbols (ModuleDefinition module, ReaderParameters parameters)
+		{
+			var symbol_reader_provider = parameters.SymbolReaderProvider;
+
+			if (symbol_reader_provider == null && parameters.ReadSymbols)
+				symbol_reader_provider = SymbolProvider.GetPlatformReaderProvider ();
+
+			if (symbol_reader_provider != null) {
+				module.SymbolReaderProvider = symbol_reader_provider;
+
+				var reader = parameters.SymbolStream != null
+					? symbol_reader_provider.GetSymbolReader (module, parameters.SymbolStream)
+					: symbol_reader_provider.GetSymbolReader (module, module.FullyQualifiedName);
+
+				module.ReadSymbols (reader);
+			}
+		}
+
+		static ModuleDefinition ReadModule (Image image, ReaderParameters parameters)
+		{
+			var reader = CreateModuleReader (image, parameters.ReadingMode);
+			reader.ReadModule ();
+			return reader.module;
+		}
+
+		static ModuleReader CreateModuleReader (Image image, ReadingMode mode)
+		{
+			switch (mode) {
+			case ReadingMode.Immediate:
+				return new ImmediateModuleReader (image);
+			case ReadingMode.Deferred:
+				return new DeferredModuleReader (image);
+			default:
+				throw new ArgumentException ();
+			}
+		}
+	}
+
+	sealed class ImmediateModuleReader : ModuleReader {
+
+		public ImmediateModuleReader (Image image)
+			: base (image, ReadingMode.Immediate)
+		{
+		}
+
+		protected override void ReadModule ()
+		{
+			this.module.Read (this.module, (module, reader) => {
+				ReadModuleManifest (reader);
+				ReadModule (module);
+				return module;
+			});
+		}
+
+		public static void ReadModule (ModuleDefinition module)
+		{
+			if (module.HasAssemblyReferences)
+				Read (module.AssemblyReferences);
+			if (module.HasResources)
+				Read (module.Resources);
+			if (module.HasModuleReferences)
+				Read (module.ModuleReferences);
+			if (module.HasTypes)
+				ReadTypes (module.Types);
+			if (module.HasExportedTypes)
+				Read (module.ExportedTypes);
+			if (module.HasCustomAttributes)
+				Read (module.CustomAttributes);
+
+			var assembly = module.Assembly;
+			if (assembly == null)
+				return;
+
+			if (assembly.HasCustomAttributes)
+				Read (assembly.CustomAttributes);
+			if (assembly.HasSecurityDeclarations)
+				Read (assembly.SecurityDeclarations);
+		}
+
+		static void ReadTypes (Collection<TypeDefinition> types)
+		{
+			for (int i = 0; i < types.Count; i++)
+				ReadType (types [i]);
+		}
+
+		static void ReadType (TypeDefinition type)
+		{
+			ReadGenericParameters (type);
+
+			if (type.HasInterfaces)
+				Read (type.Interfaces);
+
+			if (type.HasNestedTypes)
+				ReadTypes (type.NestedTypes);
+
+			if (type.HasLayoutInfo)
+				Read (type.ClassSize);
+
+			if (type.HasFields)
+				ReadFields (type);
+
+			if (type.HasMethods)
+				ReadMethods (type);
+
+			if (type.HasProperties)
+				ReadProperties (type);
+
+			if (type.HasEvents)
+				ReadEvents (type);
+
+			ReadSecurityDeclarations (type);
+			ReadCustomAttributes (type);
+		}
+
+		static void ReadGenericParameters (IGenericParameterProvider provider)
+		{
+			if (!provider.HasGenericParameters)
+				return;
+
+			var parameters = provider.GenericParameters;
+
+			for (int i = 0; i < parameters.Count; i++) {
+				var parameter = parameters [i];
+
+				if (parameter.HasConstraints)
+					Read (parameter.Constraints);
+
+				if (parameter.HasCustomAttributes)
+					Read (parameter.CustomAttributes);
+			}
+		}
+
+		static void ReadSecurityDeclarations (ISecurityDeclarationProvider provider)
+		{
+			if (provider.HasSecurityDeclarations)
+				Read (provider.SecurityDeclarations);
+		}
+
+		static void ReadCustomAttributes (ICustomAttributeProvider provider)
+		{
+			if (provider.HasCustomAttributes)
+				Read (provider.CustomAttributes);
+		}
+
+		static void ReadFields (TypeDefinition type)
+		{
+			var fields = type.Fields;
+
+			for (int i = 0; i < fields.Count; i++) {
+				var field = fields [i];
+
+				if (field.HasConstant)
+					Read (field.Constant);
+
+				if (field.HasLayoutInfo)
+					Read (field.Offset);
+
+				if (field.RVA > 0)
+					Read (field.InitialValue);
+
+				if (field.HasMarshalInfo)
+					Read (field.MarshalInfo);
+
+				ReadCustomAttributes (field);
+			}
+		}
+
+		static void ReadMethods (TypeDefinition type)
+		{
+			var methods = type.Methods;
+
+			for (int i = 0; i < methods.Count; i++) {
+				var method = methods [i];
+
+				ReadGenericParameters (method);
+
+				if (method.HasParameters)
+					ReadParameters (method);
+
+				if (method.HasOverrides)
+					Read (method.Overrides);
+
+				if (method.IsPInvokeImpl)
+					Read (method.PInvokeInfo);
+
+				ReadSecurityDeclarations (method);
+				ReadCustomAttributes (method);
+
+				var return_type = method.MethodReturnType;
+				if (return_type.HasConstant)
+					Read (return_type.Constant);
+
+				if (return_type.HasMarshalInfo)
+					Read (return_type.MarshalInfo);
+
+				ReadCustomAttributes (return_type);
+			}
+		}
+
+		static void ReadParameters (MethodDefinition method)
+		{
+			var parameters = method.Parameters;
+
+			for (int i = 0; i < parameters.Count; i++) {
+				var parameter = parameters [i];
+
+				if (parameter.HasConstant)
+					Read (parameter.Constant);
+
+				if (parameter.HasMarshalInfo)
+					Read (parameter.MarshalInfo);
+
+				ReadCustomAttributes (parameter);
+			}
+		}
+
+		static void ReadProperties (TypeDefinition type)
+		{
+			var properties = type.Properties;
+
+			for (int i = 0; i < properties.Count; i++) {
+				var property = properties [i];
+
+				Read (property.GetMethod);
+
+				if (property.HasConstant)
+					Read (property.Constant);
+
+				ReadCustomAttributes (property);
+			}
+		}
+
+		static void ReadEvents (TypeDefinition type)
+		{
+			var events = type.Events;
+
+			for (int i = 0; i < events.Count; i++) {
+				var @event = events [i];
+
+				Read (@event.AddMethod);
+
+				ReadCustomAttributes (@event);
+			}
+		}
+
+		static void Read (object collection)
+		{
+		}
+	}
+
+	sealed class DeferredModuleReader : ModuleReader {
+
+		public DeferredModuleReader (Image image)
+			: base (image, ReadingMode.Deferred)
+		{
+		}
+
+		protected override void ReadModule ()
+		{
+			this.module.Read (this.module, (module, reader) => {
+				ReadModuleManifest (reader);
+				return module;
+			});
+		}
+	}
+
+	sealed class MetadataReader : ByteBuffer {
+
+		readonly internal Image image;
+		readonly internal ModuleDefinition module;
+		readonly internal MetadataSystem metadata;
+
+		internal IGenericContext context;
+		internal CodeReader code;
+
+		uint Position {
+			get { return (uint) base.position; }
+			set { base.position = (int) value; }
+		}
+
+		public MetadataReader (ModuleDefinition module)
+			: base (module.Image.MetadataSection.Data)
+		{
+			this.image = module.Image;
+			this.module = module;
+			this.metadata = module.MetadataSystem;
+			this.code = CodeReader.CreateCodeReader (this);
+		}
+
+		int GetCodedIndexSize (CodedIndex index)
+		{
+			return image.GetCodedIndexSize (index);
+		}
+
+		uint ReadByIndexSize (int size)
+		{
+			if (size == 4)
+				return ReadUInt32 ();
+			else
+				return ReadUInt16 ();
+		}
+
+		byte [] ReadBlob ()
+		{
+			var blob_heap = image.BlobHeap;
+			if (blob_heap == null) {
+				position += 2;
+				return Empty<byte>.Array;
+			}
+
+			return blob_heap.Read (ReadBlobIndex ());
+		}
+
+		byte [] ReadBlob (uint signature)
+		{
+			var blob_heap = image.BlobHeap;
+			if (blob_heap == null)
+				return Empty<byte>.Array;
+
+			return blob_heap.Read (signature);
+		}
+
+		uint ReadBlobIndex ()
+		{
+			var blob_heap = image.BlobHeap;
+			return ReadByIndexSize (blob_heap != null ? blob_heap.IndexSize : 2);
+		}
+
+		string ReadString ()
+		{
+			return image.StringHeap.Read (ReadByIndexSize (image.StringHeap.IndexSize));
+		}
+
+		uint ReadStringIndex ()
+		{
+			return ReadByIndexSize (image.StringHeap.IndexSize);
+		}
+
+		uint ReadTableIndex (Table table)
+		{
+			return ReadByIndexSize (image.GetTableIndexSize (table));
+		}
+
+		MetadataToken ReadMetadataToken (CodedIndex index)
+		{
+			return index.GetMetadataToken (ReadByIndexSize (GetCodedIndexSize (index)));
+		}
+
+		int MoveTo (Table table)
+		{
+			var info = image.TableHeap [table];
+			if (info.Length != 0)
+				Position = info.Offset;
+
+			return (int) info.Length;
+		}
+
+		bool MoveTo (Table table, uint row)
+		{
+			var info = image.TableHeap [table];
+			var length = info.Length;
+			if (length == 0 || row > length)
+				return false;
+
+			Position = info.Offset + (info.RowSize * (row - 1));
+			return true;
+		}
+
+		public AssemblyNameDefinition ReadAssemblyNameDefinition ()
+		{
+			if (MoveTo (Table.Assembly) == 0)
+				return null;
+
+			var name = new AssemblyNameDefinition ();
+
+			name.HashAlgorithm = (AssemblyHashAlgorithm) ReadUInt32 ();
+
+			PopulateVersionAndFlags (name);
+
+			name.PublicKey = ReadBlob ();
+
+			PopulateNameAndCulture (name);
+
+			return name;
+		}
+
+		public ModuleDefinition Populate (ModuleDefinition module)
+		{
+			if (MoveTo (Table.Module) == 0)
+				return module;
+
+			Advance (2); // Generation
+
+			module.Name = ReadString ();
+			module.Mvid = image.GuidHeap.Read (ReadByIndexSize (image.GuidHeap.IndexSize));
+
+			return module;
+		}
+
+		void InitializeAssemblyReferences ()
+		{
+			if (metadata.AssemblyReferences != null)
+				return;
+
+			int length = MoveTo (Table.AssemblyRef);
+			var references = metadata.AssemblyReferences = new AssemblyNameReference [length];
+
+			for (uint i = 0; i < length; i++) {
+				var reference = new AssemblyNameReference ();
+				reference.token = new MetadataToken (TokenType.AssemblyRef, i + 1);
+
+				PopulateVersionAndFlags (reference);
+
+				var key_or_token = ReadBlob ();
+
+				if (reference.HasPublicKey)
+					reference.PublicKey = key_or_token;
+				else
+					reference.PublicKeyToken = key_or_token;
+
+				PopulateNameAndCulture (reference);
+
+				reference.Hash = ReadBlob ();
+
+				references [i] = reference;
+			}
+		}
+
+		public Collection<AssemblyNameReference> ReadAssemblyReferences ()
+		{
+			InitializeAssemblyReferences ();
+
+			return new Collection<AssemblyNameReference> (metadata.AssemblyReferences);
+		}
+
+		public MethodDefinition ReadEntryPoint ()
+		{
+			if (module.Kind != ModuleKind.Console && module.Kind != ModuleKind.Windows)
+				return null;
+
+			var token = new MetadataToken (module.Image.EntryPointToken);
+
+			return GetMethodDefinition (token.RID);
+		}
+
+		public Collection<ModuleDefinition> ReadModules ()
+		{
+			var modules = new Collection<ModuleDefinition> (1);
+			modules.Add (this.module);
+
+			int length = MoveTo (Table.File);
+			for (uint i = 1; i <= length; i++) {
+				var attributes = (FileAttributes) ReadUInt32 ();
+				var name = ReadString ();
+				ReadBlobIndex ();
+
+				if (attributes != FileAttributes.ContainsMetaData)
+					continue;
+
+				var parameters = new ReaderParameters {
+					ReadingMode = module.ReadingMode,
+					SymbolReaderProvider = module.SymbolReaderProvider,
+				};
+
+				modules.Add (ModuleDefinition.ReadModule (
+					GetModuleFileName (name), parameters));
+			}
+
+			return modules;
+		}
+
+		string GetModuleFileName (string name)
+		{
+			if (module.FullyQualifiedName == null)
+				throw new NotSupportedException ();
+
+			var path = Path.GetDirectoryName (module.FullyQualifiedName);
+			return Path.Combine (path, name);
+		}
+
+		void InitializeModuleReferences ()
+		{
+			if (metadata.ModuleReferences != null)
+				return;
+
+			int length = MoveTo (Table.ModuleRef);
+			var references = metadata.ModuleReferences = new ModuleReference [length];
+
+			for (uint i = 0; i < length; i++) {
+				var reference = new ModuleReference (ReadString ());
+				reference.token = new MetadataToken (TokenType.ModuleRef, i + 1);
+
+				references [i] = reference;
+			}
+		}
+
+		public Collection<ModuleReference> ReadModuleReferences ()
+		{
+			InitializeModuleReferences ();
+
+			return new Collection<ModuleReference> (metadata.ModuleReferences);
+		}
+
+		public bool HasFileResource ()
+		{
+			int length = MoveTo (Table.File);
+			if (length == 0)
+				return false;
+
+			for (uint i = 1; i <= length; i++)
+				if (ReadFileRecord (i).Col1 == FileAttributes.ContainsNoMetaData)
+					return true;
+
+			return false;
+		}
+
+		public Collection<Resource> ReadResources ()
+		{
+			int length = MoveTo (Table.ManifestResource);
+			var resources = new Collection<Resource> (length);
+
+			for (int i = 1; i <= length; i++) {
+				var offset = ReadUInt32 ();
+				var flags = (ManifestResourceAttributes) ReadUInt32 ();
+				var name = ReadString ();
+				var implementation = ReadMetadataToken (CodedIndex.Implementation);
+
+				Resource resource;
+
+				if (implementation.RID == 0) {
+					resource = new EmbeddedResource (name, flags, offset, this);
+				} else if (implementation.TokenType == TokenType.AssemblyRef) {
+					resource = new AssemblyLinkedResource (name, flags) {
+						Assembly = (AssemblyNameReference) GetTypeReferenceScope (implementation),
+					};
+				} else if (implementation.TokenType == TokenType.File) {
+					var file_record = ReadFileRecord (implementation.RID);
+
+					resource = new LinkedResource (name, flags) {
+						File = file_record.Col2,
+						hash = ReadBlob (file_record.Col3)
+					};
+				} else
+					throw new NotSupportedException ();
+
+				resources.Add (resource);
+			}
+
+			return resources;
+		}
+
+		Row<FileAttributes, string, uint> ReadFileRecord (uint rid)
+		{
+			var position = this.position;
+
+			if (!MoveTo (Table.File, rid))
+				throw new ArgumentException ();
+
+			var record = new Row<FileAttributes, string, uint> (
+				(FileAttributes) ReadUInt32 (),
+				ReadString (),
+				ReadBlobIndex ());
+
+			this.position = position;
+
+			return record;
+		}
+
+		public MemoryStream GetManagedResourceStream (uint offset)
+		{
+			var rva = image.Resources.VirtualAddress;
+			var section = image.GetSectionAtVirtualAddress (rva);
+			var position = (rva - section.VirtualAddress) + offset;
+			var buffer = section.Data;
+
+			var length = buffer [position]
+				| (buffer [position + 1] << 8)
+				| (buffer [position + 2] << 16)
+				| (buffer [position + 3] << 24);
+
+			return new MemoryStream (buffer, (int) position + 4, length);
+		}
+
+		void PopulateVersionAndFlags (AssemblyNameReference name)
+		{
+			name.Version = new Version (
+				ReadUInt16 (),
+				ReadUInt16 (),
+				ReadUInt16 (),
+				ReadUInt16 ());
+
+			name.Attributes = (AssemblyAttributes) ReadUInt32 ();
+		}
+
+		void PopulateNameAndCulture (AssemblyNameReference name)
+		{
+			name.Name = ReadString ();
+			name.Culture = ReadString ();
+		}
+
+		public TypeDefinitionCollection ReadTypes ()
+		{
+			InitializeTypeDefinitions ();
+			var mtypes = metadata.Types;
+			var type_count = mtypes.Length - metadata.NestedTypes.Count;
+			var types = new TypeDefinitionCollection (module, type_count);
+
+			for (int i = 0; i < mtypes.Length; i++) {
+				var type = mtypes [i];
+				if (IsNested (type.Attributes))
+					continue;
+
+				types.Add (type);
+			}
+
+			return types;
+		}
+
+		void InitializeTypeDefinitions ()
+		{
+			if (metadata.Types != null)
+				return;
+
+			InitializeNestedTypes ();
+			InitializeFields ();
+			InitializeMethods ();
+
+			int length = MoveTo (Table.TypeDef);
+			var types = metadata.Types = new TypeDefinition [length];
+
+			for (uint i = 0; i < length; i++) {
+				if (types [i] != null)
+					continue;
+
+				types [i] = ReadType (i + 1);
+			}
+		}
+
+		static bool IsNested (TypeAttributes attributes)
+		{
+			switch (attributes & TypeAttributes.VisibilityMask) {
+			case TypeAttributes.NestedAssembly:
+			case TypeAttributes.NestedFamANDAssem:
+			case TypeAttributes.NestedFamily:
+			case TypeAttributes.NestedFamORAssem:
+			case TypeAttributes.NestedPrivate:
+			case TypeAttributes.NestedPublic:
+				return true;
+			default:
+				return false;
+			}
+		}
+
+		public bool HasNestedTypes (TypeDefinition type)
+		{
+			uint [] mapping;
+			InitializeNestedTypes ();
+
+			if (!metadata.TryGetNestedTypeMapping (type, out mapping))
+				return false;
+
+			return mapping.Length > 0;
+		}
+
+		public Collection<TypeDefinition> ReadNestedTypes (TypeDefinition type)
+		{
+			InitializeNestedTypes ();
+			uint [] mapping;
+			if (!metadata.TryGetNestedTypeMapping (type, out mapping))
+				return new MemberDefinitionCollection<TypeDefinition> (type);
+
+			var nested_types = new MemberDefinitionCollection<TypeDefinition> (type, mapping.Length);
+
+			for (int i = 0; i < mapping.Length; i++)
+				nested_types.Add (GetTypeDefinition (mapping [i]));
+
+			metadata.RemoveNestedTypeMapping (type);
+
+			return nested_types;
+		}
+
+		void InitializeNestedTypes ()
+		{
+			if (metadata.NestedTypes != null)
+				return;
+
+			var length = MoveTo (Table.NestedClass);
+
+			metadata.NestedTypes = new Dictionary<uint, uint []> (length);
+			metadata.ReverseNestedTypes = new Dictionary<uint, uint> (length);
+
+			if (length == 0)
+				return;
+
+			for (int i = 1; i <= length; i++) {
+				var nested = ReadTableIndex (Table.TypeDef);
+				var declaring = ReadTableIndex (Table.TypeDef);
+
+				AddNestedMapping (declaring, nested);
+			}
+		}
+
+		void AddNestedMapping (uint declaring, uint nested)
+		{
+			metadata.SetNestedTypeMapping (declaring, AddMapping (metadata.NestedTypes, declaring, nested));
+			metadata.SetReverseNestedTypeMapping (nested, declaring);
+		}
+
+		static TValue [] AddMapping<TKey, TValue> (Dictionary<TKey, TValue []> cache, TKey key, TValue value)
+		{
+			TValue [] mapped;
+			if (!cache.TryGetValue (key, out mapped)) {
+				mapped = new [] { value };
+				return mapped;
+			}
+
+			var new_mapped = new TValue [mapped.Length + 1];
+			Array.Copy (mapped, new_mapped, mapped.Length);
+			new_mapped [mapped.Length] = value;
+			return new_mapped;
+		}
+
+		TypeDefinition ReadType (uint rid)
+		{
+			if (!MoveTo (Table.TypeDef, rid))
+				return null;
+
+			var attributes = (TypeAttributes) ReadUInt32 ();
+			var name = ReadString ();
+			var @namespace = ReadString ();
+			var type = new TypeDefinition (@namespace, name, attributes);
+			type.token = new MetadataToken (TokenType.TypeDef, rid);
+			type.scope = module;
+			type.module = module;
+
+			metadata.AddTypeDefinition (type);
+
+			this.context = type;
+
+			type.BaseType = GetTypeDefOrRef (ReadMetadataToken (CodedIndex.TypeDefOrRef));
+
+			type.fields_range = ReadFieldsRange (rid);
+			type.methods_range = ReadMethodsRange (rid);
+
+			if (IsNested (attributes))
+				type.DeclaringType = GetNestedTypeDeclaringType (type);
+
+			return type;
+		}
+
+		TypeDefinition GetNestedTypeDeclaringType (TypeDefinition type)
+		{
+			uint declaring_rid;
+			if (!metadata.TryGetReverseNestedTypeMapping (type, out declaring_rid))
+				return null;
+
+			metadata.RemoveReverseNestedTypeMapping (type);
+			return GetTypeDefinition (declaring_rid);
+		}
+
+		Range ReadFieldsRange (uint type_index)
+		{
+			return ReadListRange (type_index, Table.TypeDef, Table.Field);
+		}
+
+		Range ReadMethodsRange (uint type_index)
+		{
+			return ReadListRange (type_index, Table.TypeDef, Table.Method);
+		}
+
+		Range ReadListRange (uint current_index, Table current, Table target)
+		{
+			var list = new Range ();
+
+			list.Start = ReadTableIndex (target);
+
+			uint next_index;
+			var current_table = image.TableHeap [current];
+
+			if (current_index == current_table.Length)
+				next_index = image.TableHeap [target].Length + 1;
+			else {
+				var position = Position;
+				Position += (uint) (current_table.RowSize - image.GetTableIndexSize (target));
+				next_index = ReadTableIndex (target);
+				Position = position;
+			}
+
+			list.Length = next_index - list.Start;
+
+			return list;
+		}
+
+		public Row<short, int> ReadTypeLayout (TypeDefinition type)
+		{
+			InitializeTypeLayouts ();
+			Row<ushort, uint> class_layout;
+			var rid = type.token.RID;
+			if (!metadata.ClassLayouts.TryGetValue (rid, out class_layout))
+				return new Row<short, int> (Mixin.NoDataMarker, Mixin.NoDataMarker);
+
+			type.PackingSize = (short) class_layout.Col1;
+			type.ClassSize = (int) class_layout.Col2;
+
+			metadata.ClassLayouts.Remove (rid);
+
+			return new Row<short, int> ((short) class_layout.Col1, (int) class_layout.Col2);
+		}
+
+		void InitializeTypeLayouts ()
+		{
+			if (metadata.ClassLayouts != null)
+				return;
+
+			int length = MoveTo (Table.ClassLayout);
+
+			var class_layouts = metadata.ClassLayouts = new Dictionary<uint, Row<ushort, uint>> (length);
+
+			for (uint i = 0; i < length; i++) {
+				var packing_size = ReadUInt16 ();
+				var class_size = ReadUInt32 ();
+
+				var parent = ReadTableIndex (Table.TypeDef);
+
+				class_layouts.Add (parent, new Row<ushort, uint> (packing_size, class_size));
+			}
+		}
+
+		public TypeReference GetTypeDefOrRef (MetadataToken token)
+		{
+			return (TypeReference) LookupToken (token);
+		}
+
+		public TypeDefinition GetTypeDefinition (uint rid)
+		{
+			InitializeTypeDefinitions ();
+
+			var type = metadata.GetTypeDefinition (rid);
+			if (type != null)
+				return type;
+
+			return ReadTypeDefinition (rid);
+		}
+
+		TypeDefinition ReadTypeDefinition (uint rid)
+		{
+			if (!MoveTo (Table.TypeDef, rid))
+				return null;
+
+			return ReadType (rid);
+		}
+
+		void InitializeTypeReferences ()
+		{
+			if (metadata.TypeReferences != null)
+				return;
+
+			metadata.TypeReferences = new TypeReference [image.GetTableLength (Table.TypeRef)];
+		}
+
+		public TypeReference GetTypeReference (string scope, string full_name)
+		{
+			InitializeTypeReferences ();
+
+			var length = metadata.TypeReferences.Length;
+
+			for (uint i = 1; i <= length; i++) {
+				var type = GetTypeReference (i);
+
+				if (type.FullName != full_name)
+					continue;
+
+				if (string.IsNullOrEmpty (scope))
+					return type;
+
+				if (type.Scope.Name == scope)
+					return type;
+			}
+
+			return null;
+		}
+
+		TypeReference GetTypeReference (uint rid)
+		{
+			InitializeTypeReferences ();
+
+			var type = metadata.GetTypeReference (rid);
+			if (type != null)
+				return type;
+
+			return ReadTypeReference (rid);
+		}
+
+		TypeReference ReadTypeReference (uint rid)
+		{
+			if (!MoveTo (Table.TypeRef, rid))
+				return null;
+
+			TypeReference declaring_type = null;
+			IMetadataScope scope;
+
+			var scope_token = ReadMetadataToken (CodedIndex.ResolutionScope);
+
+			var name = ReadString ();
+			var @namespace = ReadString ();
+
+			var type = new TypeReference (
+				@namespace,
+				name,
+				module,
+				null);
+
+			type.token = new MetadataToken (TokenType.TypeRef, rid);
+
+			metadata.AddTypeReference (type);
+
+			if (scope_token.TokenType == TokenType.TypeRef) {
+				declaring_type = GetTypeDefOrRef (scope_token);
+
+				scope = declaring_type != null
+					? declaring_type.Scope
+					: module;
+			} else
+				scope = GetTypeReferenceScope (scope_token);
+
+			type.scope = scope;
+			type.DeclaringType = declaring_type;
+
+			MetadataSystem.TryProcessPrimitiveType (type);
+
+			return type;
+		}
+
+		IMetadataScope GetTypeReferenceScope (MetadataToken scope)
+		{
+			switch (scope.TokenType) {
+			case TokenType.AssemblyRef:
+				InitializeAssemblyReferences ();
+				return metadata.AssemblyReferences [(int) scope.RID - 1];
+			case TokenType.ModuleRef:
+				InitializeModuleReferences ();
+				return metadata.ModuleReferences [(int) scope.RID - 1];
+			case TokenType.Module:
+				return module;
+			default:
+				throw new NotSupportedException ();
+			}
+		}
+
+		public IEnumerable<TypeReference> GetTypeReferences ()
+		{
+			InitializeTypeReferences ();
+
+			var length = image.GetTableLength (Table.TypeRef);
+
+			var type_references = new TypeReference [length];
+
+			for (uint i = 1; i <= length; i++)
+				type_references [i - 1] = GetTypeReference (i);
+
+			return type_references;
+		}
+
+		TypeReference GetTypeSpecification (uint rid)
+		{
+			if (!MoveTo (Table.TypeSpec, rid))
+				return null;
+
+			var reader = ReadSignature (ReadBlobIndex ());
+			var type = reader.ReadTypeSignature ();
+			if (type.token.RID == 0)
+				type.token = new MetadataToken (TokenType.TypeSpec, rid);
+
+			return type;
+		}
+
+		SignatureReader ReadSignature (uint signature)
+		{
+			return new SignatureReader (signature, this);
+		}
+
+		public bool HasInterfaces (TypeDefinition type)
+		{
+			InitializeInterfaces ();
+			MetadataToken [] mapping;
+
+			return metadata.TryGetInterfaceMapping (type, out mapping);
+		}
+
+		public Collection<TypeReference> ReadInterfaces (TypeDefinition type)
+		{
+			InitializeInterfaces ();
+			MetadataToken [] mapping;
+
+			if (!metadata.TryGetInterfaceMapping (type, out mapping))
+				return new Collection<TypeReference> ();
+
+			var interfaces = new Collection<TypeReference> (mapping.Length);
+
+			this.context = type;
+
+			for (int i = 0; i < mapping.Length; i++)
+				interfaces.Add (GetTypeDefOrRef (mapping [i]));
+
+			metadata.RemoveInterfaceMapping (type);
+
+			return interfaces;
+		}
+
+		void InitializeInterfaces ()
+		{
+			if (metadata.Interfaces != null)
+				return;
+
+			int length = MoveTo (Table.InterfaceImpl);
+
+			metadata.Interfaces = new Dictionary<uint, MetadataToken []> (length);
+
+			for (int i = 0; i < length; i++) {
+				var type = ReadTableIndex (Table.TypeDef);
+				var @interface = ReadMetadataToken (CodedIndex.TypeDefOrRef);
+
+				AddInterfaceMapping (type, @interface);
+			}
+		}
+
+		void AddInterfaceMapping (uint type, MetadataToken @interface)
+		{
+			metadata.SetInterfaceMapping (type, AddMapping (metadata.Interfaces, type, @interface));
+		}
+
+		public Collection<FieldDefinition> ReadFields (TypeDefinition type)
+		{
+			var fields_range = type.fields_range;
+			if (fields_range.Length == 0)
+				return new MemberDefinitionCollection<FieldDefinition> (type);
+
+			var fields = new MemberDefinitionCollection<FieldDefinition> (type, (int) fields_range.Length);
+			this.context = type;
+
+			MoveTo (Table.Field, fields_range.Start);
+			for (uint i = 0; i < fields_range.Length; i++)
+				fields.Add (ReadField (fields_range.Start + i));
+
+			return fields;
+		}
+
+		FieldDefinition ReadField (uint field_rid)
+		{
+			var attributes = (FieldAttributes) ReadUInt16 ();
+			var name = ReadString ();
+			var signature = ReadBlobIndex ();
+
+			var field = new FieldDefinition (name, attributes, ReadFieldType (signature));
+			field.token = new MetadataToken (TokenType.Field, field_rid);
+			metadata.AddFieldDefinition (field);
+
+			return field;
+		}
+
+		void InitializeFields ()
+		{
+			if (metadata.Fields != null)
+				return;
+
+			metadata.Fields = new FieldDefinition [image.GetTableLength (Table.Field)];
+		}
+
+		TypeReference ReadFieldType (uint signature)
+		{
+			var reader = ReadSignature (signature);
+
+			const byte field_sig = 0x6;
+
+			if (reader.ReadByte () != field_sig)
+				throw new NotSupportedException ();
+
+			return reader.ReadTypeSignature ();
+		}
+
+		public int ReadFieldRVA (FieldDefinition field)
+		{
+			InitializeFieldRVAs ();
+			var rid = field.token.RID;
+
+			RVA rva;
+			if (!metadata.FieldRVAs.TryGetValue (rid, out rva))
+				return 0;
+
+			var size = GetFieldTypeSize (field.FieldType);
+
+			if (size == 0 || rva == 0)
+				return 0;
+
+			metadata.FieldRVAs.Remove (rid);
+
+			field.InitialValue = GetFieldInitializeValue (size, rva);
+
+			return (int) rva;
+		}
+
+		byte [] GetFieldInitializeValue (int size, RVA rva)
+		{
+			var section = image.GetSectionAtVirtualAddress (rva);
+			if (section == null)
+				return Empty<byte>.Array;
+
+			var value = new byte [size];
+			Buffer.BlockCopy (section.Data, (int) (rva - section.VirtualAddress), value, 0, size);
+			return value;
+		}
+
+		static int GetFieldTypeSize (TypeReference type)
+		{
+			int size = 0;
+
+			switch (type.etype) {
+			case ElementType.Boolean:
+			case ElementType.U1:
+			case ElementType.I1:
+				size = 1;
+				break;
+			case ElementType.U2:
+			case ElementType.I2:
+			case ElementType.Char:
+				size = 2;
+				break;
+			case ElementType.U4:
+			case ElementType.I4:
+			case ElementType.R4:
+				size = 4;
+				break;
+			case ElementType.U8:
+			case ElementType.I8:
+			case ElementType.R8:
+				size = 8;
+				break;
+			case ElementType.Ptr:
+			case ElementType.FnPtr:
+				size = IntPtr.Size;
+				break;
+			case ElementType.CModOpt:
+			case ElementType.CModReqD:
+				return GetFieldTypeSize (((IModifierType) type).ElementType);
+			default:
+				var field_type = type.CheckedResolve ();
+				if (field_type.HasLayoutInfo)
+					size = field_type.ClassSize;
+
+				break;
+			}
+
+			return size;
+		}
+
+		void InitializeFieldRVAs ()
+		{
+			if (metadata.FieldRVAs != null)
+				return;
+
+			int length = MoveTo (Table.FieldRVA);
+
+			var field_rvas = metadata.FieldRVAs = new Dictionary<uint, uint> (length);
+
+			for (int i = 0; i < length; i++) {
+				var rva = ReadUInt32 ();
+				var field = ReadTableIndex (Table.Field);
+
+				field_rvas.Add (field, rva);
+			}
+		}
+
+		public int ReadFieldLayout (FieldDefinition field)
+		{
+			InitializeFieldLayouts ();
+			var rid = field.token.RID;
+			uint offset;
+			if (!metadata.FieldLayouts.TryGetValue (rid, out offset))
+				return Mixin.NoDataMarker;
+
+			metadata.FieldLayouts.Remove (rid);
+
+			return (int) offset;
+		}
+
+		void InitializeFieldLayouts ()
+		{
+			if (metadata.FieldLayouts != null)
+				return;
+
+			int length = MoveTo (Table.FieldLayout);
+
+			var field_layouts = metadata.FieldLayouts = new Dictionary<uint, uint> (length);
+
+			for (int i = 0; i < length; i++) {
+				var offset = ReadUInt32 ();
+				var field = ReadTableIndex (Table.Field);
+
+				field_layouts.Add (field, offset);
+			}
+		}
+
+		public bool HasEvents (TypeDefinition type)
+		{
+			InitializeEvents ();
+
+			Range range;
+			if (!metadata.TryGetEventsRange (type, out range))
+				return false;
+
+			return range.Length > 0;
+		}
+
+		public Collection<EventDefinition> ReadEvents (TypeDefinition type)
+		{
+			InitializeEvents ();
+			Range range;
+
+			if (!metadata.TryGetEventsRange (type, out range))
+				return new MemberDefinitionCollection<EventDefinition> (type);
+
+			var events = new MemberDefinitionCollection<EventDefinition> (type, (int) range.Length);
+
+			metadata.RemoveEventsRange (type);
+
+			if (range.Length == 0 || !MoveTo (Table.Event, range.Start))
+				return events;
+
+			this.context = type;
+
+			for (uint i = 0; i < range.Length; i++)
+				events.Add (ReadEvent (range.Start + i));
+
+			return events;
+		}
+
+		EventDefinition ReadEvent (uint event_rid)
+		{
+			var attributes = (EventAttributes) ReadUInt16 ();
+			var name = ReadString ();
+			var event_type = GetTypeDefOrRef (ReadMetadataToken (CodedIndex.TypeDefOrRef));
+
+			var @event = new EventDefinition (name, attributes, event_type);
+			@event.token = new MetadataToken (TokenType.Event, event_rid);
+			return @event;
+		}
+
+		void InitializeEvents ()
+		{
+			if (metadata.Events != null)
+				return;
+
+			int length = MoveTo (Table.EventMap);
+
+			metadata.Events = new Dictionary<uint, Range> (length);
+
+			for (uint i = 1; i <= length; i++) {
+				var type_rid = ReadTableIndex (Table.TypeDef);
+				Range events_range = ReadEventsRange (i);
+				metadata.AddEventsRange (type_rid, events_range);
+			}
+		}
+
+		Range ReadEventsRange (uint rid)
+		{
+			return ReadListRange (rid, Table.EventMap, Table.Event);
+		}
+
+		public bool HasProperties (TypeDefinition type)
+		{
+			InitializeProperties ();
+
+			Range range;
+			if (!metadata.TryGetPropertiesRange (type, out range))
+				return false;
+
+			return range.Length > 0;
+		}
+
+		public Collection<PropertyDefinition> ReadProperties (TypeDefinition type)
+		{
+			InitializeProperties ();
+
+			Range range;
+
+			if (!metadata.TryGetPropertiesRange (type, out range))
+				return new MemberDefinitionCollection<PropertyDefinition> (type);
+
+			metadata.RemovePropertiesRange (type);
+
+			var properties = new MemberDefinitionCollection<PropertyDefinition> (type, (int) range.Length);
+
+			if (range.Length == 0 || !MoveTo (Table.Property, range.Start))
+				return properties;
+
+			this.context = type;
+
+			for (uint i = 0; i < range.Length; i++)
+				properties.Add (ReadProperty (range.Start + i));
+
+			return properties;
+		}
+
+		PropertyDefinition ReadProperty (uint property_rid)
+		{
+			var attributes = (PropertyAttributes) ReadUInt16 ();
+			var name = ReadString ();
+			var signature = ReadBlobIndex ();
+
+			var reader = ReadSignature (signature);
+			const byte property_signature = 0x8;
+
+			var calling_convention = reader.ReadByte ();
+
+			if ((calling_convention & property_signature) == 0)
+				throw new NotSupportedException ();
+
+			var has_this = (calling_convention & 0x20) != 0;
+
+			reader.ReadCompressedUInt32 (); // count
+
+			var property = new PropertyDefinition (name, attributes, reader.ReadTypeSignature ());
+			property.HasThis = has_this;
+			property.token = new MetadataToken (TokenType.Property, property_rid);
+
+			return property;
+		}
+
+		void InitializeProperties ()
+		{
+			if (metadata.Properties != null)
+				return;
+
+			int length = MoveTo (Table.PropertyMap);
+
+			metadata.Properties = new Dictionary<uint, Range> (length);
+
+			for (uint i = 1; i <= length; i++) {
+				var type_rid = ReadTableIndex (Table.TypeDef);
+				var properties_range = ReadPropertiesRange (i);
+				metadata.AddPropertiesRange (type_rid, properties_range);
+			}
+		}
+
+		Range ReadPropertiesRange (uint rid)
+		{
+			return ReadListRange (rid, Table.PropertyMap, Table.Property);
+		}
+
+		MethodSemanticsAttributes ReadMethodSemantics (MethodDefinition method)
+		{
+			InitializeMethodSemantics ();
+			Row<MethodSemanticsAttributes, MetadataToken> row;
+			if (!metadata.Semantics.TryGetValue (method.token.RID, out row))
+				return MethodSemanticsAttributes.None;
+
+			var type = method.DeclaringType;
+
+			switch (row.Col1) {
+			case MethodSemanticsAttributes.AddOn:
+				GetEvent (type, row.Col2).add_method = method;
+				break;
+			case MethodSemanticsAttributes.Fire:
+				GetEvent (type, row.Col2).invoke_method = method;
+				break;
+			case MethodSemanticsAttributes.RemoveOn:
+				GetEvent (type, row.Col2).remove_method = method;
+				break;
+			case MethodSemanticsAttributes.Getter:
+				GetProperty (type, row.Col2).get_method = method;
+				break;
+			case MethodSemanticsAttributes.Setter:
+				GetProperty (type, row.Col2).set_method = method;
+				break;
+			case MethodSemanticsAttributes.Other:
+				switch (row.Col2.TokenType) {
+				case TokenType.Event: {
+					var @event = GetEvent (type, row.Col2);
+					if (@event.other_methods == null)
+						@event.other_methods = new Collection<MethodDefinition> ();
+
+					@event.other_methods.Add (method);
+					break;
+				}
+				case TokenType.Property: {
+					var property = GetProperty (type, row.Col2);
+					if (property.other_methods == null)
+						property.other_methods = new Collection<MethodDefinition> ();
+
+					property.other_methods.Add (method);
+
+					break;
+				}
+				default:
+					throw new NotSupportedException ();
+				}
+				break;
+			default:
+				throw new NotSupportedException ();
+			}
+
+			metadata.Semantics.Remove (method.token.RID);
+
+			return row.Col1;
+		}
+
+		static EventDefinition GetEvent (TypeDefinition type, MetadataToken token)
+		{
+			if (token.TokenType != TokenType.Event)
+				throw new ArgumentException ();
+
+			return GetMember (type.Events, token);
+		}
+
+		static PropertyDefinition GetProperty (TypeDefinition type, MetadataToken token)
+		{
+			if (token.TokenType != TokenType.Property)
+				throw new ArgumentException ();
+
+			return GetMember (type.Properties, token);
+		}
+
+		static TMember GetMember<TMember> (Collection<TMember> members, MetadataToken token) where TMember : IMemberDefinition
+		{
+			for (int i = 0; i < members.Count; i++) {
+				var member = members [i];
+				if (member.MetadataToken == token)
+					return member;
+			}
+
+			throw new ArgumentException ();
+		}
+
+		void InitializeMethodSemantics ()
+		{
+			if (metadata.Semantics != null)
+				return;
+
+			int length = MoveTo (Table.MethodSemantics);
+
+			var semantics = metadata.Semantics = new Dictionary<uint, Row<MethodSemanticsAttributes, MetadataToken>> (0);
+
+			for (uint i = 0; i < length; i++) {
+				var attributes = (MethodSemanticsAttributes) ReadUInt16 ();
+				var method_rid = ReadTableIndex (Table.Method);
+				var association = ReadMetadataToken (CodedIndex.HasSemantics);
+
+				semantics [method_rid] = new Row<MethodSemanticsAttributes, MetadataToken> (attributes, association);
+			}
+		}
+
+		public PropertyDefinition ReadMethods (PropertyDefinition property)
+		{
+			ReadAllSemantics (property.DeclaringType);
+			return property;
+		}
+
+		public EventDefinition ReadMethods (EventDefinition @event)
+		{
+			ReadAllSemantics (@event.DeclaringType);
+			return @event;
+		}
+
+		public MethodSemanticsAttributes ReadAllSemantics (MethodDefinition method)
+		{
+			ReadAllSemantics (method.DeclaringType);
+
+			return method.SemanticsAttributes;
+		}
+
+		void ReadAllSemantics (TypeDefinition type)
+		{
+			var methods = type.Methods;
+			for (int i = 0; i < methods.Count; i++) {
+				var method = methods [i];
+				if (method.sem_attrs.HasValue)
+					continue;
+
+				method.sem_attrs = ReadMethodSemantics (method);
+			}
+		}
+
+		Range ReadParametersRange (uint method_rid)
+		{
+			return ReadListRange (method_rid, Table.Method, Table.Param);
+		}
+
+		public Collection<MethodDefinition> ReadMethods (TypeDefinition type)
+		{
+			var methods_range = type.methods_range;
+			if (methods_range.Length == 0)
+				return new MemberDefinitionCollection<MethodDefinition> (type);
+
+			var methods = new MemberDefinitionCollection<MethodDefinition> (type, (int) methods_range.Length);
+
+			MoveTo (Table.Method, methods_range.Start);
+			for (uint i = 0; i < methods_range.Length; i++)
+				ReadMethod (methods_range.Start + i, methods);
+
+			return methods;
+		}
+
+		void InitializeMethods ()
+		{
+			if (metadata.Methods != null)
+				return;
+
+			metadata.Methods = new MethodDefinition [image.GetTableLength (Table.Method)];
+		}
+
+		void ReadMethod (uint method_rid, Collection<MethodDefinition> methods)
+		{
+			var method = new MethodDefinition ();
+			method.rva = ReadUInt32 ();
+			method.ImplAttributes = (MethodImplAttributes) ReadUInt16 ();
+			method.Attributes = (MethodAttributes) ReadUInt16 ();
+			method.Name = ReadString ();
+			method.token = new MetadataToken (TokenType.Method, method_rid);
+
+			methods.Add (method); // attach method
+
+			var signature = ReadBlobIndex ();
+			var param_range = ReadParametersRange (method_rid);
+
+			this.context = method;
+
+			ReadMethodSignature (signature, method);
+			metadata.AddMethodDefinition (method);
+
+			if (param_range.Length == 0)
+				return;
+
+			var position = base.position;
+			ReadParameters (method, param_range);
+			base.position = position;
+		}
+
+		void ReadParameters (MethodDefinition method, Range param_range)
+		{
+			MoveTo (Table.Param, param_range.Start);
+			for (uint i = 0; i < param_range.Length; i++) {
+				var attributes = (ParameterAttributes) ReadUInt16 ();
+				var sequence = ReadUInt16 ();
+				var name = ReadString ();
+
+				var parameter = sequence == 0
+					? method.MethodReturnType.Parameter
+					: method.Parameters [sequence - 1];
+
+				parameter.token = new MetadataToken (TokenType.Param, param_range.Start + i);
+				parameter.Name = name;
+				parameter.Attributes = attributes;
+			}
+		}
+
+		void ReadMethodSignature (uint signature, IMethodSignature method)
+		{
+			var reader = ReadSignature (signature);
+			reader.ReadMethodSignature (method);
+		}
+
+		public PInvokeInfo ReadPInvokeInfo (MethodDefinition method)
+		{
+			InitializePInvokes ();
+			Row<PInvokeAttributes, uint, uint> row;
+
+			var rid = method.token.RID;
+
+			if (!metadata.PInvokes.TryGetValue (rid, out row))
+				return null;
+
+			metadata.PInvokes.Remove (rid);
+
+			return new PInvokeInfo (
+				row.Col1,
+				image.StringHeap.Read (row.Col2),
+				module.ModuleReferences [(int) row.Col3 - 1]);
+		}
+
+		void InitializePInvokes ()
+		{
+			if (metadata.PInvokes != null)
+				return;
+
+			int length = MoveTo (Table.ImplMap);
+
+			var pinvokes = metadata.PInvokes = new Dictionary<uint, Row<PInvokeAttributes, uint, uint>> (length);
+
+			for (int i = 1; i <= length; i++) {
+				var attributes = (PInvokeAttributes) ReadUInt16 ();
+				var method = ReadMetadataToken (CodedIndex.MemberForwarded);
+				var name = ReadStringIndex ();
+				var scope = ReadTableIndex (Table.File);
+
+				if (method.TokenType != TokenType.Method)
+					continue;
+
+				pinvokes.Add (method.RID, new Row<PInvokeAttributes, uint, uint> (attributes, name, scope));
+			}
+		}
+
+		public bool HasGenericParameters (IGenericParameterProvider provider)
+		{
+			InitializeGenericParameters ();
+
+			Range range;
+			if (!metadata.TryGetGenericParameterRange (provider, out range))
+				return false;
+
+			return range.Length > 0;
+		}
+
+		public Collection<GenericParameter> ReadGenericParameters (IGenericParameterProvider provider)
+		{
+			InitializeGenericParameters ();
+
+			Range range;
+			if (!metadata.TryGetGenericParameterRange (provider, out range)
+				|| !MoveTo (Table.GenericParam, range.Start))
+				return new Collection<GenericParameter> ();
+
+			metadata.RemoveGenericParameterRange (provider);
+
+			var generic_parameters = new Collection<GenericParameter> ((int) range.Length);
+
+			for (uint i = 0; i < range.Length; i++) {
+				ReadUInt16 (); // index
+				var flags = (GenericParameterAttributes) ReadUInt16 ();
+				ReadMetadataToken (CodedIndex.TypeOrMethodDef);
+				var name = ReadString ();
+
+				var parameter = new GenericParameter (name, provider);
+				parameter.token = new MetadataToken (TokenType.GenericParam, range.Start + i);
+				parameter.Attributes = flags;
+
+				generic_parameters.Add (parameter);
+			}
+
+			return generic_parameters;
+		}
+
+		void InitializeGenericParameters ()
+		{
+			if (metadata.GenericParameters != null)
+				return;
+
+			metadata.GenericParameters = InitializeRanges (
+				Table.GenericParam, () => {
+					Advance (4);
+					var next = ReadMetadataToken (CodedIndex.TypeOrMethodDef);
+					ReadStringIndex ();
+					return next;
+			});
+		}
+
+		Dictionary<MetadataToken, Range> InitializeRanges (Table table, Func<MetadataToken> get_next)
+		{
+			int length = MoveTo (table);
+			var ranges = new Dictionary<MetadataToken, Range> (length);
+
+			if (length == 0)
+				return ranges;
+
+			MetadataToken owner = MetadataToken.Zero;
+			Range range = new Range (1, 0);
+
+			for (uint i = 1; i <= length; i++) {
+				var next = get_next ();
+
+				if (i == 1) {
+					owner = next;
+					range.Length++;
+				} else if (next != owner) {
+					if (owner.RID != 0)
+						ranges.Add (owner, range);
+					range = new Range (i, 1);
+					owner = next;
+				} else
+					range.Length++;
+			}
+
+			if (owner != MetadataToken.Zero)
+				ranges.Add (owner, range);
+
+			return ranges;
+		}
+
+		public bool HasGenericConstraints (GenericParameter generic_parameter)
+		{
+			InitializeGenericConstraints ();
+
+			MetadataToken [] mapping;
+			if (!metadata.TryGetGenericConstraintMapping (generic_parameter, out mapping))
+				return false;
+
+			return mapping.Length > 0;
+		}
+
+		public Collection<TypeReference> ReadGenericConstraints (GenericParameter generic_parameter)
+		{
+			InitializeGenericConstraints ();
+
+			MetadataToken [] mapping;
+			if (!metadata.TryGetGenericConstraintMapping (generic_parameter, out mapping))
+				return new Collection<TypeReference> ();
+
+			var constraints = new Collection<TypeReference> (mapping.Length);
+
+			this.context = (IGenericContext) generic_parameter.Owner;
+
+			for (int i = 0; i < mapping.Length; i++)
+				constraints.Add (GetTypeDefOrRef (mapping [i]));
+
+			metadata.RemoveGenericConstraintMapping (generic_parameter);
+
+			return constraints;
+		}
+
+		void InitializeGenericConstraints ()
+		{
+			if (metadata.GenericConstraints != null)
+				return;
+
+			var length = MoveTo (Table.GenericParamConstraint);
+
+			metadata.GenericConstraints = new Dictionary<uint, MetadataToken []> (length);
+
+			for (int i = 1; i <= length; i++)
+				AddGenericConstraintMapping (
+					ReadTableIndex (Table.GenericParam),
+					ReadMetadataToken (CodedIndex.TypeDefOrRef));
+		}
+
+		void AddGenericConstraintMapping (uint generic_parameter, MetadataToken constraint)
+		{
+			metadata.SetGenericConstraintMapping (
+				generic_parameter,
+				AddMapping (metadata.GenericConstraints, generic_parameter, constraint));
+		}
+
+		public bool HasOverrides (MethodDefinition method)
+		{
+			InitializeOverrides ();
+			MetadataToken [] mapping;
+
+			if (!metadata.TryGetOverrideMapping (method, out mapping))
+				return false;
+
+			return mapping.Length > 0;
+		}
+
+		public Collection<MethodReference> ReadOverrides (MethodDefinition method)
+		{
+			InitializeOverrides ();
+
+			MetadataToken [] mapping;
+			if (!metadata.TryGetOverrideMapping (method, out mapping))
+				return new Collection<MethodReference> ();
+
+			var overrides = new Collection<MethodReference> (mapping.Length);
+
+			this.context = method;
+
+			for (int i = 0; i < mapping.Length; i++)
+				overrides.Add ((MethodReference) LookupToken (mapping [i]));
+
+			metadata.RemoveOverrideMapping (method);
+
+			return overrides;
+		}
+
+		void InitializeOverrides ()
+		{
+			if (metadata.Overrides != null)
+				return;
+
+			var length = MoveTo (Table.MethodImpl);
+
+			metadata.Overrides = new Dictionary<uint, MetadataToken []> (length);
+
+			for (int i = 1; i <= length; i++) {
+				ReadTableIndex (Table.TypeDef);
+
+				var method = ReadMetadataToken (CodedIndex.MethodDefOrRef);
+				if (method.TokenType != TokenType.Method)
+					throw new NotSupportedException ();
+
+				var @override = ReadMetadataToken (CodedIndex.MethodDefOrRef);
+
+				AddOverrideMapping (method.RID, @override);
+			}
+		}
+
+		void AddOverrideMapping (uint method_rid, MetadataToken @override)
+		{
+			metadata.SetOverrideMapping (
+				method_rid,
+				AddMapping (metadata.Overrides, method_rid, @override));
+		}
+
+		public MethodBody ReadMethodBody (MethodDefinition method)
+		{
+			return code.ReadMethodBody (method);
+		}
+
+		public CallSite ReadCallSite (MetadataToken token)
+		{
+			if (!MoveTo (Table.StandAloneSig, token.RID))
+				return null;
+
+			var signature = ReadBlobIndex ();
+
+			var call_site = new CallSite ();
+
+			ReadMethodSignature (signature, call_site);
+
+			call_site.MetadataToken = token;
+
+			return call_site;
+		}
+
+		public VariableDefinitionCollection ReadVariables (MetadataToken local_var_token)
+		{
+			if (!MoveTo (Table.StandAloneSig, local_var_token.RID))
+				return null;
+
+			var reader = ReadSignature (ReadBlobIndex ());
+			const byte local_sig = 0x7;
+
+			if (reader.ReadByte () != local_sig)
+				throw new NotSupportedException ();
+
+			var count = reader.ReadCompressedUInt32 ();
+			if (count == 0)
+				return null;
+
+			var variables = new VariableDefinitionCollection ((int) count);
+
+			for (int i = 0; i < count; i++)
+				variables.Add (new VariableDefinition (reader.ReadTypeSignature ()));
+
+			return variables;
+		}
+
+		public IMetadataTokenProvider LookupToken (MetadataToken token)
+		{
+			var rid = token.RID;
+
+			if (rid == 0)
+				return null;
+
+			IMetadataTokenProvider element;
+			var position = this.position;
+			var context = this.context;
+
+			switch (token.TokenType) {
+			case TokenType.TypeDef:
+				element = GetTypeDefinition (rid);
+				break;
+			case TokenType.TypeRef:
+				element = GetTypeReference (rid);
+				break;
+			case TokenType.TypeSpec:
+				element = GetTypeSpecification (rid);
+				break;
+			case TokenType.Field:
+				element = GetFieldDefinition (rid);
+				break;
+			case TokenType.Method:
+				element = GetMethodDefinition (rid);
+				break;
+			case TokenType.MemberRef:
+				element = GetMemberReference (rid);
+				break;
+			case TokenType.MethodSpec:
+				element = GetMethodSpecification (rid);
+				break;
+			default:
+				return null;
+			}
+
+			this.position = position;
+			this.context = context;
+
+			return element;
+		}
+
+		public FieldDefinition GetFieldDefinition (uint rid)
+		{
+			InitializeTypeDefinitions ();
+
+			var field = metadata.GetFieldDefinition (rid);
+			if (field != null)
+				return field;
+
+			return LookupField (rid);
+		}
+
+		FieldDefinition LookupField (uint rid)
+		{
+			var type = metadata.GetFieldDeclaringType (rid);
+			if (type == null)
+				return null;
+
+			InitializeCollection (type.Fields);
+
+			return metadata.GetFieldDefinition (rid);
+		}
+
+		public MethodDefinition GetMethodDefinition (uint rid)
+		{
+			InitializeTypeDefinitions ();
+
+			var method = metadata.GetMethodDefinition (rid);
+			if (method != null)
+				return method;
+
+			return LookupMethod (rid);
+		}
+
+		MethodDefinition LookupMethod (uint rid)
+		{
+			var type = metadata.GetMethodDeclaringType (rid);
+			if (type == null)
+				return null;
+
+			InitializeCollection (type.Methods);
+
+			return metadata.GetMethodDefinition (rid);
+		}
+
+		MethodSpecification GetMethodSpecification (uint rid)
+		{
+			if (!MoveTo (Table.MethodSpec, rid))
+				return null;
+
+			var element_method = (MethodReference) LookupToken (
+				ReadMetadataToken (CodedIndex.MethodDefOrRef));
+			var signature = ReadBlobIndex ();
+
+			var method_spec = ReadMethodSpecSignature (signature, element_method);
+			method_spec.token = new MetadataToken (TokenType.MethodSpec, rid);
+			return method_spec;
+		}
+
+		MethodSpecification ReadMethodSpecSignature (uint signature, MethodReference method)
+		{
+			var reader = ReadSignature (signature);
+			const byte methodspec_sig = 0x0a;
+
+			var call_conv = reader.ReadByte ();
+
+			if (call_conv != methodspec_sig)
+				throw new NotSupportedException ();
+
+			var instance = new GenericInstanceMethod (method);
+
+			reader.ReadGenericInstanceSignature (method, instance);
+
+			return instance;
+		}
+
+		MemberReference GetMemberReference (uint rid)
+		{
+			InitializeMemberReferences ();
+
+			var member = metadata.GetMemberReference (rid);
+			if (member != null)
+				return member;
+
+			member = ReadMemberReference (rid);
+			if (member != null && !member.ContainsGenericParameter)
+				metadata.AddMemberReference (member);
+			return member;
+		}
+
+		MemberReference ReadMemberReference (uint rid)
+		{
+			if (!MoveTo (Table.MemberRef, rid))
+				return null;
+
+			var token = ReadMetadataToken (CodedIndex.MemberRefParent);
+			var name = ReadString ();
+			var signature = ReadBlobIndex ();
+
+			MemberReference member;
+
+			switch (token.TokenType) {
+			case TokenType.TypeDef:
+			case TokenType.TypeRef:
+			case TokenType.TypeSpec:
+				member = ReadTypeMemberReference (token, name, signature);
+				break;
+			case TokenType.Method:
+				member = ReadMethodMemberReference (token, name, signature);
+				break;
+			default:
+				throw new NotSupportedException ();
+			}
+
+			member.token = new MetadataToken (TokenType.MemberRef, rid);
+
+			return member;
+		}
+
+		MemberReference ReadTypeMemberReference (MetadataToken type, string name, uint signature)
+		{
+			var declaring_type = GetTypeDefOrRef (type);
+
+			this.context = declaring_type;
+
+			var member = ReadMemberReferenceSignature (signature, declaring_type);
+			member.Name = name;
+
+			return member;
+		}
+
+		MemberReference ReadMemberReferenceSignature (uint signature, TypeReference declaring_type)
+		{
+			var reader = ReadSignature (signature);
+			const byte field_sig = 0x6;
+
+			if (reader.buffer [reader.position] == field_sig) {
+				reader.position++;
+				var field = new FieldReference ();
+				field.DeclaringType = declaring_type;
+				field.FieldType = reader.ReadTypeSignature ();
+				return field;
+			} else {
+				var method = new MethodReference ();
+				method.DeclaringType = declaring_type;
+				reader.ReadMethodSignature (method);
+				return method;
+			}
+		}
+
+		MemberReference ReadMethodMemberReference (MetadataToken token, string name, uint signature)
+		{
+			var method = GetMethodDefinition (token.RID);
+
+			this.context = method;
+
+			var member = ReadMemberReferenceSignature (signature, method.DeclaringType);
+			member.Name = name;
+
+			return member;
+		}
+
+		void InitializeMemberReferences ()
+		{
+			if (metadata.MemberReferences != null)
+				return;
+
+			metadata.MemberReferences = new MemberReference [image.GetTableLength (Table.MemberRef)];
+		}
+
+		public IEnumerable<MemberReference> GetMemberReferences ()
+		{
+			InitializeMemberReferences ();
+
+			var length = image.GetTableLength (Table.MemberRef);
+
+			var type_system = module.TypeSystem;
+
+			var context = new MethodReference (string.Empty, type_system.Void);
+			context.DeclaringType = new TypeReference (string.Empty, string.Empty, module, type_system.Corlib);
+
+			var member_references = new MemberReference [length];
+
+			for (uint i = 1; i <= length; i++) {
+				this.context = context;
+				member_references [i - 1] = GetMemberReference (i);
+			}
+
+			return member_references;
+		}
+
+		void InitializeConstants ()
+		{
+			if (metadata.Constants != null)
+				return;
+
+			var length = MoveTo (Table.Constant);
+
+			var constants = metadata.Constants = new Dictionary<MetadataToken, Row<ElementType, uint>> (length);
+
+			for (uint i = 1; i <= length; i++) {
+				var type = (ElementType) ReadUInt16 ();
+				var owner = ReadMetadataToken (CodedIndex.HasConstant);
+				var signature = ReadBlobIndex ();
+
+				constants.Add (owner, new Row<ElementType, uint> (type, signature));
+			}
+		}
+
+		public object ReadConstant (IConstantProvider owner)
+		{
+			InitializeConstants ();
+
+			Row<ElementType, uint> row;
+			if (!metadata.Constants.TryGetValue (owner.MetadataToken, out row))
+				return Mixin.NoValue;
+
+			metadata.Constants.Remove (owner.MetadataToken);
+
+			switch (row.Col1) {
+			case ElementType.Class:
+			case ElementType.Object:
+				return null;
+			case ElementType.String:
+				return ReadConstantString (ReadBlob (row.Col2));
+			default:
+				return ReadConstantPrimitive (row.Col1, row.Col2);
+			}
+		}
+
+		static string ReadConstantString (byte [] blob)
+		{
+			var length = blob.Length;
+			if ((length & 1) == 1)
+				length--;
+
+			return Encoding.Unicode.GetString (blob, 0, length);
+		}
+
+		object ReadConstantPrimitive (ElementType type, uint signature)
+		{
+			var reader = ReadSignature (signature);
+			return reader.ReadConstantSignature (type);
+		}
+
+		void InitializeCustomAttributes ()
+		{
+			if (metadata.CustomAttributes != null)
+				return;
+
+			metadata.CustomAttributes = InitializeRanges (
+				Table.CustomAttribute, () => {
+					var next = ReadMetadataToken (CodedIndex.HasCustomAttribute);
+					ReadMetadataToken (CodedIndex.CustomAttributeType);
+					ReadBlobIndex ();
+					return next;
+			});
+		}
+
+		public bool HasCustomAttributes (ICustomAttributeProvider owner)
+		{
+			InitializeCustomAttributes ();
+
+			Range range;
+			if (!metadata.TryGetCustomAttributeRange (owner, out range))
+				return false;
+
+			return range.Length > 0;
+		}
+
+		public Collection<CustomAttribute> ReadCustomAttributes (ICustomAttributeProvider owner)
+		{
+			InitializeCustomAttributes ();
+
+			Range range;
+			if (!metadata.TryGetCustomAttributeRange (owner, out range)
+				|| !MoveTo (Table.CustomAttribute, range.Start))
+				return new Collection<CustomAttribute> ();
+
+			var custom_attributes = new Collection<CustomAttribute> ((int) range.Length);
+
+			for (int i = 0; i < range.Length; i++) {
+				ReadMetadataToken (CodedIndex.HasCustomAttribute);
+
+				var constructor = (MethodReference) LookupToken (
+					ReadMetadataToken (CodedIndex.CustomAttributeType));
+
+				var signature = ReadBlobIndex ();
+
+				custom_attributes.Add (new CustomAttribute (signature, constructor));
+			}
+
+			metadata.RemoveCustomAttributeRange (owner);
+
+			return custom_attributes;
+		}
+
+		public byte [] ReadCustomAttributeBlob (uint signature)
+		{
+			return ReadBlob (signature);
+		}
+
+		public void ReadCustomAttributeSignature (CustomAttribute attribute)
+		{
+			var reader = ReadSignature (attribute.signature);
+			if (reader.ReadUInt16 () != 0x0001)
+			    throw new InvalidOperationException ();
+
+			var constructor = attribute.Constructor;
+			if (constructor.HasParameters)
+				reader.ReadCustomAttributeConstructorArguments (attribute, constructor.Parameters);
+
+			if (!reader.CanReadMore ())
+				return;
+
+			var named = reader.ReadUInt16 ();
+
+			if (named == 0)
+				return;
+
+			reader.ReadCustomAttributeNamedArguments (named, ref attribute.fields, ref attribute.properties);
+		}
+
+		void InitializeMarshalInfos ()
+		{
+			if (metadata.FieldMarshals != null)
+				return;
+
+			var length = MoveTo (Table.FieldMarshal);
+
+			var marshals = metadata.FieldMarshals = new Dictionary<MetadataToken, uint> (length);
+
+			for (int i = 0; i < length; i++) {
+				var token = ReadMetadataToken (CodedIndex.HasFieldMarshal);
+				var signature = ReadBlobIndex ();
+				if (token.RID == 0)
+					continue;
+
+				marshals.Add (token, signature);
+			}
+		}
+
+		public bool HasMarshalInfo (IMarshalInfoProvider owner)
+		{
+			InitializeMarshalInfos ();
+
+			return metadata.FieldMarshals.ContainsKey (owner.MetadataToken);
+		}
+
+		public MarshalInfo ReadMarshalInfo (IMarshalInfoProvider owner)
+		{
+			InitializeMarshalInfos ();
+
+			uint signature;
+			if (!metadata.FieldMarshals.TryGetValue (owner.MetadataToken, out signature))
+				return null;
+
+			var reader = ReadSignature (signature);
+
+			metadata.FieldMarshals.Remove (owner.MetadataToken);
+
+			return reader.ReadMarshalInfo ();
+		}
+
+		void InitializeSecurityDeclarations ()
+		{
+			if (metadata.SecurityDeclarations != null)
+				return;
+
+			metadata.SecurityDeclarations = InitializeRanges (
+				Table.DeclSecurity, () => {
+					ReadUInt16 ();
+					var next = ReadMetadataToken (CodedIndex.HasDeclSecurity);
+					ReadBlobIndex ();
+					return next;
+			});
+		}
+
+		public bool HasSecurityDeclarations (ISecurityDeclarationProvider owner)
+		{
+			InitializeSecurityDeclarations ();
+
+			Range range;
+			if (!metadata.TryGetSecurityDeclarationRange (owner, out range))
+				return false;
+
+			return range.Length > 0;
+		}
+
+		public Collection<SecurityDeclaration> ReadSecurityDeclarations (ISecurityDeclarationProvider owner)
+		{
+			InitializeSecurityDeclarations ();
+
+			Range range;
+			if (!metadata.TryGetSecurityDeclarationRange (owner, out range)
+				|| !MoveTo (Table.DeclSecurity, range.Start))
+				return new Collection<SecurityDeclaration> ();
+
+			var security_declarations = new Collection<SecurityDeclaration> ((int) range.Length);
+
+			for (int i = 0; i < range.Length; i++) {
+				var action = (SecurityAction) ReadUInt16 ();
+				ReadMetadataToken (CodedIndex.HasDeclSecurity);
+				var signature = ReadBlobIndex ();
+
+				security_declarations.Add (new SecurityDeclaration (action, signature, module));
+			}
+
+			metadata.RemoveSecurityDeclarationRange (owner);
+
+			return security_declarations;
+		}
+
+		public byte [] ReadSecurityDeclarationBlob (uint signature)
+		{
+			return ReadBlob (signature);
+		}
+
+		public void ReadSecurityDeclarationSignature (SecurityDeclaration declaration)
+		{
+			var signature = declaration.signature;
+			var reader = ReadSignature (signature);
+
+			if (reader.buffer [reader.position] != '.') {
+				ReadXmlSecurityDeclaration (signature, declaration);
+				return;
+			}
+
+			reader.ReadByte ();
+			var count = reader.ReadCompressedUInt32 ();
+			var attributes = new Collection<SecurityAttribute> ((int) count);
+
+			for (int i = 0; i < count; i++)
+				attributes.Add (reader.ReadSecurityAttribute ());
+
+			declaration.security_attributes = attributes;
+		}
+
+		void ReadXmlSecurityDeclaration (uint signature, SecurityDeclaration declaration)
+		{
+			var blob = ReadBlob (signature);
+			var attributes = new Collection<SecurityAttribute> (1);
+
+			var attribute = new SecurityAttribute (
+				module.TypeSystem.LookupType ("System.Security.Permissions", "PermissionSetAttribute"));
+
+			attribute.properties = new Collection<CustomAttributeNamedArgument> (1);
+			attribute.properties.Add (
+				new CustomAttributeNamedArgument (
+					"XML",
+					new CustomAttributeArgument (
+						module.TypeSystem.String,
+						Encoding.Unicode.GetString (blob, 0, blob.Length))));
+
+			attributes.Add (attribute);
+
+			declaration.security_attributes = attributes;
+		}
+
+		public Collection<ExportedType> ReadExportedTypes ()
+		{
+			var length = MoveTo (Table.ExportedType);
+			if (length == 0)
+				return new Collection<ExportedType> ();
+
+			var exported_types = new Collection<ExportedType> (length);
+
+			for (int i = 1; i <= length; i++) {
+				var attributes = (TypeAttributes) ReadUInt32 ();
+				var identifier = ReadUInt32 ();
+				var name = ReadString ();
+				var @namespace = ReadString ();
+				var implementation = ReadMetadataToken (CodedIndex.Implementation);
+
+				ExportedType declaring_type = null;
+				IMetadataScope scope = null;
+
+				switch (implementation.TokenType) {
+				case TokenType.AssemblyRef:
+				case TokenType.File:
+					scope = GetExportedTypeScope (implementation);
+					break;
+				case TokenType.ExportedType:
+					// FIXME: if the table is not properly sorted
+					declaring_type = exported_types [(int) implementation.RID - 1];
+					break;
+				}
+
+				var exported_type = new ExportedType (@namespace, name, module, scope) {
+					Attributes = attributes,
+					Identifier = (int) identifier,
+					DeclaringType = declaring_type,
+				};
+				exported_type.token = new MetadataToken (TokenType.ExportedType, i);
+
+				exported_types.Add (exported_type);
+			}
+
+			return exported_types;
+		}
+
+		IMetadataScope GetExportedTypeScope (MetadataToken token)
+		{
+			var position = this.position;
+			IMetadataScope scope;
+
+			switch (token.TokenType) {
+			case TokenType.AssemblyRef:
+				InitializeAssemblyReferences ();
+				scope = metadata.AssemblyReferences [(int) token.RID - 1];
+				break;
+			case TokenType.File:
+				scope = GetModuleReferenceFromFile (token);
+				if (scope == null)
+					throw new NotSupportedException ();
+
+				break;
+			default:
+				throw new NotSupportedException ();
+			}
+
+			this.position = position;
+			return scope;
+		}
+
+		ModuleReference GetModuleReferenceFromFile (MetadataToken token)
+		{
+			if (!MoveTo (Table.File, token.RID))
+				return null;
+
+			ReadUInt32 ();
+			var file_name = ReadString ();
+			var modules = module.ModuleReferences;
+
+			ModuleReference reference = null;
+			for (int i = 0; i < modules.Count; i++) {
+				var module_reference = modules [i];
+				if (module_reference.Name != file_name)
+					continue;
+
+				reference = module_reference;
+				break;
+			}
+
+			return reference;
+		}
+
+		static void InitializeCollection (object o)
+		{
+		}
+	}
+
+	sealed class SignatureReader : ByteBuffer {
+
+		readonly MetadataReader reader;
+		readonly uint start, sig_length;
+
+		TypeSystem TypeSystem {
+			get { return reader.module.TypeSystem; }
+		}
+
+		public SignatureReader (uint blob, MetadataReader reader)
+			: base (reader.buffer)
+		{
+			this.reader = reader;
+
+			MoveToBlob (blob);
+
+			this.sig_length = ReadCompressedUInt32 ();
+			this.start = (uint) position;
+		}
+
+		void MoveToBlob (uint blob)
+		{
+			position = (int) (reader.image.BlobHeap.Offset + blob);
+		}
+
+		MetadataToken ReadTypeTokenSignature ()
+		{
+			return CodedIndex.TypeDefOrRef.GetMetadataToken (ReadCompressedUInt32 ());
+		}
+
+		GenericParameter GetGenericParameter (GenericParameterType type, uint var)
+		{
+			var context = reader.context;
+
+			if (context == null)
+				throw new NotSupportedException ();
+
+			IGenericParameterProvider provider;
+
+			switch (type) {
+			case GenericParameterType.Type:
+				provider = context.Type;
+				break;
+			case GenericParameterType.Method:
+				provider = context.Method;
+				break;
+			default:
+				throw new NotSupportedException ();
+			}
+
+			int index = (int) var;
+
+			if (!context.IsDefinition)
+				CheckGenericContext (provider, index);
+
+			return provider.GenericParameters [index];
+		}
+
+		static void CheckGenericContext (IGenericParameterProvider owner, int index)
+		{
+			var owner_parameters = owner.GenericParameters;
+
+			for (int i = owner_parameters.Count; i <= index; i++)
+				owner_parameters.Add (new GenericParameter (owner));
+		}
+
+		public void ReadGenericInstanceSignature (IGenericParameterProvider provider, IGenericInstance instance)
+		{
+			var arity = ReadCompressedUInt32 ();
+
+			if (!provider.IsDefinition)
+				CheckGenericContext (provider, (int) arity - 1);
+
+			var instance_arguments = instance.GenericArguments;
+
+			for (int i = 0; i < arity; i++)
+				instance_arguments.Add (ReadTypeSignature ());
+		}
+
+		ArrayType ReadArrayTypeSignature ()
+		{
+			var array = new ArrayType (ReadTypeSignature ());
+
+			var rank = ReadCompressedUInt32 ();
+
+			var sizes = new uint [ReadCompressedUInt32 ()];
+			for (int i = 0; i < sizes.Length; i++)
+				sizes [i] = ReadCompressedUInt32 ();
+
+			var low_bounds = new int [ReadCompressedUInt32 ()];
+			for (int i = 0; i < low_bounds.Length; i++)
+				low_bounds [i] = ReadCompressedInt32 ();
+
+			array.Dimensions.Clear ();
+
+			for (int i = 0; i < rank; i++) {
+				int? lower = null, upper = null;
+
+				if (i < low_bounds.Length)
+					lower = low_bounds [i];
+
+				if (i < sizes.Length)
+					upper = lower + (int) sizes [i] - 1;
+
+				array.Dimensions.Add (new ArrayDimension (lower, upper));
+			}
+
+			return array;
+		}
+
+		TypeReference GetTypeDefOrRef (MetadataToken token)
+		{
+			return reader.GetTypeDefOrRef (token);
+		}
+
+		public TypeReference ReadTypeSignature ()
+		{
+			return ReadTypeSignature ((ElementType) ReadByte ());
+		}
+
+		TypeReference ReadTypeSignature (ElementType etype)
+		{
+			switch (etype) {
+			case ElementType.ValueType: {
+				var value_type = GetTypeDefOrRef (ReadTypeTokenSignature ());
+				value_type.IsValueType = true;
+				return value_type;
+			}
+			case ElementType.Class:
+				return GetTypeDefOrRef (ReadTypeTokenSignature ());
+			case ElementType.Ptr:
+				return new PointerType (ReadTypeSignature ());
+			case ElementType.FnPtr: {
+				var fptr = new FunctionPointerType ();
+				ReadMethodSignature (fptr);
+				return fptr;
+			}
+			case ElementType.ByRef:
+				return new ByReferenceType (ReadTypeSignature ());
+			case ElementType.Pinned:
+				return new PinnedType (ReadTypeSignature ());
+			case ElementType.SzArray:
+				return new ArrayType (ReadTypeSignature ());
+			case ElementType.Array:
+				return ReadArrayTypeSignature ();
+			case ElementType.CModOpt:
+				return new OptionalModifierType (
+					GetTypeDefOrRef (ReadTypeTokenSignature ()), ReadTypeSignature ());
+			case ElementType.CModReqD:
+				return new RequiredModifierType (
+					GetTypeDefOrRef (ReadTypeTokenSignature ()), ReadTypeSignature ());
+			case ElementType.Sentinel:
+				return new SentinelType (ReadTypeSignature ());
+			case ElementType.Var:
+				return GetGenericParameter (GenericParameterType.Type, ReadCompressedUInt32 ());
+			case ElementType.MVar:
+				return GetGenericParameter (GenericParameterType.Method, ReadCompressedUInt32 ());
+			case ElementType.GenericInst: {
+				var is_value_type = ReadByte () == (byte) ElementType.ValueType;
+				var element_type = GetTypeDefOrRef (ReadTypeTokenSignature ());
+				var generic_instance = new GenericInstanceType (element_type);
+
+				ReadGenericInstanceSignature (element_type, generic_instance);
+
+				if (is_value_type) {
+					generic_instance.IsValueType = true;
+					element_type.GetElementType ().IsValueType = true;
+				}
+
+				return generic_instance;
+			}
+			case ElementType.Object: return TypeSystem.Object;
+			case ElementType.Void: return TypeSystem.Void;
+			case ElementType.TypedByRef: return TypeSystem.TypedReference;
+			case ElementType.I: return TypeSystem.IntPtr;
+			case ElementType.U: return TypeSystem.UIntPtr;
+			default: return GetPrimitiveType (etype);
+			}
+		}
+
+		public void ReadMethodSignature (IMethodSignature method)
+		{
+			var calling_convention = ReadByte ();
+
+			const byte has_this = 0x20;
+			const byte explicit_this = 0x40;
+
+			if ((calling_convention & has_this) != 0) {
+				method.HasThis = true;
+				calling_convention = (byte) (calling_convention & ~has_this);
+			}
+
+			if ((calling_convention & explicit_this) != 0) {
+				method.ExplicitThis = true;
+				calling_convention = (byte) (calling_convention & ~explicit_this);
+			}
+
+			method.CallingConvention = (MethodCallingConvention) calling_convention;
+
+			var generic_context = method as MethodReference;
+			if (generic_context != null)
+				reader.context = generic_context;
+
+			if ((calling_convention & 0x10) != 0) {
+				var arity = ReadCompressedUInt32 ();
+
+				if (generic_context != null && !generic_context.IsDefinition)
+					CheckGenericContext (generic_context, (int) arity -1 );
+			}
+
+			var param_count = ReadCompressedUInt32 ();
+
+			method.MethodReturnType.ReturnType = ReadTypeSignature ();
+
+			if (param_count == 0)
+				return;
+
+			Collection<ParameterDefinition> parameters;
+
+			var method_ref = method as MethodReference;
+			if (method_ref != null)
+				parameters = method_ref.parameters = new ParameterDefinitionCollection (method, (int) param_count);
+			else
+				parameters = method.Parameters;
+
+			for (int i = 0; i < param_count; i++)
+				parameters.Add (new ParameterDefinition (ReadTypeSignature ()));
+		}
+
+		public object ReadConstantSignature (ElementType type)
+		{
+			return ReadPrimitiveValue (type);
+		}
+
+		public void ReadCustomAttributeConstructorArguments (CustomAttribute attribute, Collection<ParameterDefinition> parameters)
+		{
+			var count = parameters.Count;
+			if (count == 0)
+				return;
+
+			attribute.arguments = new Collection<CustomAttributeArgument> (count);
+
+			for (int i = 0; i < count; i++)
+				attribute.arguments.Add (
+					ReadCustomAttributeFixedArgument (parameters [i].ParameterType));
+		}
+
+		CustomAttributeArgument ReadCustomAttributeFixedArgument (TypeReference type)
+		{
+			if (type.IsArray)
+				return ReadCustomAttributeFixedArrayArgument ((ArrayType) type);
+
+			return ReadCustomAttributeElement (type);
+		}
+
+		public void ReadCustomAttributeNamedArguments (ushort count, ref Collection<CustomAttributeNamedArgument> fields, ref Collection<CustomAttributeNamedArgument> properties)
+		{
+			for (int i = 0; i < count; i++)
+				ReadCustomAttributeNamedArgument (ref fields, ref properties);
+		}
+
+		void ReadCustomAttributeNamedArgument (ref Collection<CustomAttributeNamedArgument> fields, ref Collection<CustomAttributeNamedArgument> properties)
+		{
+			var kind = ReadByte ();
+			var type = ReadCustomAttributeFieldOrPropType ();
+			var name = ReadUTF8String ();
+
+			Collection<CustomAttributeNamedArgument> container;
+			switch (kind) {
+			case 0x53:
+				container = GetCustomAttributeNamedArgumentCollection (ref fields);
+				break;
+			case 0x54:
+				container = GetCustomAttributeNamedArgumentCollection (ref properties);
+				break;
+			default:
+				throw new NotSupportedException ();
+			}
+
+			container.Add (new CustomAttributeNamedArgument (name, ReadCustomAttributeFixedArgument (type)));
+		}
+
+		static Collection<CustomAttributeNamedArgument> GetCustomAttributeNamedArgumentCollection (ref Collection<CustomAttributeNamedArgument> collection)
+		{
+			if (collection != null)
+				return collection;
+
+			return collection = new Collection<CustomAttributeNamedArgument> ();
+		}
+
+		CustomAttributeArgument ReadCustomAttributeFixedArrayArgument (ArrayType type)
+		{
+			var length = ReadUInt32 ();
+
+			if (length == 0xffffffff)
+				return new CustomAttributeArgument (type, null);
+
+			if (length == 0)
+				return new CustomAttributeArgument (type, Empty<CustomAttributeArgument>.Array);
+
+			var arguments = new CustomAttributeArgument [length];
+			var element_type = type.ElementType;
+
+			for (int i = 0; i < length; i++)
+				arguments [i] = ReadCustomAttributeElement (element_type);
+
+			return new CustomAttributeArgument (type, arguments);
+		}
+
+		CustomAttributeArgument ReadCustomAttributeElement (TypeReference type)
+		{
+			if (type.IsArray)
+				return ReadCustomAttributeFixedArrayArgument ((ArrayType) type);
+
+			return new CustomAttributeArgument (
+				type,
+				type.etype == ElementType.Object
+					? ReadCustomAttributeElement (ReadCustomAttributeFieldOrPropType ())
+					: ReadCustomAttributeElementValue (type));
+		}
+
+		object ReadCustomAttributeElementValue (TypeReference type)
+		{
+			var etype = type.etype;
+
+			switch (etype) {
+			case ElementType.String:
+				return ReadUTF8String ();
+			case ElementType.None:
+				if (type.IsTypeOf ("System", "Type"))
+					return ReadTypeReference ();
+
+				return ReadCustomAttributeEnum (type);
+			default:
+				return ReadPrimitiveValue (etype);
+			}
+		}
+
+		object ReadPrimitiveValue (ElementType type)
+		{
+			switch (type) {
+			case ElementType.Boolean:
+				return ReadByte () == 1;
+			case ElementType.I1:
+				return (sbyte) ReadByte ();
+			case ElementType.U1:
+				return ReadByte ();
+			case ElementType.Char:
+				return (char) ReadUInt16 ();
+			case ElementType.I2:
+				return ReadInt16 ();
+			case ElementType.U2:
+				return ReadUInt16 ();
+			case ElementType.I4:
+				return ReadInt32 ();
+			case ElementType.U4:
+				return ReadUInt32 ();
+			case ElementType.I8:
+				return ReadInt64 ();
+			case ElementType.U8:
+				return ReadUInt64 ();
+			case ElementType.R4:
+				return ReadSingle ();
+			case ElementType.R8:
+				return ReadDouble ();
+			default:
+				throw new NotImplementedException (type.ToString ());
+			}
+		}
+
+		TypeReference GetPrimitiveType (ElementType etype)
+		{
+			switch (etype) {
+			case ElementType.Boolean:
+				return TypeSystem.Boolean;
+			case ElementType.Char:
+				return TypeSystem.Char;
+			case ElementType.I1:
+				return TypeSystem.SByte;
+			case ElementType.U1:
+				return TypeSystem.Byte;
+			case ElementType.I2:
+				return TypeSystem.Int16;
+			case ElementType.U2:
+				return TypeSystem.UInt16;
+			case ElementType.I4:
+				return TypeSystem.Int32;
+			case ElementType.U4:
+				return TypeSystem.UInt32;
+			case ElementType.I8:
+				return TypeSystem.Int64;
+			case ElementType.U8:
+				return TypeSystem.UInt64;
+			case ElementType.R4:
+				return TypeSystem.Single;
+			case ElementType.R8:
+				return TypeSystem.Double;
+			case ElementType.String:
+				return TypeSystem.String;
+			default:
+				throw new NotImplementedException (etype.ToString ());
+			}
+		}
+
+		TypeReference ReadCustomAttributeFieldOrPropType ()
+		{
+			var etype = (ElementType) ReadByte ();
+
+			switch (etype) {
+			case ElementType.Boxed:
+				return TypeSystem.Object;
+			case ElementType.SzArray:
+				return new ArrayType (ReadCustomAttributeFieldOrPropType ());
+			case ElementType.Enum:
+				return ReadTypeReference ();
+			case ElementType.Type:
+				return TypeSystem.LookupType ("System", "Type");
+			default:
+				return GetPrimitiveType (etype);
+			}
+		}
+
+		public TypeReference ReadTypeReference ()
+		{
+			return TypeParser.ParseType (reader.module, ReadUTF8String ());
+		}
+
+		object ReadCustomAttributeEnum (TypeReference enum_type)
+		{
+			var type = enum_type.CheckedResolve ();
+			if (!type.IsEnum)
+				throw new ArgumentException ();
+
+			return ReadCustomAttributeElementValue (type.GetEnumUnderlyingType ());
+		}
+
+		public SecurityAttribute ReadSecurityAttribute ()
+		{
+			var attribute = new SecurityAttribute (ReadTypeReference ());
+
+			ReadCompressedUInt32 ();
+
+			ReadCustomAttributeNamedArguments (
+				(ushort) ReadCompressedUInt32 (),
+				ref attribute.fields,
+				ref attribute.properties);
+
+			return attribute;
+		}
+
+		public MarshalInfo ReadMarshalInfo ()
+		{
+			var native = ReadNativeType ();
+			switch (native) {
+			case NativeType.Array: {
+				var array = new ArrayMarshalInfo ();
+				if (CanReadMore ())
+					array.element_type = ReadNativeType ();
+				if (CanReadMore ())
+					array.size_parameter_index = (int) ReadCompressedUInt32 ();
+				if (CanReadMore ())
+					array.size = (int) ReadCompressedUInt32 ();
+				if (CanReadMore ())
+					array.size_parameter_multiplier = (int) ReadCompressedUInt32 ();
+				return array;
+			}
+			case NativeType.SafeArray: {
+				var array = new SafeArrayMarshalInfo ();
+				if (CanReadMore ())
+					array.element_type = ReadVariantType ();
+				return array;
+			}
+			case NativeType.FixedArray: {
+				var array = new FixedArrayMarshalInfo ();
+				if (CanReadMore ())
+					array.size = (int) ReadCompressedUInt32 ();
+				if (CanReadMore ())
+					array.element_type = ReadNativeType ();
+				return array;
+			}
+			case NativeType.FixedSysString: {
+				var sys_string = new FixedSysStringMarshalInfo ();
+				if (CanReadMore ())
+					sys_string.size = (int) ReadCompressedUInt32 ();
+				return sys_string;
+			}
+			case NativeType.CustomMarshaler: {
+				var marshaler = new CustomMarshalInfo ();
+				var guid_value = ReadUTF8String ();
+				marshaler.guid = !string.IsNullOrEmpty (guid_value) ? new Guid (guid_value) : Guid.Empty;
+				marshaler.unmanaged_type = ReadUTF8String ();
+				marshaler.managed_type = ReadTypeReference ();
+				marshaler.cookie = ReadUTF8String ();
+				return marshaler;
+			}
+			default:
+				return new MarshalInfo (native);
+			}
+		}
+
+		NativeType ReadNativeType ()
+		{
+			return (NativeType) ReadByte ();
+		}
+
+		VariantType ReadVariantType ()
+		{
+			return (VariantType) ReadByte ();
+		}
+
+		string ReadUTF8String ()
+		{
+			if (buffer [position] == 0xff) {
+				position++;
+				return null;
+			}
+
+			var length = (int) ReadCompressedUInt32 ();
+			if (length == 0)
+				return string.Empty;
+
+			var @string = Encoding.UTF8.GetString (buffer, position,
+				buffer [position + length - 1] == 0 ? length - 1 : length);
+
+			position += length;
+			return @string;
+		}
+
+		public bool CanReadMore ()
+		{
+			return position - start < sig_length;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/AssemblyWriter.cs b/src/Core/Compiler/Importer/IL/AssemblyWriter.cs
new file mode 100644
index 000000000..68d02911e
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/AssemblyWriter.cs
@@ -0,0 +1,2536 @@
+//
+// AssemblyWriter.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+using ScriptSharp.Collections.Generic;
+using ScriptSharp.Importer.IL.Cil;
+using ScriptSharp.Importer.IL.Metadata;
+using ScriptSharp.Importer.IL.PE;
+
+using RVA = System.UInt32;
+using RID = System.UInt32;
+using CodedRID = System.UInt32;
+using StringIndex = System.UInt32;
+using BlobIndex = System.UInt32;
+
+namespace ScriptSharp.Importer.IL {
+
+#if !IL_READ_ONLY
+
+    using TypeRefRow     = Row<CodedRID, StringIndex, StringIndex>;
+	using TypeDefRow     = Row<TypeAttributes, StringIndex, StringIndex, CodedRID, RID, RID>;
+	using FieldRow       = Row<FieldAttributes, StringIndex, BlobIndex>;
+	using MethodRow      = Row<RVA, MethodImplAttributes, MethodAttributes, StringIndex, BlobIndex, RID>;
+	using ParamRow       = Row<ParameterAttributes, ushort, StringIndex>;
+	using InterfaceImplRow = Row<uint, CodedRID>;
+	using MemberRefRow   = Row<CodedRID, StringIndex, BlobIndex>;
+	using ConstantRow    = Row<ElementType, CodedRID, BlobIndex>;
+	using CustomAttributeRow = Row<CodedRID, CodedRID, BlobIndex>;
+	using FieldMarshalRow = Row<CodedRID, BlobIndex>;
+	using DeclSecurityRow = Row<SecurityAction, CodedRID, BlobIndex>;
+	using ClassLayoutRow = Row<ushort, uint, RID>;
+	using FieldLayoutRow = Row<uint, RID>;
+	using EventMapRow    = Row<RID, RID>;
+	using EventRow       = Row<EventAttributes, StringIndex, CodedRID>;
+	using PropertyMapRow = Row<RID, RID>;
+	using PropertyRow    = Row<PropertyAttributes, StringIndex, BlobIndex>;
+	using MethodSemanticsRow = Row<MethodSemanticsAttributes, RID, CodedRID>;
+	using MethodImplRow  = Row<RID, CodedRID, CodedRID>;
+	using ImplMapRow     = Row<PInvokeAttributes, CodedRID, StringIndex, RID>;
+	using FieldRVARow    = Row<RVA, RID>;
+	using AssemblyRow    = Row<AssemblyHashAlgorithm, ushort, ushort, ushort, ushort, AssemblyAttributes, uint, uint, uint>;
+	using AssemblyRefRow = Row<ushort, ushort, ushort, ushort, AssemblyAttributes, uint, uint, uint, uint>;
+	using FileRow        = Row<FileAttributes, StringIndex, BlobIndex>;
+	using ExportedTypeRow = Row<TypeAttributes, uint, StringIndex, StringIndex, CodedRID>;
+	using ManifestResourceRow = Row<uint, ManifestResourceAttributes, StringIndex, CodedRID>;
+	using NestedClassRow = Row<RID, RID>;
+	using GenericParamRow = Row<ushort, GenericParameterAttributes, CodedRID, StringIndex>;
+	using MethodSpecRow = Row<CodedRID, BlobIndex>;
+	using GenericParamConstraintRow = Row<RID, CodedRID>;
+
+	static class ModuleWriter {
+
+		public static void WriteModuleTo (ModuleDefinition module, Stream stream, WriterParameters parameters)
+		{
+			if ((module.Attributes & ModuleAttributes.ILOnly) == 0)
+				throw new ArgumentException ();
+
+			if (module.HasImage && module.ReadingMode == ReadingMode.Deferred)
+				ImmediateModuleReader.ReadModule (module);
+
+			module.MetadataSystem.Clear ();
+
+			var name = module.assembly != null ? module.assembly.Name : null;
+			var fq_name = stream.GetFullyQualifiedName ();
+			var symbol_writer_provider = parameters.SymbolWriterProvider;
+			if (symbol_writer_provider == null && parameters.WriteSymbols)
+				symbol_writer_provider = SymbolProvider.GetPlatformWriterProvider ();
+			var symbol_writer = GetSymbolWriter (module, fq_name, symbol_writer_provider);
+
+#if !SILVERLIGHT && !CF
+			if (parameters.StrongNameKeyPair != null && name != null)
+				name.PublicKey = parameters.StrongNameKeyPair.PublicKey;
+#endif
+
+			if (name != null && name.HasPublicKey)
+				module.Attributes |= ModuleAttributes.StrongNameSigned;
+
+			var metadata = new MetadataBuilder (module, fq_name,
+				symbol_writer_provider, symbol_writer);
+
+			BuildMetadata (module, metadata);
+
+			if (module.SymbolReader != null)
+				module.SymbolReader.Dispose ();
+
+			var writer = ImageWriter.CreateWriter (module, metadata, stream);
+
+			writer.WriteImage ();
+
+#if !SILVERLIGHT && !CF
+			if (parameters.StrongNameKeyPair != null)
+				CryptoService.StrongName (stream, writer, parameters.StrongNameKeyPair);
+#endif
+			if (symbol_writer != null)
+				symbol_writer.Dispose ();
+		}
+
+		static void BuildMetadata (ModuleDefinition module, MetadataBuilder metadata)
+		{
+			if (!module.HasImage) {
+				metadata.BuildMetadata ();
+				return;
+			}
+
+			module.Read (metadata, (builder, _) => {
+				builder.BuildMetadata ();
+				return builder;
+			});
+		}
+
+		static ISymbolWriter GetSymbolWriter (ModuleDefinition module, string fq_name, ISymbolWriterProvider symbol_writer_provider)
+		{
+			if (symbol_writer_provider == null)
+				return null;
+
+			return symbol_writer_provider.GetSymbolWriter (module, fq_name);
+		}
+	}
+
+	abstract class MetadataTable {
+
+		public abstract int Length { get; }
+
+		public bool IsLarge {
+			get { return Length > 65535; }
+		}
+
+		public abstract void Write (TableHeapBuffer buffer);
+		public abstract void Sort ();
+	}
+
+	abstract class OneRowTable<TRow> : MetadataTable where TRow : struct {
+
+		internal TRow row;
+
+		public sealed override int Length {
+			get { return 1; }
+		}
+
+		public sealed override void Sort ()
+		{
+		}
+	}
+
+	abstract class MetadataTable<TRow> : MetadataTable where TRow : struct {
+
+		internal TRow [] rows = new TRow [2];
+		internal int length;
+
+		public sealed override int Length {
+			get { return length; }
+		}
+
+		public int AddRow (TRow row)
+		{
+			if (rows.Length == length)
+				Grow ();
+
+			rows [length++] = row;
+			return length;
+		}
+
+		void Grow ()
+		{
+			var rows = new TRow [this.rows.Length * 2];
+			Array.Copy (this.rows, rows, this.rows.Length);
+			this.rows = rows;
+		}
+
+		public override void Sort ()
+		{
+		}
+	}
+
+	abstract class SortedTable<TRow> : MetadataTable<TRow>, IComparer<TRow> where TRow : struct {
+
+		public sealed override void Sort ()
+		{
+			Array.Sort (rows, 0, length, this);
+		}
+
+		protected int Compare (uint x, uint y)
+		{
+			return x == y ? 0 : x > y ? 1 : -1;
+		}
+
+		public abstract int Compare (TRow x, TRow y);
+	}
+
+	sealed class ModuleTable : OneRowTable<uint> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			buffer.WriteUInt16 (0);		// Generation
+			buffer.WriteString (row);	// Name
+			buffer.WriteUInt16 (1);		// Mvid
+			buffer.WriteUInt16 (0);		// EncId
+			buffer.WriteUInt16 (0);		// EncBaseId
+		}
+	}
+
+	sealed class TypeRefTable : MetadataTable<TypeRefRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteCodedRID (
+					rows [i].Col1, CodedIndex.ResolutionScope);	// Scope
+				buffer.WriteString (rows [i].Col2);			// Name
+				buffer.WriteString (rows [i].Col3);			// Namespace
+			}
+		}
+	}
+
+	sealed class TypeDefTable : MetadataTable<TypeDefRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt32 ((uint) rows [i].Col1);	// Attributes
+				buffer.WriteString (rows [i].Col2);			// Name
+				buffer.WriteString (rows [i].Col3);			// Namespace
+				buffer.WriteCodedRID (
+					rows [i].Col4, CodedIndex.TypeDefOrRef);	// Extends
+				buffer.WriteRID (rows [i].Col5, Table.Field);	// FieldList
+				buffer.WriteRID (rows [i].Col6, Table.Method);	// MethodList
+			}
+		}
+	}
+
+	sealed class FieldTable : MetadataTable<FieldRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt16 ((ushort) rows [i].Col1);	// Attributes
+				buffer.WriteString (rows [i].Col2);			// Name
+				buffer.WriteBlob (rows [i].Col3);			// Signature
+			}
+		}
+	}
+
+	sealed class MethodTable : MetadataTable<MethodRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt32 (rows [i].Col1);		// RVA
+				buffer.WriteUInt16 ((ushort) rows [i].Col2);	// ImplFlags
+				buffer.WriteUInt16 ((ushort) rows [i].Col3);	// Flags
+				buffer.WriteString (rows [i].Col4);		// Name
+				buffer.WriteBlob (rows [i].Col5);		// Signature
+				buffer.WriteRID (rows [i].Col6, Table.Param);	// ParamList
+			}
+		}
+	}
+
+	sealed class ParamTable : MetadataTable<ParamRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt16 ((ushort) rows [i].Col1);	// Attributes
+				buffer.WriteUInt16 (rows [i].Col2);		// Sequence
+				buffer.WriteString (rows [i].Col3);		// Name
+			}
+		}
+	}
+
+	sealed class InterfaceImplTable : MetadataTable<InterfaceImplRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteRID (rows [i].Col1, Table.TypeDef);		// Class
+				buffer.WriteCodedRID (rows [i].Col2, CodedIndex.TypeDefOrRef);	// Interface
+			}
+		}
+
+		/*public override int Compare (InterfaceImplRow x, InterfaceImplRow y)
+		{
+			return (int) (x.Col1 == y.Col1 ? y.Col2 - x.Col2 : x.Col1 - y.Col1);
+		}*/
+	}
+
+	sealed class MemberRefTable : MetadataTable<MemberRefRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteCodedRID (rows [i].Col1, CodedIndex.MemberRefParent);
+				buffer.WriteString (rows [i].Col2);
+				buffer.WriteBlob (rows [i].Col3);
+			}
+		}
+	}
+
+	sealed class ConstantTable : SortedTable<ConstantRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt16 ((ushort) rows [i].Col1);
+				buffer.WriteCodedRID (rows [i].Col2, CodedIndex.HasConstant);
+				buffer.WriteBlob (rows [i].Col3);
+			}
+		}
+
+		public override int Compare (ConstantRow x, ConstantRow y)
+		{
+			return Compare (x.Col2, y.Col2);
+		}
+	}
+
+	sealed class CustomAttributeTable : SortedTable<CustomAttributeRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteCodedRID (rows [i].Col1, CodedIndex.HasCustomAttribute);	// Parent
+				buffer.WriteCodedRID (rows [i].Col2, CodedIndex.CustomAttributeType);	// Type
+				buffer.WriteBlob (rows [i].Col3);
+			}
+		}
+
+		public override int Compare (CustomAttributeRow x, CustomAttributeRow y)
+		{
+			return Compare (x.Col1, y.Col1);
+		}
+	}
+
+	sealed class FieldMarshalTable : SortedTable<FieldMarshalRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteCodedRID (rows [i].Col1, CodedIndex.HasFieldMarshal);
+				buffer.WriteBlob (rows [i].Col2);
+			}
+		}
+
+		public override int Compare (FieldMarshalRow x, FieldMarshalRow y)
+		{
+			return Compare (x.Col1, y.Col1);
+		}
+	}
+
+	sealed class DeclSecurityTable : SortedTable<DeclSecurityRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt16 ((ushort) rows [i].Col1);
+				buffer.WriteCodedRID (rows [i].Col2, CodedIndex.HasDeclSecurity);
+				buffer.WriteBlob (rows [i].Col3);
+			}
+		}
+
+		public override int Compare (DeclSecurityRow x, DeclSecurityRow y)
+		{
+			return Compare (x.Col2, y.Col2);
+		}
+	}
+
+	sealed class ClassLayoutTable : SortedTable<ClassLayoutRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt16 (rows [i].Col1);		// PackingSize
+				buffer.WriteUInt32 (rows [i].Col2);		// ClassSize
+				buffer.WriteRID (rows [i].Col3, Table.TypeDef);	// Parent
+			}
+		}
+
+		public override int Compare (ClassLayoutRow x, ClassLayoutRow y)
+		{
+			return Compare (x.Col3, y.Col3);
+		}
+	}
+
+	sealed class FieldLayoutTable : SortedTable<FieldLayoutRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt32 (rows [i].Col1);		// Offset
+				buffer.WriteRID (rows [i].Col2, Table.Field);	// Parent
+			}
+		}
+
+		public override int Compare (FieldLayoutRow x, FieldLayoutRow y)
+		{
+			return Compare (x.Col2, y.Col2);
+		}
+	}
+
+	sealed class StandAloneSigTable : MetadataTable<uint> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++)
+				buffer.WriteBlob (rows [i]);
+		}
+	}
+
+	sealed class EventMapTable : MetadataTable<EventMapRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteRID (rows [i].Col1, Table.TypeDef);		// Parent
+				buffer.WriteRID (rows [i].Col2, Table.Event);		// EventList
+			}
+		}
+	}
+
+	sealed class EventTable : MetadataTable<EventRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt16 ((ushort) rows [i].Col1);	// Flags
+				buffer.WriteString (rows [i].Col2);		// Name
+				buffer.WriteCodedRID (rows [i].Col3, CodedIndex.TypeDefOrRef);	// EventType
+			}
+		}
+	}
+
+	sealed class PropertyMapTable : MetadataTable<PropertyMapRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteRID (rows [i].Col1, Table.TypeDef);		// Parent
+				buffer.WriteRID (rows [i].Col2, Table.Property);	// PropertyList
+			}
+		}
+	}
+
+	sealed class PropertyTable : MetadataTable<PropertyRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt16 ((ushort) rows [i].Col1);	// Flags
+				buffer.WriteString (rows [i].Col2);		// Name
+				buffer.WriteBlob (rows [i].Col3);		// Type
+			}
+		}
+	}
+
+	sealed class MethodSemanticsTable : SortedTable<MethodSemanticsRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt16 ((ushort) rows [i].Col1);	// Flags
+				buffer.WriteRID (rows [i].Col2, Table.Method);	// Method
+				buffer.WriteCodedRID (rows [i].Col3, CodedIndex.HasSemantics);	// Association
+			}
+		}
+
+		public override int Compare (MethodSemanticsRow x, MethodSemanticsRow y)
+		{
+			return Compare (x.Col3, y.Col3);
+		}
+	}
+
+	sealed class MethodImplTable : MetadataTable<MethodImplRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteRID (rows [i].Col1, Table.TypeDef);	// Class
+				buffer.WriteCodedRID (rows [i].Col2, CodedIndex.MethodDefOrRef);	// MethodBody
+				buffer.WriteCodedRID (rows [i].Col3, CodedIndex.MethodDefOrRef);	// MethodDeclaration
+			}
+		}
+	}
+
+	sealed class ModuleRefTable : MetadataTable<uint> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++)
+				buffer.WriteString (rows [i]);	// Name
+		}
+	}
+
+	sealed class TypeSpecTable : MetadataTable<uint> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++)
+				buffer.WriteBlob (rows [i]);	// Signature
+		}
+	}
+
+	sealed class ImplMapTable : SortedTable<ImplMapRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt16 ((ushort) rows [i].Col1);	// Flags
+				buffer.WriteCodedRID (rows [i].Col2, CodedIndex.MemberForwarded);	// MemberForwarded
+				buffer.WriteString (rows [i].Col3);		// ImportName
+				buffer.WriteRID (rows [i].Col4, Table.ModuleRef);	// ImportScope
+			}
+		}
+
+		public override int Compare (ImplMapRow x, ImplMapRow y)
+		{
+			return Compare (x.Col2, y.Col2);
+		}
+	}
+
+	sealed class FieldRVATable : SortedTable<FieldRVARow> {
+
+		internal int position;
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			position = buffer.position;
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt32 (rows [i].Col1);		// RVA
+				buffer.WriteRID (rows [i].Col2, Table.Field);	// Field
+			}
+		}
+
+		public override int Compare (FieldRVARow x, FieldRVARow y)
+		{
+			return Compare (x.Col2, y.Col2);
+		}
+	}
+
+	sealed class AssemblyTable : OneRowTable<AssemblyRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			buffer.WriteUInt32 ((uint) row.Col1);	// AssemblyHashAlgorithm
+			buffer.WriteUInt16 (row.Col2);			// MajorVersion
+			buffer.WriteUInt16 (row.Col3);			// MinorVersion
+			buffer.WriteUInt16 (row.Col4);			// Build
+			buffer.WriteUInt16 (row.Col5);			// Revision
+			buffer.WriteUInt32 ((uint) row.Col6);	// Flags
+			buffer.WriteBlob (row.Col7);			// PublicKey
+			buffer.WriteString (row.Col8);			// Name
+			buffer.WriteString (row.Col9);			// Culture
+		}
+	}
+
+	sealed class AssemblyRefTable : MetadataTable<AssemblyRefRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt16 (rows [i].Col1);		// MajorVersion
+				buffer.WriteUInt16 (rows [i].Col2);		// MinorVersion
+				buffer.WriteUInt16 (rows [i].Col3);		// Build
+				buffer.WriteUInt16 (rows [i].Col4);		// Revision
+				buffer.WriteUInt32 ((uint) rows [i].Col5);	// Flags
+				buffer.WriteBlob (rows [i].Col6);		// PublicKeyOrToken
+				buffer.WriteString (rows [i].Col7);		// Name
+				buffer.WriteString (rows [i].Col8);		// Culture
+				buffer.WriteBlob (rows [i].Col9);		// Hash
+			}
+		}
+	}
+
+	sealed class FileTable : MetadataTable<FileRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt32 ((uint) rows [i].Col1);
+				buffer.WriteString (rows [i].Col2);
+				buffer.WriteBlob (rows [i].Col3);
+			}
+		}
+	}
+
+	sealed class ExportedTypeTable : MetadataTable<ExportedTypeRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt32 ((uint) rows [i].Col1);
+				buffer.WriteUInt32 (rows [i].Col2);
+				buffer.WriteString (rows [i].Col3);
+				buffer.WriteString (rows [i].Col4);
+				buffer.WriteCodedRID (rows [i].Col5, CodedIndex.Implementation);
+			}
+		}
+	}
+
+	sealed class ManifestResourceTable : MetadataTable<ManifestResourceRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt32 (rows [i].Col1);
+				buffer.WriteUInt32 ((uint) rows [i].Col2);
+				buffer.WriteString (rows [i].Col3);
+				buffer.WriteCodedRID (rows [i].Col4, CodedIndex.Implementation);
+			}
+		}
+	}
+
+	sealed class NestedClassTable : SortedTable<NestedClassRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteRID (rows [i].Col1, Table.TypeDef);		// NestedClass
+				buffer.WriteRID (rows [i].Col2, Table.TypeDef);		// EnclosingClass
+			}
+		}
+
+		public override int Compare (NestedClassRow x, NestedClassRow y)
+		{
+			return Compare (x.Col1, y.Col1);
+		}
+	}
+
+	sealed class GenericParamTable : MetadataTable<GenericParamRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteUInt16 (rows [i].Col1);		// Number
+				buffer.WriteUInt16 ((ushort) rows [i].Col2);	// Flags
+				buffer.WriteCodedRID (rows [i].Col3, CodedIndex.TypeOrMethodDef);	// Owner
+				buffer.WriteString (rows [i].Col4);		// Name
+			}
+		}
+	}
+
+	sealed class MethodSpecTable : MetadataTable<MethodSpecRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteCodedRID (rows [i].Col1, CodedIndex.MethodDefOrRef);	// Method
+				buffer.WriteBlob (rows [i].Col2);	// Instantiation
+			}
+		}
+	}
+
+	sealed class GenericParamConstraintTable : MetadataTable<GenericParamConstraintRow> {
+
+		public override void Write (TableHeapBuffer buffer)
+		{
+			for (int i = 0; i < length; i++) {
+				buffer.WriteRID (rows [i].Col1, Table.GenericParam);	// Owner
+				buffer.WriteCodedRID (rows [i].Col2, CodedIndex.TypeDefOrRef);	// Constraint
+			}
+		}
+	}
+
+	sealed class MetadataBuilder {
+
+		readonly internal ModuleDefinition module;
+		readonly internal ISymbolWriterProvider symbol_writer_provider;
+		readonly internal ISymbolWriter symbol_writer;
+		readonly internal TextMap text_map;
+		readonly internal string fq_name;
+
+		readonly Dictionary<TypeRefRow, MetadataToken> type_ref_map;
+		readonly Dictionary<uint, MetadataToken> type_spec_map;
+		readonly Dictionary<MemberRefRow, MetadataToken> member_ref_map;
+		readonly Dictionary<MethodSpecRow, MetadataToken> method_spec_map;
+		readonly Collection<GenericParameter> generic_parameters;
+		readonly Dictionary<MetadataToken, MetadataToken> method_def_map;
+
+		readonly internal CodeWriter code;
+		readonly internal DataBuffer data;
+		readonly internal ResourceBuffer resources;
+		readonly internal StringHeapBuffer string_heap;
+		readonly internal UserStringHeapBuffer user_string_heap;
+		readonly internal BlobHeapBuffer blob_heap;
+		readonly internal TableHeapBuffer table_heap;
+
+		internal MetadataToken entry_point;
+
+		RID type_rid = 1;
+		RID field_rid = 1;
+		RID method_rid = 1;
+		RID param_rid = 1;
+		RID property_rid = 1;
+		RID event_rid = 1;
+
+		readonly TypeRefTable type_ref_table;
+		readonly TypeDefTable type_def_table;
+		readonly FieldTable field_table;
+		readonly MethodTable method_table;
+		readonly ParamTable param_table;
+		readonly InterfaceImplTable iface_impl_table;
+		readonly MemberRefTable member_ref_table;
+		readonly ConstantTable constant_table;
+		readonly CustomAttributeTable custom_attribute_table;
+		readonly DeclSecurityTable declsec_table;
+		readonly StandAloneSigTable standalone_sig_table;
+		readonly EventMapTable event_map_table;
+		readonly EventTable event_table;
+		readonly PropertyMapTable property_map_table;
+		readonly PropertyTable property_table;
+		readonly TypeSpecTable typespec_table;
+		readonly MethodSpecTable method_spec_table;
+
+		readonly internal bool write_symbols;
+
+		public MetadataBuilder (ModuleDefinition module, string fq_name, ISymbolWriterProvider symbol_writer_provider, ISymbolWriter symbol_writer)
+		{
+			this.module = module;
+			this.text_map = CreateTextMap ();
+			this.fq_name = fq_name;
+			this.symbol_writer_provider = symbol_writer_provider;
+			this.symbol_writer = symbol_writer;
+			this.write_symbols = symbol_writer != null;
+			this.code = new CodeWriter (this);
+			this.data = new DataBuffer ();
+			this.resources = new ResourceBuffer ();
+			this.string_heap = new StringHeapBuffer ();
+			this.user_string_heap = new UserStringHeapBuffer ();
+			this.blob_heap = new BlobHeapBuffer ();
+			this.table_heap = new TableHeapBuffer (module, this);
+
+			this.type_ref_table = GetTable<TypeRefTable> (Table.TypeRef);
+			this.type_def_table = GetTable<TypeDefTable> (Table.TypeDef);
+			this.field_table = GetTable<FieldTable> (Table.Field);
+			this.method_table = GetTable<MethodTable> (Table.Method);
+			this.param_table = GetTable<ParamTable> (Table.Param);
+			this.iface_impl_table = GetTable<InterfaceImplTable> (Table.InterfaceImpl);
+			this.member_ref_table = GetTable<MemberRefTable> (Table.MemberRef);
+			this.constant_table = GetTable<ConstantTable> (Table.Constant);
+			this.custom_attribute_table = GetTable<CustomAttributeTable> (Table.CustomAttribute);
+			this.declsec_table = GetTable<DeclSecurityTable> (Table.DeclSecurity);
+			this.standalone_sig_table = GetTable<StandAloneSigTable> (Table.StandAloneSig);
+			this.event_map_table = GetTable<EventMapTable> (Table.EventMap);
+			this.event_table = GetTable<EventTable> (Table.Event);
+			this.property_map_table = GetTable<PropertyMapTable> (Table.PropertyMap);
+			this.property_table = GetTable<PropertyTable> (Table.Property);
+			this.typespec_table = GetTable<TypeSpecTable> (Table.TypeSpec);
+			this.method_spec_table = GetTable<MethodSpecTable> (Table.MethodSpec);
+
+			var row_equality_comparer = new RowEqualityComparer ();
+			type_ref_map = new Dictionary<TypeRefRow, MetadataToken> (row_equality_comparer);
+			type_spec_map = new Dictionary<uint, MetadataToken> ();
+			member_ref_map = new Dictionary<MemberRefRow, MetadataToken> (row_equality_comparer);
+			method_spec_map = new Dictionary<MethodSpecRow, MetadataToken> (row_equality_comparer);
+			generic_parameters = new Collection<GenericParameter> ();
+			if (write_symbols)
+				method_def_map = new Dictionary<MetadataToken, MetadataToken> ();
+		}
+
+		TextMap CreateTextMap ()
+		{
+			var map = new TextMap ();
+			map.AddMap (TextSegment.ImportAddressTable, module.Architecture == TargetArchitecture.I386 ? 8 : 16);
+			map.AddMap (TextSegment.CLIHeader, 0x48, 8);
+			return map;
+		}
+
+		TTable GetTable<TTable> (Table table) where TTable : MetadataTable, new ()
+		{
+			return table_heap.GetTable<TTable> (table);
+		}
+
+		uint GetStringIndex (string @string)
+		{
+			if (string.IsNullOrEmpty (@string))
+				return 0;
+
+			return string_heap.GetStringIndex (@string);
+		}
+
+		uint GetBlobIndex (ByteBuffer blob)
+		{
+			if (blob.length == 0)
+				return 0;
+
+			return blob_heap.GetBlobIndex (blob);
+		}
+
+		uint GetBlobIndex (byte [] blob)
+		{
+			if (blob.IsNullOrEmpty ())
+				return 0;
+
+			return GetBlobIndex (new ByteBuffer (blob));
+		}
+
+		public void BuildMetadata ()
+		{
+			BuildModule ();
+
+			table_heap.WriteTableHeap ();
+		}
+
+		void BuildModule ()
+		{
+			var table = GetTable<ModuleTable> (Table.Module);
+			table.row = GetStringIndex (module.Name);
+
+			var assembly = module.Assembly;
+
+			if (assembly != null)
+				BuildAssembly ();
+
+			if (module.HasAssemblyReferences)
+				AddAssemblyReferences ();
+
+			if (module.HasModuleReferences)
+				AddModuleReferences ();
+
+			if (module.HasResources)
+				AddResources ();
+
+			if (module.HasExportedTypes)
+				AddExportedTypes ();
+
+			BuildTypes ();
+
+			if (assembly != null) {
+				if (assembly.HasCustomAttributes)
+					AddCustomAttributes (assembly);
+
+				if (assembly.HasSecurityDeclarations)
+					AddSecurityDeclarations (assembly);
+			}
+
+			if (module.HasCustomAttributes)
+				AddCustomAttributes (module);
+
+			if (module.EntryPoint != null)
+				entry_point = LookupToken (module.EntryPoint);
+		}
+
+		void BuildAssembly ()
+		{
+			var assembly = module.Assembly;
+			var name = assembly.Name;
+
+			var table = GetTable<AssemblyTable> (Table.Assembly);
+
+			table.row = new AssemblyRow (
+				name.HashAlgorithm,
+				(ushort) name.Version.Major,
+				(ushort) name.Version.Minor,
+				(ushort) name.Version.Build,
+				(ushort) name.Version.Revision,
+				name.Attributes,
+				GetBlobIndex (name.PublicKey),
+				GetStringIndex (name.Name),
+				GetStringIndex (name.Culture));
+
+			if (assembly.Modules.Count > 1)
+				BuildModules ();
+		}
+
+		void BuildModules ()
+		{
+			var modules = this.module.Assembly.Modules;
+			var table = GetTable<FileTable> (Table.File);
+
+			for (int i = 0; i < modules.Count; i++) {
+				var module = modules [i];
+				if (module.IsMain)
+					continue;
+
+				var parameters = new WriterParameters {
+					SymbolWriterProvider = symbol_writer_provider,
+				};
+
+				var file_name = GetModuleFileName (module.Name);
+				module.Write (file_name, parameters);
+
+				var hash = CryptoService.ComputeHash (file_name);
+
+				table.AddRow (new FileRow (
+					FileAttributes.ContainsMetaData,
+					GetStringIndex (module.Name),
+					GetBlobIndex (hash)));
+			}
+		}
+
+		string GetModuleFileName (string name)
+		{
+			if (string.IsNullOrEmpty (name))
+				throw new NotSupportedException ();
+
+			var path = Path.GetDirectoryName (fq_name);
+			return Path.Combine (path, name);
+		}
+
+		void AddAssemblyReferences ()
+		{
+			var references = module.AssemblyReferences;
+			var table = GetTable<AssemblyRefTable> (Table.AssemblyRef);
+
+			for (int i = 0; i < references.Count; i++) {
+				var reference = references [i];
+
+				var key_or_token = reference.PublicKey.IsNullOrEmpty ()
+					? reference.PublicKeyToken
+					: reference.PublicKey;
+
+				var rid = table.AddRow (new AssemblyRefRow (
+					(ushort) reference.Version.Major,
+					(ushort) reference.Version.Minor,
+					(ushort) reference.Version.Build,
+					(ushort) reference.Version.Revision,
+					reference.Attributes,
+					GetBlobIndex (key_or_token),
+					GetStringIndex (reference.Name),
+					GetStringIndex (reference.Culture),
+					GetBlobIndex (reference.Hash)));
+
+				reference.token = new MetadataToken (TokenType.AssemblyRef, rid);
+			}
+		}
+
+		void AddModuleReferences ()
+		{
+			var references = module.ModuleReferences;
+			var table = GetTable<ModuleRefTable> (Table.ModuleRef);
+
+			for (int i = 0; i < references.Count; i++) {
+				var reference = references [i];
+
+				reference.token = new MetadataToken (
+					TokenType.ModuleRef,
+					table.AddRow (GetStringIndex (reference.Name)));
+			}
+		}
+
+		void AddResources ()
+		{
+			var resources = module.Resources;
+			var table = GetTable<ManifestResourceTable> (Table.ManifestResource);
+
+			for (int i = 0; i < resources.Count; i++) {
+				var resource = resources [i];
+
+				var row = new ManifestResourceRow (
+					0,
+					resource.Attributes,
+					GetStringIndex (resource.Name),
+					0);
+
+				switch (resource.ResourceType) {
+				case ResourceType.Embedded:
+					row.Col1 = AddEmbeddedResource ((EmbeddedResource) resource);
+					break;
+				case ResourceType.Linked:
+					row.Col4 = CodedIndex.Implementation.CompressMetadataToken (
+						new MetadataToken (
+							TokenType.File,
+							AddLinkedResource ((LinkedResource) resource)));
+					break;
+				case ResourceType.AssemblyLinked:
+					row.Col4 = CodedIndex.Implementation.CompressMetadataToken (
+						((AssemblyLinkedResource) resource).Assembly.MetadataToken);
+					break;
+				default:
+					throw new NotSupportedException ();
+				}
+
+				table.AddRow (row);
+			}
+		}
+
+		uint AddLinkedResource (LinkedResource resource)
+		{
+			var table = GetTable<FileTable> (Table.File);
+
+			var hash = resource.Hash.IsNullOrEmpty ()
+				? CryptoService.ComputeHash (resource.File)
+				: resource.Hash;
+
+			return (uint) table.AddRow (new FileRow (
+				FileAttributes.ContainsNoMetaData,
+				GetStringIndex (resource.File),
+				GetBlobIndex (hash)));
+		}
+
+		uint AddEmbeddedResource (EmbeddedResource resource)
+		{
+			return resources.AddResource (resource.GetResourceData ());
+		}
+
+		void AddExportedTypes ()
+		{
+			var exported_types = module.ExportedTypes;
+			var table = GetTable<ExportedTypeTable> (Table.ExportedType);
+
+			for (int i = 0; i < exported_types.Count; i++) {
+				var exported_type = exported_types [i];
+
+				var rid = table.AddRow (new ExportedTypeRow (
+					exported_type.Attributes,
+					(uint) exported_type.Identifier,
+					GetStringIndex (exported_type.Name),
+					GetStringIndex (exported_type.Namespace),
+					MakeCodedRID (GetExportedTypeScope (exported_type), CodedIndex.Implementation)));
+
+				exported_type.token = new MetadataToken (TokenType.ExportedType, rid);
+			}
+		}
+
+		MetadataToken GetExportedTypeScope (ExportedType exported_type)
+		{
+			if (exported_type.DeclaringType != null)
+				return exported_type.DeclaringType.MetadataToken;
+
+			var scope = exported_type.Scope;
+			switch (scope.MetadataToken.TokenType) {
+			case TokenType.AssemblyRef:
+				return scope.MetadataToken;
+			case TokenType.ModuleRef:
+				var file_table = GetTable<FileTable> (Table.File);
+				for (int i = 0; i < file_table.length; i++)
+					if (file_table.rows [i].Col2 == GetStringIndex (scope.Name))
+						return new MetadataToken (TokenType.File, i + 1);
+
+				break;
+			}
+
+			throw new NotSupportedException ();
+		}
+
+		void BuildTypes ()
+		{
+			if (!module.HasTypes)
+				return;
+
+			AttachTokens ();
+			AddTypeDefs ();
+			AddGenericParameters ();
+		}
+
+		void AttachTokens ()
+		{
+			var types = module.Types;
+
+			for (int i = 0; i < types.Count; i++)
+				AttachTypeDefToken (types [i]);
+		}
+
+		void AttachTypeDefToken (TypeDefinition type)
+		{
+			type.token = new MetadataToken (TokenType.TypeDef, type_rid++);
+			type.fields_range.Start = field_rid;
+			type.methods_range.Start = method_rid;
+
+			if (type.HasFields)
+				AttachFieldsDefToken (type);
+
+			if (type.HasMethods)
+				AttachMethodsDefToken (type);
+
+			if (type.HasNestedTypes)
+				AttachNestedTypesDefToken (type);
+		}
+
+		void AttachNestedTypesDefToken (TypeDefinition type)
+		{
+			var nested_types = type.NestedTypes;
+			for (int i = 0; i < nested_types.Count; i++)
+				AttachTypeDefToken (nested_types [i]);
+		}
+
+		void AttachFieldsDefToken (TypeDefinition type)
+		{
+			var fields = type.Fields;
+			type.fields_range.Length = (uint) fields.Count;
+			for (int i = 0; i < fields.Count; i++)
+				fields [i].token = new MetadataToken (TokenType.Field, field_rid++);
+		}
+
+		void AttachMethodsDefToken (TypeDefinition type)
+		{
+			var methods = type.Methods;
+			type.methods_range.Length = (uint) methods.Count;
+			for (int i = 0; i < methods.Count; i++) {
+				var method = methods [i];
+				var new_token = new MetadataToken (TokenType.Method, method_rid++);
+
+				if (write_symbols && method.token != MetadataToken.Zero)
+					method_def_map.Add (new_token, method.token);
+
+				method.token = new_token;
+			}
+		}
+
+		public bool TryGetOriginalMethodToken (MetadataToken new_token, out MetadataToken original)
+		{
+			return method_def_map.TryGetValue (new_token, out original);
+		}
+
+		MetadataToken GetTypeToken (TypeReference type)
+		{
+			if (type == null)
+				return MetadataToken.Zero;
+
+			if (type.IsDefinition)
+				return type.token;
+
+			if (type.IsTypeSpecification ())
+				return GetTypeSpecToken (type);
+
+			return GetTypeRefToken (type);
+		}
+
+		MetadataToken GetTypeSpecToken (TypeReference type)
+		{
+			var row = GetBlobIndex (GetTypeSpecSignature (type));
+
+			MetadataToken token;
+			if (type_spec_map.TryGetValue (row, out token))
+				return token;
+
+			return AddTypeSpecification (type, row);
+		}
+
+		MetadataToken AddTypeSpecification (TypeReference type, uint row)
+		{
+			type.token = new MetadataToken (TokenType.TypeSpec, typespec_table.AddRow (row));
+
+			var token = type.token;
+			type_spec_map.Add (row, token);
+			return token;
+		}
+
+		MetadataToken GetTypeRefToken (TypeReference type)
+		{
+			var row = CreateTypeRefRow (type);
+
+			MetadataToken token;
+			if (type_ref_map.TryGetValue (row, out token))
+				return token;
+
+			return AddTypeReference (type, row);
+		}
+
+		TypeRefRow CreateTypeRefRow (TypeReference type)
+		{
+			var scope_token = type.IsNested
+				? GetTypeRefToken (type.DeclaringType)
+				: type.Scope.MetadataToken;
+
+			return new TypeRefRow (
+				MakeCodedRID (scope_token, CodedIndex.ResolutionScope),
+				GetStringIndex (type.Name),
+				GetStringIndex (type.Namespace));
+		}
+
+		static CodedRID MakeCodedRID (IMetadataTokenProvider provider, CodedIndex index)
+		{
+			return MakeCodedRID (provider.MetadataToken, index);
+		}
+
+		static CodedRID MakeCodedRID (MetadataToken token, CodedIndex index)
+		{
+			return index.CompressMetadataToken (token);
+		}
+
+		MetadataToken AddTypeReference (TypeReference type, TypeRefRow row)
+		{
+			type.token = new MetadataToken (TokenType.TypeRef, type_ref_table.AddRow (row));
+
+			var token = type.token;
+			type_ref_map.Add (row, token);
+			return token;
+		}
+
+		void AddTypeDefs ()
+		{
+			var types = module.Types;
+
+			for (int i = 0; i < types.Count; i++)
+				AddType (types [i]);
+		}
+
+		void AddType (TypeDefinition type)
+		{
+			type_def_table.AddRow (new TypeDefRow (
+				type.Attributes,
+				GetStringIndex (type.Name),
+				GetStringIndex (type.Namespace),
+				MakeCodedRID (GetTypeToken (type.BaseType), CodedIndex.TypeDefOrRef),
+				type.fields_range.Start,
+				type.methods_range.Start));
+
+			if (type.HasGenericParameters)
+				AddGenericParameters (type);
+
+			if (type.HasInterfaces)
+				AddInterfaces (type);
+
+			if (type.HasLayoutInfo)
+				AddLayoutInfo (type);
+
+			if (type.HasFields)
+				AddFields (type);
+
+			if (type.HasMethods)
+				AddMethods (type);
+
+			if (type.HasProperties)
+				AddProperties (type);
+
+			if (type.HasEvents)
+				AddEvents (type);
+
+			if (type.HasCustomAttributes)
+				AddCustomAttributes (type);
+
+			if (type.HasSecurityDeclarations)
+				AddSecurityDeclarations (type);
+
+			if (type.HasNestedTypes)
+				AddNestedTypes (type);
+		}
+
+		void AddGenericParameters (IGenericParameterProvider owner)
+		{
+			var parameters = owner.GenericParameters;
+
+			for (int i = 0; i < parameters.Count; i++)
+				generic_parameters.Add (parameters [i]);
+		}
+
+		sealed class GenericParameterComparer : IComparer<GenericParameter> {
+
+			public int Compare (GenericParameter a, GenericParameter b)
+			{
+				var a_owner = MakeCodedRID (a.Owner, CodedIndex.TypeOrMethodDef);
+				var b_owner = MakeCodedRID (b.Owner, CodedIndex.TypeOrMethodDef);
+				if (a_owner == b_owner) {
+					var a_pos = a.Position;
+					var b_pos = b.Position;
+					return a_pos == b_pos ? 0 : a_pos > b_pos ? 1 : -1;
+				}
+
+				return a_owner > b_owner ? 1 : -1;
+			}
+		}
+
+		void AddGenericParameters ()
+		{
+			var items = this.generic_parameters.items;
+			var size = this.generic_parameters.size;
+			Array.Sort (items, 0, size, new GenericParameterComparer ());
+
+			var generic_param_table = GetTable<GenericParamTable> (Table.GenericParam);
+			var generic_param_constraint_table = GetTable<GenericParamConstraintTable> (Table.GenericParamConstraint);
+
+			for (int i = 0; i < size; i++) {
+				var generic_parameter = items [i];
+
+				var rid = generic_param_table.AddRow (new GenericParamRow (
+					(ushort) generic_parameter.Position,
+					generic_parameter.Attributes,
+					MakeCodedRID (generic_parameter.Owner, CodedIndex.TypeOrMethodDef),
+					GetStringIndex (generic_parameter.Name)));
+
+				generic_parameter.token = new MetadataToken (TokenType.GenericParam, rid);
+
+				if (generic_parameter.HasConstraints)
+					AddConstraints (generic_parameter, generic_param_constraint_table);
+
+				if (generic_parameter.HasCustomAttributes)
+					AddCustomAttributes (generic_parameter);
+			}
+		}
+
+		void AddConstraints (GenericParameter generic_parameter, GenericParamConstraintTable table)
+		{
+			var constraints = generic_parameter.Constraints;
+
+			var rid = generic_parameter.token.RID;
+
+			for (int i = 0; i < constraints.Count; i++)
+				table.AddRow (new GenericParamConstraintRow (
+					rid,
+					MakeCodedRID (GetTypeToken (constraints [i]), CodedIndex.TypeDefOrRef)));
+		}
+
+		void AddInterfaces (TypeDefinition type)
+		{
+			var interfaces = type.Interfaces;
+			var type_rid = type.token.RID;
+
+			for (int i = 0; i < interfaces.Count; i++)
+				iface_impl_table.AddRow (new InterfaceImplRow (
+					type_rid,
+					MakeCodedRID (GetTypeToken (interfaces [i]), CodedIndex.TypeDefOrRef)));
+		}
+
+		void AddLayoutInfo (TypeDefinition type)
+		{
+			var table = GetTable<ClassLayoutTable> (Table.ClassLayout);
+
+			table.AddRow (new ClassLayoutRow (
+				(ushort) type.PackingSize,
+				(uint) type.ClassSize,
+				type.token.RID));
+		}
+
+		void AddNestedTypes (TypeDefinition type)
+		{
+			var nested_types = type.NestedTypes;
+			var nested_table = GetTable<NestedClassTable> (Table.NestedClass);
+
+			for (int i = 0; i < nested_types.Count; i++) {
+				var nested = nested_types [i];
+				AddType (nested);
+				nested_table.AddRow (new NestedClassRow (nested.token.RID, type.token.RID));
+			}
+		}
+
+		void AddFields (TypeDefinition type)
+		{
+			var fields = type.Fields;
+
+			for (int i = 0; i < fields.Count; i++)
+				AddField (fields [i]);
+		}
+
+		void AddField (FieldDefinition field)
+		{
+			field_table.AddRow (new FieldRow (
+				field.Attributes,
+				GetStringIndex (field.Name),
+				GetBlobIndex (GetFieldSignature (field))));
+
+			if (!field.InitialValue.IsNullOrEmpty ())
+				AddFieldRVA (field);
+
+			if (field.HasLayoutInfo)
+				AddFieldLayout (field);
+
+			if (field.HasCustomAttributes)
+				AddCustomAttributes (field);
+
+			if (field.HasConstant)
+				AddConstant (field, field.FieldType);
+
+			if (field.HasMarshalInfo)
+				AddMarshalInfo (field);
+		}
+
+		void AddFieldRVA (FieldDefinition field)
+		{
+			var table = GetTable<FieldRVATable> (Table.FieldRVA);
+			table.AddRow (new FieldRVARow (
+				data.AddData (field.InitialValue),
+				field.token.RID));
+		}
+
+		void AddFieldLayout (FieldDefinition field)
+		{
+			var table = GetTable<FieldLayoutTable> (Table.FieldLayout);
+			table.AddRow (new FieldLayoutRow ((uint) field.Offset, field.token.RID));
+		}
+
+		void AddMethods (TypeDefinition type)
+		{
+			var methods = type.Methods;
+
+			for (int i = 0; i < methods.Count; i++)
+				AddMethod (methods [i]);
+		}
+
+		void AddMethod (MethodDefinition method)
+		{
+			method_table.AddRow (new MethodRow (
+				method.HasBody ? code.WriteMethodBody (method) : 0,
+				method.ImplAttributes,
+				method.Attributes,
+				GetStringIndex (method.Name),
+				GetBlobIndex (GetMethodSignature (method)),
+				param_rid));
+
+			AddParameters (method);
+
+			if (method.HasGenericParameters)
+				AddGenericParameters (method);
+
+			if (method.IsPInvokeImpl)
+				AddPInvokeInfo (method);
+
+			if (method.HasCustomAttributes)
+				AddCustomAttributes (method);
+
+			if (method.HasSecurityDeclarations)
+				AddSecurityDeclarations (method);
+
+			if (method.HasOverrides)
+				AddOverrides (method);
+		}
+
+		void AddParameters (MethodDefinition method)
+		{
+			var return_parameter = method.MethodReturnType.parameter;
+
+			if (return_parameter != null && RequiresParameterRow (return_parameter))
+				AddParameter (0, return_parameter, param_table);
+
+			if (!method.HasParameters)
+				return;
+
+			var parameters = method.Parameters;
+
+			for (int i = 0; i < parameters.Count; i++) {
+				var parameter = parameters [i];
+				if (!RequiresParameterRow (parameter))
+					continue;
+
+				AddParameter ((ushort) (i + 1), parameter, param_table);
+			}
+		}
+
+		void AddPInvokeInfo (MethodDefinition method)
+		{
+			var pinvoke = method.PInvokeInfo;
+			if (pinvoke == null)
+				throw new ArgumentException ();
+
+			var table = GetTable<ImplMapTable> (Table.ImplMap);
+			table.AddRow (new ImplMapRow (
+				pinvoke.Attributes,
+				MakeCodedRID (method, CodedIndex.MemberForwarded),
+				GetStringIndex (pinvoke.EntryPoint),
+				pinvoke.Module.MetadataToken.RID));
+		}
+
+		void AddOverrides (MethodDefinition method)
+		{
+			var overrides = method.Overrides;
+			var table = GetTable<MethodImplTable> (Table.MethodImpl);
+
+			for (int i = 0; i < overrides.Count; i++) {
+				table.AddRow (new MethodImplRow (
+					method.DeclaringType.token.RID,
+					MakeCodedRID (method, CodedIndex.MethodDefOrRef),
+					MakeCodedRID (LookupToken (overrides [i]), CodedIndex.MethodDefOrRef)));
+			}
+		}
+
+		static bool RequiresParameterRow (ParameterDefinition parameter)
+		{
+			return !string.IsNullOrEmpty (parameter.Name)
+				|| parameter.Attributes != ParameterAttributes.None
+				|| parameter.HasMarshalInfo
+				|| parameter.HasConstant
+				|| parameter.HasCustomAttributes;
+		}
+
+		void AddParameter (ushort sequence, ParameterDefinition parameter, ParamTable table)
+		{
+			table.AddRow (new ParamRow (
+				parameter.Attributes,
+				sequence,
+				GetStringIndex (parameter.Name)));
+
+			parameter.token = new MetadataToken (TokenType.Param, param_rid++);
+
+			if (parameter.HasCustomAttributes)
+				AddCustomAttributes (parameter);
+
+			if (parameter.HasConstant)
+				AddConstant (parameter, parameter.ParameterType);
+
+			if (parameter.HasMarshalInfo)
+				AddMarshalInfo (parameter);
+		}
+
+		void AddMarshalInfo (IMarshalInfoProvider owner)
+		{
+			var table = GetTable<FieldMarshalTable> (Table.FieldMarshal);
+
+			table.AddRow (new FieldMarshalRow (
+				MakeCodedRID (owner, CodedIndex.HasFieldMarshal),
+				GetBlobIndex (GetMarshalInfoSignature (owner))));
+		}
+
+		void AddProperties (TypeDefinition type)
+		{
+			var properties = type.Properties;
+
+			property_map_table.AddRow (new PropertyMapRow (type.token.RID, property_rid));
+
+			for (int i = 0; i < properties.Count; i++)
+				AddProperty (properties [i]);
+		}
+
+		void AddProperty (PropertyDefinition property)
+		{
+			property_table.AddRow (new PropertyRow (
+				property.Attributes,
+				GetStringIndex (property.Name),
+				GetBlobIndex (GetPropertySignature (property))));
+			property.token = new MetadataToken (TokenType.Property, property_rid++);
+
+			var method = property.GetMethod;
+			if (method != null)
+				AddSemantic (MethodSemanticsAttributes.Getter, property, method);
+
+			method = property.SetMethod;
+			if (method != null)
+				AddSemantic (MethodSemanticsAttributes.Setter, property, method);
+
+			if (property.HasOtherMethods)
+				AddOtherSemantic (property, property.OtherMethods);
+
+			if (property.HasCustomAttributes)
+				AddCustomAttributes (property);
+
+			if (property.HasConstant)
+				AddConstant (property, property.PropertyType);
+		}
+
+		void AddOtherSemantic (IMetadataTokenProvider owner, Collection<MethodDefinition> others)
+		{
+			for (int i = 0; i < others.Count; i++)
+				AddSemantic (MethodSemanticsAttributes.Other, owner, others [i]);
+		}
+
+		void AddEvents (TypeDefinition type)
+		{
+			var events = type.Events;
+
+			event_map_table.AddRow (new EventMapRow (type.token.RID, event_rid));
+
+			for (int i = 0; i < events.Count; i++)
+				AddEvent (events [i]);
+		}
+
+		void AddEvent (EventDefinition @event)
+		{
+			event_table.AddRow (new EventRow (
+				@event.Attributes,
+				GetStringIndex (@event.Name),
+				MakeCodedRID (GetTypeToken (@event.EventType), CodedIndex.TypeDefOrRef)));
+			@event.token = new MetadataToken (TokenType.Event, event_rid++);
+
+			var method = @event.AddMethod;
+			if (method != null)
+				AddSemantic (MethodSemanticsAttributes.AddOn, @event, method);
+
+			method = @event.InvokeMethod;
+			if (method != null)
+				AddSemantic (MethodSemanticsAttributes.Fire, @event, method);
+
+			method = @event.RemoveMethod;
+			if (method != null)
+				AddSemantic (MethodSemanticsAttributes.RemoveOn, @event, method);
+
+			if (@event.HasOtherMethods)
+				AddOtherSemantic (@event, @event.OtherMethods);
+
+			if (@event.HasCustomAttributes)
+				AddCustomAttributes (@event);
+		}
+
+		void AddSemantic (MethodSemanticsAttributes semantics, IMetadataTokenProvider provider, MethodDefinition method)
+		{
+			method.SemanticsAttributes = semantics;
+			var table = GetTable<MethodSemanticsTable> (Table.MethodSemantics);
+
+			table.AddRow (new MethodSemanticsRow (
+				semantics,
+				method.token.RID,
+				MakeCodedRID (provider, CodedIndex.HasSemantics)));
+		}
+
+		void AddConstant (IConstantProvider owner, TypeReference type)
+		{
+			var constant = owner.Constant;
+			var etype = GetConstantType (type, constant);
+
+			constant_table.AddRow (new ConstantRow (
+				etype,
+				MakeCodedRID (owner.MetadataToken, CodedIndex.HasConstant),
+				GetBlobIndex (GetConstantSignature (etype, constant))));
+		}
+
+		static ElementType GetConstantType (TypeReference constant_type, object constant)
+		{
+			if (constant == null)
+				return ElementType.Class;
+
+			var etype = constant_type.etype;
+			switch (etype) {
+			case ElementType.None:
+				var type = constant_type.CheckedResolve ();
+				if (type.IsEnum)
+					return GetConstantType (type.GetEnumUnderlyingType (), constant);
+
+				return ElementType.Class;
+			case ElementType.String:
+				return ElementType.String;
+			case ElementType.Object:
+				return GetConstantType (constant.GetType ());
+			case ElementType.Array:
+			case ElementType.SzArray:
+			case ElementType.MVar:
+			case ElementType.Var:
+				return ElementType.Class;
+			case ElementType.GenericInst:
+			case ElementType.CModOpt:
+			case ElementType.CModReqD:
+			case ElementType.ByRef:
+			case ElementType.Sentinel:
+				return GetConstantType (((TypeSpecification) constant_type).ElementType, constant);
+			case ElementType.Boolean:
+			case ElementType.Char:
+			case ElementType.I:
+			case ElementType.I1:
+			case ElementType.I2:
+			case ElementType.I4:
+			case ElementType.I8:
+			case ElementType.U:
+			case ElementType.U1:
+			case ElementType.U2:
+			case ElementType.U4:
+			case ElementType.U8:
+			case ElementType.R4:
+			case ElementType.R8:
+				return GetConstantType (constant.GetType ());
+			default:
+				return etype;
+			}
+		}
+
+		static ElementType GetConstantType (Type type)
+		{
+			switch (Type.GetTypeCode (type)) {
+			case TypeCode.Boolean:
+				return ElementType.Boolean;
+			case TypeCode.Byte:
+				return ElementType.U1;
+			case TypeCode.SByte:
+				return ElementType.I1;
+			case TypeCode.Char:
+				return ElementType.Char;
+			case TypeCode.Int16:
+				return ElementType.I2;
+			case TypeCode.UInt16:
+				return ElementType.U2;
+			case TypeCode.Int32:
+				return ElementType.I4;
+			case TypeCode.UInt32:
+				return ElementType.U4;
+			case TypeCode.Int64:
+				return ElementType.I8;
+			case TypeCode.UInt64:
+				return ElementType.U8;
+			case TypeCode.Single:
+				return ElementType.R4;
+			case TypeCode.Double:
+				return ElementType.R8;
+			case TypeCode.String:
+				return ElementType.String;
+			default:
+				throw new NotSupportedException (type.FullName);
+			}
+		}
+
+		void AddCustomAttributes (ICustomAttributeProvider owner)
+		{
+			var custom_attributes = owner.CustomAttributes;
+
+			for (int i = 0; i < custom_attributes.Count; i++) {
+				var attribute = custom_attributes [i];
+
+				custom_attribute_table.AddRow (new CustomAttributeRow (
+					MakeCodedRID (owner, CodedIndex.HasCustomAttribute),
+					MakeCodedRID (LookupToken (attribute.Constructor), CodedIndex.CustomAttributeType),
+					GetBlobIndex (GetCustomAttributeSignature (attribute))));
+			}
+		}
+
+		void AddSecurityDeclarations (ISecurityDeclarationProvider owner)
+		{
+			var declarations = owner.SecurityDeclarations;
+
+			for (int i = 0; i < declarations.Count; i++) {
+				var declaration = declarations [i];
+
+				declsec_table.AddRow (new DeclSecurityRow (
+					declaration.Action,
+					MakeCodedRID (owner, CodedIndex.HasDeclSecurity),
+					GetBlobIndex (GetSecurityDeclarationSignature (declaration))));
+			}
+		}
+
+		MetadataToken GetMemberRefToken (MemberReference member)
+		{
+			var row = CreateMemberRefRow (member);
+
+			MetadataToken token;
+			if (member_ref_map.TryGetValue (row, out token))
+				return token;
+
+			AddMemberReference (member, row);
+
+			return member.token;
+		}
+
+		MemberRefRow CreateMemberRefRow (MemberReference member)
+		{
+			return new MemberRefRow (
+				MakeCodedRID (GetTypeToken (member.DeclaringType), CodedIndex.MemberRefParent),
+				GetStringIndex (member.Name),
+				GetBlobIndex (GetMemberRefSignature (member)));
+		}
+
+		void AddMemberReference (MemberReference member, MemberRefRow row)
+		{
+			member.token = new MetadataToken (TokenType.MemberRef, member_ref_table.AddRow (row));
+			member_ref_map.Add (row, member.token);
+		}
+
+		MetadataToken GetMethodSpecToken (MethodSpecification method_spec)
+		{
+			var row = CreateMethodSpecRow (method_spec);
+
+			MetadataToken token;
+			if (method_spec_map.TryGetValue (row, out token))
+				return token;
+
+			AddMethodSpecification (method_spec, row);
+
+			return method_spec.token;
+		}
+
+		void AddMethodSpecification (MethodSpecification method_spec, MethodSpecRow row)
+		{
+			method_spec.token = new MetadataToken (TokenType.MethodSpec, method_spec_table.AddRow (row));
+			method_spec_map.Add (row, method_spec.token);
+		}
+
+		MethodSpecRow CreateMethodSpecRow (MethodSpecification method_spec)
+		{
+			return new MethodSpecRow (
+				MakeCodedRID (LookupToken (method_spec.ElementMethod), CodedIndex.MethodDefOrRef),
+				GetBlobIndex (GetMethodSpecSignature (method_spec)));
+		}
+
+		SignatureWriter CreateSignatureWriter ()
+		{
+			return new SignatureWriter (this);
+		}
+
+		SignatureWriter GetMethodSpecSignature (MethodSpecification method_spec)
+		{
+			if (!method_spec.IsGenericInstance)
+				throw new NotSupportedException ();
+
+			var generic_instance = (GenericInstanceMethod) method_spec;
+
+			var signature = CreateSignatureWriter ();
+			signature.WriteByte (0x0a);
+
+			signature.WriteGenericInstanceSignature (generic_instance);
+
+			return signature;
+		}
+
+		public uint AddStandAloneSignature (uint signature)
+		{
+			return (uint) standalone_sig_table.AddRow (signature);
+		}
+
+		public uint GetLocalVariableBlobIndex (Collection<VariableDefinition> variables)
+		{
+			return GetBlobIndex (GetVariablesSignature (variables));
+		}
+
+		public uint GetCallSiteBlobIndex (CallSite call_site)
+		{
+			return GetBlobIndex (GetMethodSignature (call_site));
+		}
+
+		SignatureWriter GetVariablesSignature (Collection<VariableDefinition> variables)
+		{
+			var signature = CreateSignatureWriter ();
+			signature.WriteByte (0x7);
+			signature.WriteCompressedUInt32 ((uint) variables.Count);
+			for (int i = 0; i < variables.Count; i++)
+				signature.WriteTypeSignature (variables [i].VariableType);
+			return signature;
+		}
+
+		SignatureWriter GetFieldSignature (FieldReference field)
+		{
+			var signature = CreateSignatureWriter ();
+			signature.WriteByte (0x6);
+			signature.WriteTypeSignature (field.FieldType);
+			return signature;
+		}
+
+		SignatureWriter GetMethodSignature (IMethodSignature method)
+		{
+			var signature = CreateSignatureWriter ();
+			signature.WriteMethodSignature (method);
+			return signature;
+		}
+
+		SignatureWriter GetMemberRefSignature (MemberReference member)
+		{
+			var field = member as FieldReference;
+			if (field != null)
+				return GetFieldSignature (field);
+
+			var method = member as MethodReference;
+			if (method != null)
+				return GetMethodSignature (method);
+
+			throw new NotSupportedException ();
+		}
+
+		SignatureWriter GetPropertySignature (PropertyDefinition property)
+		{
+			var signature = CreateSignatureWriter ();
+			byte calling_convention = 0x8;
+			if (property.HasThis)
+				calling_convention |= 0x20;
+
+			uint param_count = 0;
+			Collection<ParameterDefinition> parameters = null;
+
+			if (property.HasParameters) {
+				parameters = property.Parameters;
+				param_count = (uint) parameters.Count;
+			}
+
+			signature.WriteByte (calling_convention);
+			signature.WriteCompressedUInt32 (param_count);
+			signature.WriteTypeSignature (property.PropertyType);
+
+			if (param_count == 0)
+				return signature;
+
+			for (int i = 0; i < param_count; i++)
+				signature.WriteTypeSignature (parameters [i].ParameterType);
+
+			return signature;
+		}
+
+		SignatureWriter GetTypeSpecSignature (TypeReference type)
+		{
+			var signature = CreateSignatureWriter ();
+			signature.WriteTypeSignature (type);
+			return signature;
+		}
+
+		SignatureWriter GetConstantSignature (ElementType type, object value)
+		{
+			var signature = CreateSignatureWriter ();
+
+			switch (type) {
+			case ElementType.Array:
+			case ElementType.SzArray:
+			case ElementType.Class:
+			case ElementType.Object:
+			case ElementType.Var:
+			case ElementType.MVar:
+				signature.WriteInt32 (0);
+				break;
+			case ElementType.String:
+				signature.WriteConstantString ((string) value);
+				break;
+			default:
+				signature.WriteConstantPrimitive (value);
+				break;
+			}
+
+			return signature;
+		}
+
+		SignatureWriter GetCustomAttributeSignature (CustomAttribute attribute)
+		{
+			var signature = CreateSignatureWriter ();
+			if (!attribute.resolved) {
+				signature.WriteBytes (attribute.GetBlob ());
+				return signature;
+			}
+
+			signature.WriteUInt16 (0x0001);
+
+			signature.WriteCustomAttributeConstructorArguments (attribute);
+
+			signature.WriteCustomAttributeNamedArguments (attribute);
+
+			return signature;
+		}
+
+		SignatureWriter GetSecurityDeclarationSignature (SecurityDeclaration declaration)
+		{
+			var signature = CreateSignatureWriter ();
+			if (!declaration.resolved) {
+				signature.WriteBytes (declaration.GetBlob ());
+				return signature;
+			}
+
+			signature.WriteByte ((byte) '.');
+
+			var attributes = declaration.security_attributes;
+			if (attributes == null)
+				throw new NotSupportedException ();
+
+			signature.WriteCompressedUInt32 ((uint) attributes.Count);
+
+			for (int i = 0; i < attributes.Count; i++)
+				signature.WriteSecurityAttribute (attributes [i]);
+
+			return signature;
+		}
+
+		SignatureWriter GetMarshalInfoSignature (IMarshalInfoProvider owner)
+		{
+			var signature = CreateSignatureWriter ();
+
+			signature.WriteMarshalInfo (owner.MarshalInfo);
+
+			return signature;
+		}
+
+		static Exception CreateForeignMemberException (MemberReference member)
+		{
+			return new ArgumentException (string.Format ("Member '{0}' is declared in another module and needs to be imported", member));
+		}
+
+		public MetadataToken LookupToken (IMetadataTokenProvider provider)
+		{
+			if (provider == null)
+				throw new ArgumentNullException ();
+
+			var member = provider as MemberReference;
+			if (member == null || member.Module != module)
+				throw CreateForeignMemberException (member);
+
+			var token = provider.MetadataToken;
+
+			switch (token.TokenType) {
+			case TokenType.TypeDef:
+			case TokenType.Method:
+			case TokenType.Field:
+			case TokenType.Event:
+			case TokenType.Property:
+				return token;
+			case TokenType.TypeRef:
+			case TokenType.TypeSpec:
+			case TokenType.GenericParam:
+				return GetTypeToken ((TypeReference) provider);
+			case TokenType.MethodSpec:
+				return GetMethodSpecToken ((MethodSpecification) provider);
+			case TokenType.MemberRef:
+				return GetMemberRefToken (member);
+			default:
+				throw new NotSupportedException ();
+			}
+		}
+	}
+
+	sealed class SignatureWriter : ByteBuffer {
+
+		readonly MetadataBuilder metadata;
+
+		public SignatureWriter (MetadataBuilder metadata)
+			: base (6)
+		{
+			this.metadata = metadata;
+		}
+
+		public void WriteElementType (ElementType element_type)
+		{
+			WriteByte ((byte) element_type);
+		}
+
+		public void WriteUTF8String (string @string)
+		{
+			if (@string == null) {
+				WriteByte (0xff);
+				return;
+			}
+
+			var bytes = Encoding.UTF8.GetBytes (@string);
+			WriteCompressedUInt32 ((uint) bytes.Length);
+			WriteBytes (bytes);
+		}
+
+		public void WriteMethodSignature (IMethodSignature method)
+		{
+			byte calling_convention = (byte) method.CallingConvention;
+			if (method.HasThis)
+				calling_convention |= 0x20;
+			if (method.ExplicitThis)
+				calling_convention |= 0x40;
+
+			var generic_provider = method as IGenericParameterProvider;
+			var generic_arity = generic_provider != null && generic_provider.HasGenericParameters
+				? generic_provider.GenericParameters.Count
+				: 0;
+
+			if (generic_arity > 0)
+				calling_convention |= 0x10;
+
+			var param_count = method.HasParameters ? method.Parameters.Count : 0;
+
+			WriteByte (calling_convention);
+
+			if (generic_arity > 0)
+				WriteCompressedUInt32 ((uint) generic_arity);
+
+			WriteCompressedUInt32 ((uint) param_count);
+			WriteTypeSignature (method.ReturnType);
+
+			if (param_count == 0)
+				return;
+
+			var parameters = method.Parameters;
+
+			for (int i = 0; i < param_count; i++)
+				WriteTypeSignature (parameters [i].ParameterType);
+		}
+
+		uint MakeTypeDefOrRefCodedRID (TypeReference type)
+		{
+			return CodedIndex.TypeDefOrRef.CompressMetadataToken (metadata.LookupToken (type));
+		}
+
+		public void WriteTypeSignature (TypeReference type)
+		{
+			if (type == null)
+				throw new ArgumentNullException ();
+
+			var etype = type.etype;
+
+			switch (etype) {
+			case ElementType.MVar:
+			case ElementType.Var: {
+				var generic_parameter = (GenericParameter) type;
+
+				WriteElementType (etype);
+				var position = generic_parameter.Position;
+				if (position == -1)
+					throw new NotSupportedException ();
+
+				WriteCompressedUInt32 ((uint) position);
+				break;
+			}
+
+			case ElementType.GenericInst: {
+				var generic_instance = (GenericInstanceType) type;
+				WriteElementType (ElementType.GenericInst);
+				WriteElementType (generic_instance.IsValueType ? ElementType.ValueType : ElementType.Class);
+				WriteCompressedUInt32 (MakeTypeDefOrRefCodedRID (generic_instance.ElementType));
+
+				WriteGenericInstanceSignature (generic_instance);
+				break;
+			}
+
+			case ElementType.Ptr:
+			case ElementType.ByRef:
+			case ElementType.Pinned:
+			case ElementType.Sentinel: {
+				var type_spec = (TypeSpecification) type;
+				WriteElementType (etype);
+				WriteTypeSignature (type_spec.ElementType);
+				break;
+			}
+
+			case ElementType.FnPtr: {
+				var fptr = (FunctionPointerType) type;
+				WriteElementType (ElementType.FnPtr);
+				WriteMethodSignature (fptr);
+				break;
+			}
+
+			case ElementType.CModOpt:
+			case ElementType.CModReqD: {
+				var modifier = (IModifierType) type;
+				WriteModifierSignature (etype, modifier);
+				break;
+			}
+
+			case ElementType.Array: {
+				var array = (ArrayType) type;
+				if (!array.IsVector) {
+					WriteArrayTypeSignature (array);
+					break;
+				}
+
+				WriteElementType (ElementType.SzArray);
+				WriteTypeSignature (array.ElementType);
+				break;
+			}
+
+			case ElementType.None: {
+				WriteElementType (type.IsValueType ? ElementType.ValueType : ElementType.Class);
+				WriteCompressedUInt32 (MakeTypeDefOrRefCodedRID (type));
+				break;
+			}
+
+			default:
+				if (!TryWriteElementType (type))
+					throw new NotSupportedException ();
+
+				break;
+
+			}
+		}
+
+		void WriteArrayTypeSignature (ArrayType array)
+		{
+			WriteElementType (ElementType.Array);
+			WriteTypeSignature (array.ElementType);
+
+			var dimensions = array.Dimensions;
+			var rank = dimensions.Count;
+
+			WriteCompressedUInt32 ((uint) rank);
+
+			var sized = 0;
+			var lbounds = 0;
+
+			for (int i = 0; i < rank; i++) {
+				var dimension = dimensions [i];
+
+				if (dimension.UpperBound.HasValue) {
+					sized++;
+					lbounds++;
+				} else if (dimension.LowerBound.HasValue)
+					lbounds++;
+			}
+
+			var sizes = new int [sized];
+			var low_bounds = new int [lbounds];
+
+			for (int i = 0; i < lbounds; i++) {
+				var dimension = dimensions [i];
+				low_bounds [i] = dimension.LowerBound.GetValueOrDefault ();
+				if (dimension.UpperBound.HasValue)
+					sizes [i] = dimension.UpperBound.Value - low_bounds [i] + 1;
+			}
+
+			WriteCompressedUInt32 ((uint) sized);
+			for (int i = 0; i < sized; i++)
+				WriteCompressedUInt32 ((uint) sizes [i]);
+
+			WriteCompressedUInt32 ((uint) lbounds);
+			for (int i = 0; i < lbounds; i++)
+				WriteCompressedInt32 (low_bounds [i]);
+		}
+
+		public void WriteGenericInstanceSignature (IGenericInstance instance)
+		{
+			var generic_arguments = instance.GenericArguments;
+			var arity = generic_arguments.Count;
+
+			WriteCompressedUInt32 ((uint) arity);
+			for (int i = 0; i < arity; i++)
+				WriteTypeSignature (generic_arguments [i]);
+		}
+
+		void WriteModifierSignature (ElementType element_type, IModifierType type)
+		{
+			WriteElementType (element_type);
+			WriteCompressedUInt32 (MakeTypeDefOrRefCodedRID (type.ModifierType));
+			WriteTypeSignature (type.ElementType);
+		}
+
+		bool TryWriteElementType (TypeReference type)
+		{
+			var element = type.etype;
+
+			if (element == ElementType.None)
+				return false;
+
+			WriteElementType (element);
+			return true;
+		}
+
+		public void WriteConstantString (string value)
+		{
+			WriteBytes (Encoding.Unicode.GetBytes (value));
+		}
+
+		public void WriteConstantPrimitive (object value)
+		{
+			WritePrimitiveValue (value);
+		}
+
+		public void WriteCustomAttributeConstructorArguments (CustomAttribute attribute)
+		{
+			if (!attribute.HasConstructorArguments)
+				return;
+
+			var arguments = attribute.ConstructorArguments;
+			var parameters = attribute.Constructor.Parameters;
+
+			if (parameters.Count != arguments.Count)
+				throw new InvalidOperationException ();
+
+			for (int i = 0; i < arguments.Count; i++)
+				WriteCustomAttributeFixedArgument (parameters [i].ParameterType, arguments [i]);
+		}
+
+		void WriteCustomAttributeFixedArgument (TypeReference type, CustomAttributeArgument argument)
+		{
+			if (type.IsArray) {
+				WriteCustomAttributeFixedArrayArgument ((ArrayType) type, argument);
+				return;
+			}
+
+			WriteCustomAttributeElement (type, argument);
+		}
+
+		void WriteCustomAttributeFixedArrayArgument (ArrayType type, CustomAttributeArgument argument)
+		{
+			var values = argument.Value as CustomAttributeArgument [];
+
+			if (values == null) {
+				WriteUInt32 (0xffffffff);
+				return;
+			}
+
+			WriteInt32 (values.Length);
+
+			if (values.Length == 0)
+				return;
+
+			var element_type = type.ElementType;
+
+			for (int i = 0; i < values.Length; i++)
+				WriteCustomAttributeElement (element_type, values [i]);
+		}
+
+		void WriteCustomAttributeElement (TypeReference type, CustomAttributeArgument argument)
+		{
+			if (type.IsArray) {
+				WriteCustomAttributeFixedArrayArgument ((ArrayType) type, argument);
+				return;
+			}
+
+			if (type.etype == ElementType.Object) {
+				argument = (CustomAttributeArgument) argument.Value;
+				type = argument.Type;
+
+				WriteCustomAttributeFieldOrPropType (type);
+				WriteCustomAttributeElement (type, argument);
+				return;
+			}
+
+			WriteCustomAttributeValue (type, argument.Value);
+		}
+
+		void WriteCustomAttributeValue (TypeReference type, object value)
+		{
+			var etype = type.etype;
+
+			switch (etype) {
+			case ElementType.String:
+				var @string = (string) value;
+				if (@string == null)
+					WriteByte (0xff);
+				else
+					WriteUTF8String (@string);
+				break;
+			case ElementType.None:
+				if (type.IsTypeOf ("System", "Type"))
+					WriteTypeReference ((TypeReference) value);
+				else
+					WriteCustomAttributeEnumValue (type, value);
+				break;
+			default:
+				WritePrimitiveValue (value);
+				break;
+			}
+		}
+
+		void WritePrimitiveValue (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ();
+
+			switch (Type.GetTypeCode (value.GetType ())) {
+			case TypeCode.Boolean:
+				WriteByte ((byte) (((bool) value) ? 1 : 0));
+				break;
+			case TypeCode.Byte:
+				WriteByte ((byte) value);
+				break;
+			case TypeCode.SByte:
+				WriteSByte ((sbyte) value);
+				break;
+			case TypeCode.Int16:
+				WriteInt16 ((short) value);
+				break;
+			case TypeCode.UInt16:
+				WriteUInt16 ((ushort) value);
+				break;
+			case TypeCode.Char:
+				WriteInt16 ((short) (char) value);
+				break;
+			case TypeCode.Int32:
+				WriteInt32 ((int) value);
+				break;
+			case TypeCode.UInt32:
+				WriteUInt32 ((uint) value);
+				break;
+			case TypeCode.Single:
+				WriteSingle ((float) value);
+				break;
+			case TypeCode.Int64:
+				WriteInt64 ((long) value);
+				break;
+			case TypeCode.UInt64:
+				WriteUInt64 ((ulong) value);
+				break;
+			case TypeCode.Double:
+				WriteDouble ((double) value);
+				break;
+			default:
+				throw new NotSupportedException (value.GetType ().FullName);
+			}
+		}
+
+		void WriteCustomAttributeEnumValue (TypeReference enum_type, object value)
+		{
+			var type = enum_type.CheckedResolve ();
+			if (!type.IsEnum)
+				throw new ArgumentException ();
+
+			WriteCustomAttributeValue (type.GetEnumUnderlyingType (), value);
+		}
+
+		void WriteCustomAttributeFieldOrPropType (TypeReference type)
+		{
+			if (type.IsArray) {
+				var array = (ArrayType) type;
+				WriteElementType (ElementType.SzArray);
+				WriteCustomAttributeFieldOrPropType (array.ElementType);
+				return;
+			}
+
+			var etype = type.etype;
+
+			switch (etype) {
+			case ElementType.Object:
+				WriteElementType (ElementType.Boxed);
+				return;
+			case ElementType.None:
+				if (type.IsTypeOf ("System", "Type"))
+					WriteElementType (ElementType.Type);
+				else {
+					WriteElementType (ElementType.Enum);
+					WriteTypeReference (type);
+				}
+				return;
+			default:
+				WriteElementType (etype);
+				return;
+			}
+		}
+
+		public void WriteCustomAttributeNamedArguments (CustomAttribute attribute)
+		{
+			var count = GetNamedArgumentCount (attribute);
+
+			WriteUInt16 ((ushort) count);
+
+			if (count == 0)
+				return;
+
+			WriteICustomAttributeNamedArguments (attribute);
+		}
+
+		static int GetNamedArgumentCount (ICustomAttribute attribute)
+		{
+			int count = 0;
+
+			if (attribute.HasFields)
+				count += attribute.Fields.Count;
+
+			if (attribute.HasProperties)
+				count += attribute.Properties.Count;
+
+			return count;
+		}
+
+		void WriteICustomAttributeNamedArguments (ICustomAttribute attribute)
+		{
+			if (attribute.HasFields)
+				WriteCustomAttributeNamedArguments (0x53, attribute.Fields);
+
+			if (attribute.HasProperties)
+				WriteCustomAttributeNamedArguments (0x54, attribute.Properties);
+		}
+
+		void WriteCustomAttributeNamedArguments (byte kind, Collection<CustomAttributeNamedArgument> named_arguments)
+		{
+			for (int i = 0; i < named_arguments.Count; i++)
+				WriteCustomAttributeNamedArgument (kind, named_arguments [i]);
+		}
+
+		void WriteCustomAttributeNamedArgument (byte kind, CustomAttributeNamedArgument named_argument)
+		{
+			var argument = named_argument.Argument;
+
+			WriteByte (kind);
+			WriteCustomAttributeFieldOrPropType (argument.Type);
+			WriteUTF8String (named_argument.Name);
+			WriteCustomAttributeFixedArgument (argument.Type, argument);
+		}
+
+		public void WriteSecurityAttribute (SecurityAttribute attribute)
+		{
+			WriteTypeReference (attribute.AttributeType);
+
+			var count = GetNamedArgumentCount (attribute);
+
+			if (count == 0) {
+				WriteCompressedUInt32 (0); // length
+				WriteCompressedUInt32 (0); // count
+				return;
+			}
+
+            var buffer = new SignatureWriter (metadata);
+			buffer.WriteCompressedUInt32 ((uint) count);
+			buffer.WriteICustomAttributeNamedArguments (attribute);
+
+			WriteCompressedUInt32 ((uint) buffer.length);
+			WriteBytes (buffer);
+		}
+
+		void WriteTypeReference (TypeReference type)
+		{
+			WriteUTF8String (TypeParser.ToParseable (type));
+		}
+
+		public void WriteMarshalInfo (MarshalInfo marshal_info)
+		{
+			WriteNativeType (marshal_info.native);
+
+			switch (marshal_info.native) {
+			case NativeType.Array: {
+				var array = (ArrayMarshalInfo) marshal_info;
+				if (array.element_type != NativeType.None)
+					WriteNativeType (array.element_type);
+				if (array.size_parameter_index > -1)
+					WriteCompressedUInt32 ((uint) array.size_parameter_index);
+				if (array.size > -1)
+					WriteCompressedUInt32 ((uint) array.size);
+				if (array.size_parameter_multiplier > -1)
+					WriteCompressedUInt32 ((uint) array.size_parameter_multiplier);
+				return;
+			}
+			case NativeType.SafeArray: {
+				var array = (SafeArrayMarshalInfo) marshal_info;
+				if (array.element_type != VariantType.None)
+					WriteVariantType (array.element_type);
+				return;
+			}
+			case NativeType.FixedArray: {
+				var array = (FixedArrayMarshalInfo) marshal_info;
+				if (array.size > -1)
+					WriteCompressedUInt32 ((uint) array.size);
+				if (array.element_type != NativeType.None)
+					WriteNativeType (array.element_type);
+				return;
+			}
+			case NativeType.FixedSysString:
+				var sys_string = (FixedSysStringMarshalInfo) marshal_info;
+				if (sys_string.size > -1)
+					WriteCompressedUInt32 ((uint) sys_string.size);
+				return;
+			case NativeType.CustomMarshaler:
+				var marshaler = (CustomMarshalInfo) marshal_info;
+				WriteUTF8String (marshaler.guid != Guid.Empty ? marshaler.guid.ToString () : string.Empty);
+				WriteUTF8String (marshaler.unmanaged_type);
+				WriteTypeReference (marshaler.managed_type);
+				WriteUTF8String (marshaler.cookie);
+				return;
+			}
+		}
+
+		void WriteNativeType (NativeType native)
+		{
+			WriteByte ((byte) native);
+		}
+
+		void WriteVariantType (VariantType variant)
+		{
+			WriteByte ((byte) variant);
+		}
+	}
+
+#endif
+
+}
diff --git a/src/Core/Compiler/Importer/IL/BaseAssemblyResolver.cs b/src/Core/Compiler/Importer/IL/BaseAssemblyResolver.cs
new file mode 100644
index 000000000..c1c8a4484
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/BaseAssemblyResolver.cs
@@ -0,0 +1,351 @@
+//
+// BaseAssemblyResolver.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ delegate AssemblyDefinition AssemblyResolveEventHandler(object sender, AssemblyNameReference reference);
+
+    internal /* public */ sealed class AssemblyResolveEventArgs : EventArgs {
+
+		readonly AssemblyNameReference reference;
+
+		public AssemblyNameReference AssemblyReference {
+			get { return reference; }
+		}
+
+		public AssemblyResolveEventArgs (AssemblyNameReference reference)
+		{
+			this.reference = reference;
+		}
+	}
+
+    internal /* public */ class AssemblyResolutionException : FileNotFoundException {
+
+		readonly AssemblyNameReference reference;
+
+		public AssemblyNameReference AssemblyReference {
+			get { return reference; }
+		}
+
+		public AssemblyResolutionException (AssemblyNameReference reference)
+			: base (string.Format ("Failed to resolve assembly: '{0}'", reference))
+		{
+			this.reference = reference;
+		}
+	}
+
+    internal /* public */ abstract class BaseAssemblyResolver : IAssemblyResolver {
+
+		static readonly bool on_mono = Type.GetType ("Mono.Runtime") != null;
+
+		readonly Collection<string> directories;
+
+#if !SILVERLIGHT && !CF
+		Collection<string> gac_paths;
+#endif
+
+		public void AddSearchDirectory (string directory)
+		{
+			directories.Add (directory);
+		}
+
+		public void RemoveSearchDirectory (string directory)
+		{
+			directories.Remove (directory);
+		}
+
+		public string [] GetSearchDirectories ()
+		{
+			var directories = new string [this.directories.size];
+			Array.Copy (this.directories.items, directories, directories.Length);
+			return directories;
+		}
+
+		public virtual AssemblyDefinition Resolve (string fullName)
+		{
+			return Resolve (fullName, new ReaderParameters ());
+		}
+
+		public virtual AssemblyDefinition Resolve (string fullName, ReaderParameters parameters)
+		{
+			if (fullName == null)
+				throw new ArgumentNullException ("fullName");
+
+			return Resolve (AssemblyNameReference.Parse (fullName), parameters);
+		}
+
+		public event AssemblyResolveEventHandler ResolveFailure;
+
+		protected BaseAssemblyResolver ()
+		{
+			directories = new Collection<string> (2) { ".", "bin" };
+		}
+
+		AssemblyDefinition GetAssembly (string file, ReaderParameters parameters)
+		{
+			if (parameters.AssemblyResolver == null)
+				parameters.AssemblyResolver = this;
+
+			return ModuleDefinition.ReadModule (file, parameters).Assembly;
+		}
+
+		public virtual AssemblyDefinition Resolve (AssemblyNameReference name)
+		{
+			return Resolve (name, new ReaderParameters ());
+		}
+
+		public virtual AssemblyDefinition Resolve (AssemblyNameReference name, ReaderParameters parameters)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (parameters == null)
+				parameters = new ReaderParameters ();
+
+			var assembly = SearchDirectory (name, directories, parameters);
+			if (assembly != null)
+				return assembly;
+
+#if !SILVERLIGHT && !CF
+			var framework_dir = Path.GetDirectoryName (typeof (object).Module.FullyQualifiedName);
+
+			if (IsZero (name.Version)) {
+				assembly = SearchDirectory (name, new [] { framework_dir }, parameters);
+				if (assembly != null)
+					return assembly;
+			}
+
+			if (name.Name == "mscorlib") {
+				assembly = GetCorlib (name, parameters);
+				if (assembly != null)
+					return assembly;
+			}
+
+			assembly = GetAssemblyInGac (name, parameters);
+			if (assembly != null)
+				return assembly;
+
+			assembly = SearchDirectory (name, new [] { framework_dir }, parameters);
+			if (assembly != null)
+				return assembly;
+#endif
+
+			if (ResolveFailure != null) {
+				assembly = ResolveFailure (this, name);
+				if (assembly != null)
+					return assembly;
+			}
+
+			throw new AssemblyResolutionException (name);
+		}
+
+		AssemblyDefinition SearchDirectory (AssemblyNameReference name, IEnumerable<string> directories, ReaderParameters parameters)
+		{
+			var extensions = new [] { ".exe", ".dll" };
+			foreach (var directory in directories) {
+				foreach (var extension in extensions) {
+					string file = Path.Combine (directory, name.Name + extension);
+					if (File.Exists (file))
+						return GetAssembly (file, parameters);
+				}
+			}
+
+			return null;
+		}
+
+		static bool IsZero (Version version)
+		{
+			return version == null || (version.Major == 0 && version.Minor == 0 && version.Build == 0 && version.Revision == 0);
+		}
+
+#if !SILVERLIGHT && !CF
+		AssemblyDefinition GetCorlib (AssemblyNameReference reference, ReaderParameters parameters)
+		{
+			var version = reference.Version;
+			var corlib = typeof (object).Assembly.GetName ();
+
+			if (corlib.Version == version || IsZero (version))
+				return GetAssembly (typeof (object).Module.FullyQualifiedName, parameters);
+
+			var path = Directory.GetParent (
+				Directory.GetParent (
+					typeof (object).Module.FullyQualifiedName).FullName
+				).FullName;
+
+			if (on_mono) {
+				if (version.Major == 1)
+					path = Path.Combine (path, "1.0");
+				else if (version.Major == 2) {
+					if (version.MajorRevision == 5)
+						path = Path.Combine (path, "2.1");
+					else
+						path = Path.Combine (path, "2.0");
+				} else if (version.Major == 4)
+					path = Path.Combine (path, "4.0");
+				else
+					throw new NotSupportedException ("Version not supported: " + version);
+			} else {
+				switch (version.Major) {
+				case 1:
+					if (version.MajorRevision == 3300)
+						path = Path.Combine (path, "v1.0.3705");
+					else
+						path = Path.Combine (path, "v1.0.5000.0");
+					break;
+				case 2:
+					path = Path.Combine (path, "v2.0.50727");
+					break;
+				case 4:
+					path = Path.Combine (path, "v4.0.30319");
+					break;
+				default:
+					throw new NotSupportedException ("Version not supported: " + version);
+				}
+			}
+
+			var file = Path.Combine (path, "mscorlib.dll");
+			if (File.Exists (file))
+				return GetAssembly (file, parameters);
+
+			return null;
+		}
+
+		static Collection<string> GetGacPaths ()
+		{
+			if (on_mono)
+				return GetDefaultMonoGacPaths ();
+
+			var paths = new Collection<string> (2);
+			var windir = Environment.GetEnvironmentVariable ("WINDIR");
+			if (windir == null)
+				return paths;
+
+			paths.Add (Path.Combine (windir, "assembly"));
+			paths.Add (Path.Combine (windir, Path.Combine ("Microsoft.NET", "assembly")));
+			return paths;
+		}
+
+		static Collection<string> GetDefaultMonoGacPaths ()
+		{
+			var paths = new Collection<string> (1);
+			var gac = GetCurrentMonoGac ();
+			if (gac != null)
+				paths.Add (gac);
+
+			var gac_paths_env = Environment.GetEnvironmentVariable ("MONO_GAC_PREFIX");
+			if (string.IsNullOrEmpty (gac_paths_env))
+				return paths;
+
+			var prefixes = gac_paths_env.Split (Path.PathSeparator);
+			foreach (var prefix in prefixes) {
+				if (string.IsNullOrEmpty (prefix))
+					continue;
+
+				var gac_path = Path.Combine (Path.Combine (Path.Combine (prefix, "lib"), "mono"), "gac");
+				if (Directory.Exists (gac_path) && !paths.Contains (gac))
+					paths.Add (gac_path);
+			}
+
+			return paths;
+		}
+
+		static string GetCurrentMonoGac ()
+		{
+			return Path.Combine (
+				Directory.GetParent (
+					Path.GetDirectoryName (typeof (object).Module.FullyQualifiedName)).FullName,
+				"gac");
+		}
+
+		AssemblyDefinition GetAssemblyInGac (AssemblyNameReference reference, ReaderParameters parameters)
+		{
+			if (reference.PublicKeyToken == null || reference.PublicKeyToken.Length == 0)
+				return null;
+
+			if (gac_paths == null)
+				gac_paths = GetGacPaths ();
+
+			if (on_mono)
+				return GetAssemblyInMonoGac (reference, parameters);
+
+			return GetAssemblyInNetGac (reference, parameters);
+		}
+
+		AssemblyDefinition GetAssemblyInMonoGac (AssemblyNameReference reference, ReaderParameters parameters)
+		{
+			for (int i = 0; i < gac_paths.Count; i++) {
+				var gac_path = gac_paths [i];
+				var file = GetAssemblyFile (reference, string.Empty, gac_path);
+				if (File.Exists (file))
+					return GetAssembly (file, parameters);
+			}
+
+			return null;
+		}
+
+		AssemblyDefinition GetAssemblyInNetGac (AssemblyNameReference reference, ReaderParameters parameters)
+		{
+			var gacs = new [] { "GAC_MSIL", "GAC_32", "GAC" };
+			var prefixes = new [] { string.Empty, "v4.0_" };
+
+			for (int i = 0; i < 2; i++) {
+				for (int j = 0; j < gacs.Length; j++) {
+					var gac = Path.Combine (gac_paths [i], gacs [j]);
+					var file = GetAssemblyFile (reference, prefixes [i], gac);
+					if (Directory.Exists (gac) && File.Exists (file))
+						return GetAssembly (file, parameters);
+				}
+			}
+
+			return null;
+		}
+
+		static string GetAssemblyFile (AssemblyNameReference reference, string prefix, string gac)
+		{
+			var gac_folder = new StringBuilder ()
+				.Append (prefix)
+				.Append (reference.Version)
+				.Append ("__");
+
+			for (int i = 0; i < reference.PublicKeyToken.Length; i++)
+				gac_folder.Append (reference.PublicKeyToken [i].ToString ("x2"));
+
+			return Path.Combine (
+				Path.Combine (
+					Path.Combine (gac, reference.Name), gac_folder.ToString ()),
+				reference.Name + ".dll");
+		}
+#endif
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/CallSite.cs b/src/Core/Compiler/Importer/IL/CallSite.cs
new file mode 100644
index 000000000..cc7195d47
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/CallSite.cs
@@ -0,0 +1,124 @@
+//
+// CallSite.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Text;
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class CallSite : IMethodSignature {
+
+		readonly MethodReference signature;
+
+		public bool HasThis {
+			get { return signature.HasThis; }
+			set { signature.HasThis = value; }
+		}
+
+		public bool ExplicitThis {
+			get { return signature.ExplicitThis; }
+			set { signature.ExplicitThis = value; }
+		}
+
+		public MethodCallingConvention CallingConvention {
+			get { return signature.CallingConvention; }
+			set { signature.CallingConvention = value; }
+		}
+
+		public bool HasParameters {
+			get { return signature.HasParameters; }
+		}
+
+		public Collection<ParameterDefinition> Parameters {
+			get { return signature.Parameters; }
+		}
+
+		public TypeReference ReturnType {
+			get { return signature.MethodReturnType.ReturnType; }
+			set { signature.MethodReturnType.ReturnType = value; }
+		}
+
+		public MethodReturnType MethodReturnType {
+			get { return signature.MethodReturnType; }
+		}
+
+		public string Name {
+			get { return string.Empty; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public string Namespace {
+			get { return string.Empty; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public ModuleDefinition Module {
+			get { return ReturnType.Module; }
+		}
+
+		public IMetadataScope Scope {
+			get { return signature.ReturnType.Scope; }
+		}
+
+		public MetadataToken MetadataToken {
+			get { return signature.token; }
+			set { signature.token = value; }
+		}
+
+		public string FullName {
+			get {
+				var signature = new StringBuilder ();
+				signature.Append (ReturnType.FullName);
+				this.MethodSignatureFullName (signature);
+				return signature.ToString ();
+			}
+		}
+
+		internal CallSite ()
+		{
+			this.signature = new MethodReference ();
+			this.signature.token = new MetadataToken (TokenType.Signature, 0);
+		}
+
+		public CallSite (TypeReference returnType)
+			: this ()
+		{
+			if (returnType == null)
+				throw new ArgumentNullException ("returnType");
+
+			this.signature.ReturnType = returnType;
+		}
+
+		public override string ToString ()
+		{
+			return FullName;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Cil/Code.cs b/src/Core/Compiler/Importer/IL/Cil/Code.cs
new file mode 100644
index 000000000..e42323bb2
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/Code.cs
@@ -0,0 +1,252 @@
+//
+// Code.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+    internal /* public */ enum Code {
+		Nop,
+		Break,
+		Ldarg_0,
+		Ldarg_1,
+		Ldarg_2,
+		Ldarg_3,
+		Ldloc_0,
+		Ldloc_1,
+		Ldloc_2,
+		Ldloc_3,
+		Stloc_0,
+		Stloc_1,
+		Stloc_2,
+		Stloc_3,
+		Ldarg_S,
+		Ldarga_S,
+		Starg_S,
+		Ldloc_S,
+		Ldloca_S,
+		Stloc_S,
+		Ldnull,
+		Ldc_I4_M1,
+		Ldc_I4_0,
+		Ldc_I4_1,
+		Ldc_I4_2,
+		Ldc_I4_3,
+		Ldc_I4_4,
+		Ldc_I4_5,
+		Ldc_I4_6,
+		Ldc_I4_7,
+		Ldc_I4_8,
+		Ldc_I4_S,
+		Ldc_I4,
+		Ldc_I8,
+		Ldc_R4,
+		Ldc_R8,
+		Dup,
+		Pop,
+		Jmp,
+		Call,
+		Calli,
+		Ret,
+		Br_S,
+		Brfalse_S,
+		Brtrue_S,
+		Beq_S,
+		Bge_S,
+		Bgt_S,
+		Ble_S,
+		Blt_S,
+		Bne_Un_S,
+		Bge_Un_S,
+		Bgt_Un_S,
+		Ble_Un_S,
+		Blt_Un_S,
+		Br,
+		Brfalse,
+		Brtrue,
+		Beq,
+		Bge,
+		Bgt,
+		Ble,
+		Blt,
+		Bne_Un,
+		Bge_Un,
+		Bgt_Un,
+		Ble_Un,
+		Blt_Un,
+		Switch,
+		Ldind_I1,
+		Ldind_U1,
+		Ldind_I2,
+		Ldind_U2,
+		Ldind_I4,
+		Ldind_U4,
+		Ldind_I8,
+		Ldind_I,
+		Ldind_R4,
+		Ldind_R8,
+		Ldind_Ref,
+		Stind_Ref,
+		Stind_I1,
+		Stind_I2,
+		Stind_I4,
+		Stind_I8,
+		Stind_R4,
+		Stind_R8,
+		Add,
+		Sub,
+		Mul,
+		Div,
+		Div_Un,
+		Rem,
+		Rem_Un,
+		And,
+		Or,
+		Xor,
+		Shl,
+		Shr,
+		Shr_Un,
+		Neg,
+		Not,
+		Conv_I1,
+		Conv_I2,
+		Conv_I4,
+		Conv_I8,
+		Conv_R4,
+		Conv_R8,
+		Conv_U4,
+		Conv_U8,
+		Callvirt,
+		Cpobj,
+		Ldobj,
+		Ldstr,
+		Newobj,
+		Castclass,
+		Isinst,
+		Conv_R_Un,
+		Unbox,
+		Throw,
+		Ldfld,
+		Ldflda,
+		Stfld,
+		Ldsfld,
+		Ldsflda,
+		Stsfld,
+		Stobj,
+		Conv_Ovf_I1_Un,
+		Conv_Ovf_I2_Un,
+		Conv_Ovf_I4_Un,
+		Conv_Ovf_I8_Un,
+		Conv_Ovf_U1_Un,
+		Conv_Ovf_U2_Un,
+		Conv_Ovf_U4_Un,
+		Conv_Ovf_U8_Un,
+		Conv_Ovf_I_Un,
+		Conv_Ovf_U_Un,
+		Box,
+		Newarr,
+		Ldlen,
+		Ldelema,
+		Ldelem_I1,
+		Ldelem_U1,
+		Ldelem_I2,
+		Ldelem_U2,
+		Ldelem_I4,
+		Ldelem_U4,
+		Ldelem_I8,
+		Ldelem_I,
+		Ldelem_R4,
+		Ldelem_R8,
+		Ldelem_Ref,
+		Stelem_I,
+		Stelem_I1,
+		Stelem_I2,
+		Stelem_I4,
+		Stelem_I8,
+		Stelem_R4,
+		Stelem_R8,
+		Stelem_Ref,
+		Ldelem_Any,
+		Stelem_Any,
+		Unbox_Any,
+		Conv_Ovf_I1,
+		Conv_Ovf_U1,
+		Conv_Ovf_I2,
+		Conv_Ovf_U2,
+		Conv_Ovf_I4,
+		Conv_Ovf_U4,
+		Conv_Ovf_I8,
+		Conv_Ovf_U8,
+		Refanyval,
+		Ckfinite,
+		Mkrefany,
+		Ldtoken,
+		Conv_U2,
+		Conv_U1,
+		Conv_I,
+		Conv_Ovf_I,
+		Conv_Ovf_U,
+		Add_Ovf,
+		Add_Ovf_Un,
+		Mul_Ovf,
+		Mul_Ovf_Un,
+		Sub_Ovf,
+		Sub_Ovf_Un,
+		Endfinally,
+		Leave,
+		Leave_S,
+		Stind_I,
+		Conv_U,
+		Arglist,
+		Ceq,
+		Cgt,
+		Cgt_Un,
+		Clt,
+		Clt_Un,
+		Ldftn,
+		Ldvirtftn,
+		Ldarg,
+		Ldarga,
+		Starg,
+		Ldloc,
+		Ldloca,
+		Stloc,
+		Localloc,
+		Endfilter,
+		Unaligned,
+		Volatile,
+		Tail,
+		Initobj,
+		Constrained,
+		Cpblk,
+		Initblk,
+		No,
+		Rethrow,
+		Sizeof,
+		Refanytype,
+		Readonly,
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Cil/CodeReader.cs b/src/Core/Compiler/Importer/IL/Cil/CodeReader.cs
new file mode 100644
index 000000000..d87881c57
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/CodeReader.cs
@@ -0,0 +1,603 @@
+//
+// CodeReader.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using ScriptSharp.Importer.IL.PE;
+using ScriptSharp.Collections.Generic;
+
+using RVA = System.UInt32;
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+	sealed class CodeReader : ByteBuffer {
+
+		readonly internal MetadataReader reader;
+
+		int start;
+		Section code_section;
+
+		MethodDefinition method;
+		MethodBody body;
+
+		int Offset {
+			get { return base.position - start; }
+		}
+
+		CodeReader (Section section, MetadataReader reader)
+			: base (section.Data)
+		{
+			this.code_section = section;
+			this.reader = reader;
+		}
+
+		public static CodeReader CreateCodeReader (MetadataReader metadata)
+		{
+			return new CodeReader (metadata.image.MetadataSection, metadata);
+		}
+
+		public MethodBody ReadMethodBody (MethodDefinition method)
+		{
+			this.method = method;
+			this.body = new MethodBody (method);
+
+			reader.context = method;
+
+			ReadMethodBody ();
+
+			return this.body;
+		}
+
+		public void MoveTo (int rva)
+		{
+			if (!IsInSection (rva)) {
+				code_section = reader.image.GetSectionAtVirtualAddress ((uint) rva);
+				Reset (code_section.Data);
+			}
+
+			base.position = rva - (int) code_section.VirtualAddress;
+		}
+
+		bool IsInSection (int rva)
+		{
+			return code_section.VirtualAddress <= rva && rva < code_section.VirtualAddress + code_section.SizeOfRawData;
+		}
+
+		void ReadMethodBody ()
+		{
+			MoveTo (method.RVA);
+
+			var flags = ReadByte ();
+			switch (flags & 0x3) {
+			case 0x2: // tiny
+				body.code_size = flags >> 2;
+				body.MaxStackSize = 8;
+				ReadCode ();
+				break;
+			case 0x3: // fat
+				base.position--;
+				ReadFatMethod ();
+				break;
+			default:
+				throw new InvalidOperationException ();
+			}
+
+			var symbol_reader = reader.module.SymbolReader;
+
+			if (symbol_reader != null) {
+				var instructions = body.Instructions;
+				symbol_reader.Read (body, offset => GetInstruction (instructions, offset));
+			}
+		}
+
+		void ReadFatMethod ()
+		{
+			var flags = ReadUInt16 ();
+			body.max_stack_size = ReadUInt16 ();
+			body.code_size = (int) ReadUInt32 ();
+			body.local_var_token = new MetadataToken (ReadUInt32 ());
+			body.init_locals = (flags & 0x10) != 0;
+
+			if (body.local_var_token.RID != 0)
+				body.variables = ReadVariables (body.local_var_token);
+
+			ReadCode ();
+
+			if ((flags & 0x8) != 0)
+				ReadSection ();
+		}
+
+		public VariableDefinitionCollection ReadVariables (MetadataToken local_var_token)
+		{
+			var position = reader.position;
+			var variables = reader.ReadVariables (local_var_token);
+			reader.position = position;
+
+			return variables;
+		}
+
+		void ReadCode ()
+		{
+			start = position;
+			var code_size = body.code_size;
+
+			if (code_size < 0 || buffer.Length <= (uint) (code_size + position))
+				code_size = 0;
+
+			var end = start + code_size;
+			var instructions = body.instructions = new InstructionCollection (code_size / 3);
+
+			while (position < end) {
+				var offset = base.position - start;
+				var opcode = ReadOpCode ();
+				var current = new Instruction (offset, opcode);
+
+				if (opcode.OperandType != OperandType.InlineNone)
+					current.operand = ReadOperand (current);
+
+				instructions.Add (current);
+			}
+
+			ResolveBranches (instructions);
+		}
+
+		OpCode ReadOpCode ()
+		{
+			var il_opcode = ReadByte ();
+			return il_opcode != 0xfe
+				? OpCodes.OneByteOpCode [il_opcode]
+				: OpCodes.TwoBytesOpCode [ReadByte ()];
+		}
+
+		object ReadOperand (Instruction instruction)
+		{
+			switch (instruction.opcode.OperandType) {
+			case OperandType.InlineSwitch:
+				var length = ReadInt32 ();
+				var base_offset = Offset + (4 * length);
+				var branches = new int [length];
+				for (int i = 0; i < length; i++)
+					branches [i] = base_offset + ReadInt32 ();
+				return branches;
+			case OperandType.ShortInlineBrTarget:
+				return ReadSByte () + Offset;
+			case OperandType.InlineBrTarget:
+				return ReadInt32 () + Offset;
+			case OperandType.ShortInlineI:
+				if (instruction.opcode == OpCodes.Ldc_I4_S)
+					return ReadSByte ();
+
+				return ReadByte ();
+			case OperandType.InlineI:
+				return ReadInt32 ();
+			case OperandType.ShortInlineR:
+				return ReadSingle ();
+			case OperandType.InlineR:
+				return ReadDouble ();
+			case OperandType.InlineI8:
+				return ReadInt64 ();
+			case OperandType.ShortInlineVar:
+				return GetVariable (ReadByte ());
+			case OperandType.InlineVar:
+				return GetVariable (ReadUInt16 ());
+			case OperandType.ShortInlineArg:
+				return GetParameter (ReadByte ());
+			case OperandType.InlineArg:
+				return GetParameter (ReadUInt16 ());
+			case OperandType.InlineSig:
+				return GetCallSite (ReadToken ());
+			case OperandType.InlineString:
+				return GetString (ReadToken ());
+			case OperandType.InlineTok:
+			case OperandType.InlineType:
+			case OperandType.InlineMethod:
+			case OperandType.InlineField:
+				return reader.LookupToken (ReadToken ());
+			default:
+				throw new NotSupportedException ();
+			}
+		}
+
+		public string GetString (MetadataToken token)
+		{
+			return reader.image.UserStringHeap.Read (token.RID);
+		}
+
+		public ParameterDefinition GetParameter (int index)
+		{
+			return body.GetParameter (index);
+		}
+
+		public VariableDefinition GetVariable (int index)
+		{
+			return body.GetVariable (index);
+		}
+
+		public CallSite GetCallSite (MetadataToken token)
+		{
+			return reader.ReadCallSite (token);
+		}
+
+		void ResolveBranches (Collection<Instruction> instructions)
+		{
+			var items = instructions.items;
+			var size = instructions.size;
+
+			for (int i = 0; i < size; i++) {
+				var instruction = items [i];
+				switch (instruction.opcode.OperandType) {
+				case OperandType.ShortInlineBrTarget:
+				case OperandType.InlineBrTarget:
+					instruction.operand = GetInstruction ((int) instruction.operand);
+					break;
+				case OperandType.InlineSwitch:
+					var offsets = (int []) instruction.operand;
+					var branches = new Instruction [offsets.Length];
+					for (int j = 0; j < offsets.Length; j++)
+						branches [j] = GetInstruction (offsets [j]);
+
+					instruction.operand = branches;
+					break;
+				}
+			}
+		}
+
+		Instruction GetInstruction (int offset)
+		{
+			return GetInstruction (body.Instructions, offset);
+		}
+
+		static Instruction GetInstruction (Collection<Instruction> instructions, int offset)
+		{
+			var size = instructions.size;
+			var items = instructions.items;
+			if (offset < 0 || offset > items [size - 1].offset)
+				return null;
+
+			int min = 0;
+			int max = size - 1;
+			while (min <= max) {
+				int mid = min + ((max - min) / 2);
+				var instruction = items [mid];
+				var instruction_offset = instruction.offset;
+
+				if (offset == instruction_offset)
+					return instruction;
+
+				if (offset < instruction_offset)
+					max = mid - 1;
+				else
+					min = mid + 1;
+			}
+
+			return null;
+		}
+
+		void ReadSection ()
+		{
+			Align (4);
+
+			const byte fat_format = 0x40;
+			const byte more_sects = 0x80;
+
+			var flags = ReadByte ();
+			if ((flags & fat_format) == 0)
+				ReadSmallSection ();
+			else
+				ReadFatSection ();
+
+			if ((flags & more_sects) != 0)
+				ReadSection ();
+		}
+
+		void ReadSmallSection ()
+		{
+			var count = ReadByte () / 12;
+			Advance (2);
+
+			ReadExceptionHandlers (
+				count,
+				() => (int) ReadUInt16 (),
+				() => (int) ReadByte ());
+		}
+
+		void ReadFatSection ()
+		{
+			position--;
+			var count = (ReadInt32 () >> 8) / 24;
+
+			ReadExceptionHandlers (
+				count,
+				ReadInt32,
+				ReadInt32);
+		}
+
+		// inline ?
+		void ReadExceptionHandlers (int count, Func<int> read_entry, Func<int> read_length)
+		{
+			for (int i = 0; i < count; i++) {
+				var handler = new ExceptionHandler (
+					(ExceptionHandlerType) (read_entry () & 0x7));
+
+				handler.TryStart = GetInstruction (read_entry ());
+				handler.TryEnd = GetInstruction (handler.TryStart.Offset + read_length ());
+
+				handler.HandlerStart = GetInstruction (read_entry ());
+				handler.HandlerEnd = GetInstruction (handler.HandlerStart.Offset + read_length ());
+
+				ReadExceptionHandlerSpecific (handler);
+
+				this.body.ExceptionHandlers.Add (handler);
+			}
+		}
+
+		void ReadExceptionHandlerSpecific (ExceptionHandler handler)
+		{
+			switch (handler.HandlerType) {
+			case ExceptionHandlerType.Catch:
+				handler.CatchType = (TypeReference) reader.LookupToken (ReadToken ());
+				break;
+			case ExceptionHandlerType.Filter:
+				handler.FilterStart = GetInstruction (ReadInt32 ());
+				break;
+			default:
+				Advance (4);
+				break;
+			}
+		}
+
+		void Align (int align)
+		{
+			align--;
+			Advance (((position + align) & ~align) - position);
+		}
+
+		public MetadataToken ReadToken ()
+		{
+			return new MetadataToken (ReadUInt32 ());
+		}
+
+#if !IL_READ_ONLY
+
+        public ByteBuffer PatchRawMethodBody (MethodDefinition method, CodeWriter writer, out MethodSymbols symbols)
+		{
+			var buffer = new ByteBuffer ();
+			symbols = new MethodSymbols (method.Name);
+
+			this.method = method;
+			reader.context = method;
+
+			MoveTo (method.RVA);
+
+			var flags = ReadByte ();
+
+			MetadataToken local_var_token;
+
+			switch (flags & 0x3) {
+			case 0x2: // tiny
+				buffer.WriteByte (flags);
+				local_var_token = MetadataToken.Zero;
+				symbols.code_size = flags >> 2;
+				PatchRawCode (buffer, symbols.code_size, writer);
+				break;
+			case 0x3: // fat
+				base.position--;
+
+				PatchRawFatMethod (buffer, symbols, writer, out local_var_token);
+				break;
+			default:
+				throw new NotSupportedException ();
+			}
+
+			var symbol_reader = reader.module.SymbolReader;
+			if (symbol_reader != null && writer.metadata.write_symbols) {
+				symbols.method_token = GetOriginalToken (writer.metadata, method);
+				symbols.local_var_token = local_var_token;
+				symbol_reader.Read (symbols);
+			}
+
+			return buffer;
+		}
+
+		void PatchRawFatMethod (ByteBuffer buffer, MethodSymbols symbols, CodeWriter writer, out MetadataToken local_var_token)
+		{
+			var flags = ReadUInt16 ();
+			buffer.WriteUInt16 (flags);
+			buffer.WriteUInt16 (ReadUInt16 ());
+			symbols.code_size = ReadInt32 ();
+			buffer.WriteInt32 (symbols.code_size);
+			local_var_token = ReadToken ();
+
+			if (local_var_token.RID > 0) {
+				var variables = symbols.variables = ReadVariables (local_var_token);
+				buffer.WriteUInt32 (variables != null
+					? writer.GetStandAloneSignature (symbols.variables).ToUInt32 ()
+					: 0);
+			} else
+				buffer.WriteUInt32 (0);
+
+			PatchRawCode (buffer, symbols.code_size, writer);
+
+			if ((flags & 0x8) != 0)
+				PatchRawSection (buffer, writer.metadata);
+		}
+
+		static MetadataToken GetOriginalToken (MetadataBuilder metadata, MethodDefinition method)
+		{
+			MetadataToken original;
+			if (metadata.TryGetOriginalMethodToken (method.token, out original))
+				return original;
+
+			return MetadataToken.Zero;
+		}
+
+		void PatchRawCode (ByteBuffer buffer, int code_size, CodeWriter writer)
+		{
+			var metadata = writer.metadata;
+			buffer.WriteBytes (ReadBytes (code_size));
+			var end = buffer.position;
+			buffer.position -= code_size;
+
+			while (buffer.position < end) {
+				OpCode opcode;
+				var il_opcode = buffer.ReadByte ();
+				if (il_opcode != 0xfe) {
+					opcode = OpCodes.OneByteOpCode [il_opcode];
+				} else {
+					var il_opcode2 = buffer.ReadByte ();
+					opcode = OpCodes.TwoBytesOpCode [il_opcode2];
+				}
+
+				switch (opcode.OperandType) {
+				case OperandType.ShortInlineI:
+				case OperandType.ShortInlineBrTarget:
+				case OperandType.ShortInlineVar:
+				case OperandType.ShortInlineArg:
+					buffer.position += 1;
+					break;
+				case OperandType.InlineVar:
+				case OperandType.InlineArg:
+					buffer.position += 2;
+					break;
+				case OperandType.InlineBrTarget:
+				case OperandType.ShortInlineR:
+				case OperandType.InlineI:
+					buffer.position += 4;
+					break;
+				case OperandType.InlineI8:
+				case OperandType.InlineR:
+					buffer.position += 8;
+					break;
+				case OperandType.InlineSwitch:
+					var length = buffer.ReadInt32 ();
+					buffer.position += length * 4;
+					break;
+				case OperandType.InlineString:
+					var @string = GetString (new MetadataToken (buffer.ReadUInt32 ()));
+					buffer.position -= 4;
+					buffer.WriteUInt32 (
+						new MetadataToken (
+							TokenType.String,
+							metadata.user_string_heap.GetStringIndex (@string)).ToUInt32 ());
+					break;
+				case OperandType.InlineSig:
+					var call_site = GetCallSite (new MetadataToken (buffer.ReadUInt32 ()));
+					buffer.position -= 4;
+					buffer.WriteUInt32 (writer.GetStandAloneSignature (call_site).ToUInt32 ());
+					break;
+				case OperandType.InlineTok:
+				case OperandType.InlineType:
+				case OperandType.InlineMethod:
+				case OperandType.InlineField:
+					var provider = reader.LookupToken (new MetadataToken (buffer.ReadUInt32 ()));
+					buffer.position -= 4;
+					buffer.WriteUInt32 (metadata.LookupToken (provider).ToUInt32 ());
+					break;
+				}
+			}
+		}
+
+		void PatchRawSection (ByteBuffer buffer, MetadataBuilder metadata)
+		{
+			var position = base.position;
+			Align (4);
+			buffer.WriteBytes (base.position - position);
+
+			const byte fat_format = 0x40;
+			const byte more_sects = 0x80;
+
+			var flags = ReadByte ();
+			if ((flags & fat_format) == 0) {
+				buffer.WriteByte (flags);
+				PatchRawSmallSection (buffer, metadata);
+			} else
+				PatchRawFatSection (buffer, metadata);
+
+			if ((flags & more_sects) != 0)
+				PatchRawSection (buffer, metadata);
+		}
+
+		void PatchRawSmallSection (ByteBuffer buffer, MetadataBuilder metadata)
+		{
+			var length = ReadByte ();
+			buffer.WriteByte (length);
+			Advance (2);
+
+			buffer.WriteUInt16 (0);
+
+			var count = length / 12;
+
+			PatchRawExceptionHandlers (buffer, metadata, count, false);
+		}
+
+		void PatchRawFatSection (ByteBuffer buffer, MetadataBuilder metadata)
+		{
+			position--;
+			var length = ReadInt32 ();
+			buffer.WriteInt32 (length);
+
+			var count = (length >> 8) / 24;
+
+			PatchRawExceptionHandlers (buffer, metadata, count, true);
+		}
+
+		void PatchRawExceptionHandlers (ByteBuffer buffer, MetadataBuilder metadata, int count, bool fat_entry)
+		{
+			const int fat_entry_size = 16;
+			const int small_entry_size = 6;
+
+			for (int i = 0; i < count; i++) {
+				ExceptionHandlerType handler_type;
+				if (fat_entry) {
+					var type = ReadUInt32 ();
+					handler_type = (ExceptionHandlerType) (type & 0x7);
+					buffer.WriteUInt32 (type);
+				} else {
+					var type = ReadUInt16 ();
+					handler_type = (ExceptionHandlerType) (type & 0x7);
+					buffer.WriteUInt16 (type);
+				}
+
+				buffer.WriteBytes (ReadBytes (fat_entry ? fat_entry_size : small_entry_size));
+
+				switch (handler_type) {
+				case ExceptionHandlerType.Catch:
+					var exception = reader.LookupToken (ReadToken ());
+					buffer.WriteUInt32 (metadata.LookupToken (exception).ToUInt32 ());
+					break;
+				default:
+					buffer.WriteUInt32 (ReadUInt32 ());
+					break;
+				}
+			}
+		}
+
+#endif
+
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Cil/CodeWriter.cs b/src/Core/Compiler/Importer/IL/Cil/CodeWriter.cs
new file mode 100644
index 000000000..eb1d90480
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/CodeWriter.cs
@@ -0,0 +1,638 @@
+//
+// CodeWriter.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+
+using ScriptSharp.Collections.Generic;
+
+using ScriptSharp.Importer.IL.Metadata;
+using ScriptSharp.Importer.IL.PE;
+
+using RVA = System.UInt32;
+
+#if !IL_READ_ONLY
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+	sealed class CodeWriter : ByteBuffer {
+
+		readonly RVA code_base;
+		internal readonly MetadataBuilder metadata;
+		readonly Dictionary<uint, MetadataToken> standalone_signatures;
+
+		RVA current;
+		MethodBody body;
+
+		public CodeWriter (MetadataBuilder metadata)
+			: base (0)
+		{
+			this.code_base = metadata.text_map.GetNextRVA (TextSegment.CLIHeader);
+			this.current = code_base;
+			this.metadata = metadata;
+			this.standalone_signatures = new Dictionary<uint, MetadataToken> ();
+		}
+
+		public RVA WriteMethodBody (MethodDefinition method)
+		{
+			var rva = BeginMethod ();
+
+			if (IsUnresolved (method)) {
+				if (method.rva == 0)
+					return 0;
+
+				WriteUnresolvedMethodBody (method);
+			} else {
+				if (IsEmptyMethodBody (method.Body))
+					return 0;
+
+				WriteResolvedMethodBody (method);
+			}
+
+			Align (4);
+
+			EndMethod ();
+			return rva;
+		}
+
+		static bool IsEmptyMethodBody (MethodBody body)
+		{
+			return body.instructions.IsNullOrEmpty ()
+				&& body.variables.IsNullOrEmpty ();
+		}
+
+		static bool IsUnresolved (MethodDefinition method)
+		{
+			return method.HasBody && method.HasImage && method.body == null;
+		}
+
+		void WriteUnresolvedMethodBody (MethodDefinition method)
+		{
+			var code_reader = metadata.module.Read (method, (_, reader) => reader.code);
+
+			MethodSymbols symbols;
+			var buffer = code_reader.PatchRawMethodBody (method, this, out symbols);
+
+			WriteBytes (buffer);
+
+			if (symbols.instructions.IsNullOrEmpty ())
+				return;
+
+			symbols.method_token = method.token;
+			symbols.local_var_token = GetLocalVarToken (buffer, symbols);
+
+			var symbol_writer = metadata.symbol_writer;
+			if (symbol_writer != null)
+				symbol_writer.Write (symbols);
+		}
+
+		static MetadataToken GetLocalVarToken (ByteBuffer buffer, MethodSymbols symbols)
+		{
+			if (symbols.variables.IsNullOrEmpty ())
+				return MetadataToken.Zero;
+
+			buffer.position = 8;
+			return new MetadataToken (buffer.ReadUInt32 ());
+		}
+
+		void WriteResolvedMethodBody (MethodDefinition method)
+		{
+			body = method.Body;
+			ComputeHeader ();
+			if (RequiresFatHeader ())
+				WriteFatHeader ();
+			else
+				WriteByte ((byte) (0x2 | (body.CodeSize << 2))); // tiny
+
+			WriteInstructions ();
+
+			if (body.HasExceptionHandlers)
+				WriteExceptionHandlers ();
+
+			var symbol_writer = metadata.symbol_writer;
+			if (symbol_writer != null)
+				symbol_writer.Write (body);
+		}
+
+		void WriteFatHeader ()
+		{
+			var body = this.body;
+			byte flags = 0x3;	// fat
+			if (body.InitLocals)
+				flags |= 0x10;	// init locals
+			if (body.HasExceptionHandlers)
+				flags |= 0x8;	// more sections
+
+			WriteByte (flags);
+			WriteByte (0x30);
+			WriteInt16 ((short) body.max_stack_size);
+			WriteInt32 (body.code_size);
+			body.local_var_token = body.HasVariables
+				? GetStandAloneSignature (body.Variables)
+				: MetadataToken.Zero;
+			WriteMetadataToken (body.local_var_token);
+		}
+
+		void WriteInstructions ()
+		{
+			var instructions = body.Instructions;
+			var items = instructions.items;
+			var size = instructions.size;
+
+			for (int i = 0; i < size; i++) {
+				var instruction = items [i];
+				WriteOpCode (instruction.opcode);
+				WriteOperand (instruction);
+			}
+		}
+
+		void WriteOpCode (OpCode opcode)
+		{
+			if (opcode.Size == 1) {
+				WriteByte (opcode.Op2);
+			} else {
+				WriteByte (opcode.Op1);
+				WriteByte (opcode.Op2);
+			}
+		}
+
+		void WriteOperand (Instruction instruction)
+		{
+			var opcode = instruction.opcode;
+			var operand_type = opcode.OperandType;
+			if (operand_type == OperandType.InlineNone)
+				return;
+
+			var operand = instruction.operand;
+			if (operand == null)
+				throw new ArgumentException ();
+
+			switch (operand_type) {
+			case OperandType.InlineSwitch: {
+				var targets = (Instruction []) operand;
+				WriteInt32 (targets.Length);
+				var diff = instruction.Offset + opcode.Size + (4 * (targets.Length + 1));
+				for (int i = 0; i < targets.Length; i++)
+					WriteInt32 (GetTargetOffset (targets [i]) - diff);
+				break;
+			}
+			case OperandType.ShortInlineBrTarget: {
+				var target = (Instruction) operand;
+				WriteSByte ((sbyte) (GetTargetOffset (target) - (instruction.Offset + opcode.Size + 1)));
+				break;
+			}
+			case OperandType.InlineBrTarget: {
+				var target = (Instruction) operand;
+				WriteInt32 (GetTargetOffset (target) - (instruction.Offset + opcode.Size + 4));
+				break;
+			}
+			case OperandType.ShortInlineVar:
+				WriteByte ((byte) GetVariableIndex ((VariableDefinition) operand));
+				break;
+			case OperandType.ShortInlineArg:
+				WriteByte ((byte) GetParameterIndex ((ParameterDefinition) operand));
+				break;
+			case OperandType.InlineVar:
+				WriteInt16 ((short) GetVariableIndex ((VariableDefinition) operand));
+				break;
+			case OperandType.InlineArg:
+				WriteInt16 ((short) GetParameterIndex ((ParameterDefinition) operand));
+				break;
+			case OperandType.InlineSig:
+				WriteMetadataToken (GetStandAloneSignature ((CallSite) operand));
+				break;
+			case OperandType.ShortInlineI:
+				if (opcode == OpCodes.Ldc_I4_S)
+					WriteSByte ((sbyte) operand);
+				else
+					WriteByte ((byte) operand);
+				break;
+			case OperandType.InlineI:
+				WriteInt32 ((int) operand);
+				break;
+			case OperandType.InlineI8:
+				WriteInt64 ((long) operand);
+				break;
+			case OperandType.ShortInlineR:
+				WriteSingle ((float) operand);
+				break;
+			case OperandType.InlineR:
+				WriteDouble ((double) operand);
+				break;
+			case OperandType.InlineString:
+				WriteMetadataToken (
+					new MetadataToken (
+						TokenType.String,
+						GetUserStringIndex ((string) operand)));
+				break;
+			case OperandType.InlineType:
+			case OperandType.InlineField:
+			case OperandType.InlineMethod:
+			case OperandType.InlineTok:
+				WriteMetadataToken (metadata.LookupToken ((IMetadataTokenProvider) operand));
+				break;
+			default:
+				throw new ArgumentException ();
+			}
+		}
+
+		int GetTargetOffset (Instruction instruction)
+		{
+			if (instruction == null) {
+				var last = body.instructions [body.instructions.size - 1];
+				return last.offset + last.GetSize ();
+			}
+
+			return instruction.offset;
+		}
+
+		uint GetUserStringIndex (string @string)
+		{
+			if (@string == null)
+				return 0;
+
+			return metadata.user_string_heap.GetStringIndex (@string);
+		}
+
+		static int GetVariableIndex (VariableDefinition variable)
+		{
+			return variable.Index;
+		}
+
+		int GetParameterIndex (ParameterDefinition parameter)
+		{
+			if (body.method.HasThis) {
+				if (parameter == body.this_parameter)
+					return 0;
+
+				return parameter.Index + 1;
+			}
+
+			return parameter.Index;
+		}
+
+		bool RequiresFatHeader ()
+		{
+			var body = this.body;
+			return body.CodeSize >= 64
+				|| body.InitLocals
+				|| body.HasVariables
+				|| body.HasExceptionHandlers
+				|| body.MaxStackSize > 8;
+		}
+
+		void ComputeHeader ()
+		{
+			int offset = 0;
+			var instructions = body.instructions;
+			var items = instructions.items;
+			var count = instructions.size;
+			var stack_size = 0;
+			var max_stack = 0;
+			Dictionary<Instruction, int> stack_sizes = null;
+
+			if (body.HasExceptionHandlers)
+				ComputeExceptionHandlerStackSize (ref stack_sizes);
+
+			for (int i = 0; i < count; i++) {
+				var instruction = items [i];
+				instruction.offset = offset;
+				offset += instruction.GetSize ();
+
+				ComputeStackSize (instruction, ref stack_sizes, ref stack_size, ref max_stack);
+			}
+
+			body.code_size = offset;
+			body.max_stack_size = max_stack;
+		}
+
+		void ComputeExceptionHandlerStackSize (ref Dictionary<Instruction, int> stack_sizes)
+		{
+			var exception_handlers = body.ExceptionHandlers;
+
+			for (int i = 0; i < exception_handlers.Count; i++) {
+				var exception_handler = exception_handlers [i];
+
+				switch (exception_handler.HandlerType) {
+				case ExceptionHandlerType.Catch:
+					AddExceptionStackSize (exception_handler.HandlerStart, ref stack_sizes);
+					break;
+				case ExceptionHandlerType.Filter:
+					AddExceptionStackSize (exception_handler.FilterStart, ref stack_sizes);
+					AddExceptionStackSize (exception_handler.HandlerStart, ref stack_sizes);
+					break;
+				}
+			}
+		}
+
+		static void AddExceptionStackSize (Instruction handler_start, ref Dictionary<Instruction, int> stack_sizes)
+		{
+			if (handler_start == null)
+				return;
+
+			if (stack_sizes == null)
+				stack_sizes = new Dictionary<Instruction, int> ();
+
+			stack_sizes [handler_start] = 1;
+		}
+
+		static void ComputeStackSize (Instruction instruction, ref Dictionary<Instruction, int> stack_sizes, ref int stack_size, ref int max_stack)
+		{
+			int computed_size;
+			if (stack_sizes != null && stack_sizes.TryGetValue (instruction, out computed_size))
+				stack_size = computed_size;
+
+			max_stack = System.Math.Max (max_stack, stack_size);
+			ComputeStackDelta (instruction, ref stack_size);
+			max_stack = System.Math.Max (max_stack, stack_size);
+
+			CopyBranchStackSize (instruction, ref stack_sizes, stack_size);
+			ComputeStackSize (instruction, ref stack_size);
+		}
+
+		static void CopyBranchStackSize (Instruction instruction, ref Dictionary<Instruction, int> stack_sizes, int stack_size)
+		{
+			if (stack_size == 0)
+				return;
+
+			switch (instruction.opcode.OperandType) {
+			case OperandType.ShortInlineBrTarget:
+			case OperandType.InlineBrTarget:
+				CopyBranchStackSize (ref stack_sizes, (Instruction) instruction.operand, stack_size);
+				break;
+			case OperandType.InlineSwitch:
+				var targets = (Instruction[]) instruction.operand;
+				for (int i = 0; i < targets.Length; i++)
+					CopyBranchStackSize (ref stack_sizes, targets [i], stack_size);
+				break;
+			}
+		}
+
+		static void CopyBranchStackSize (ref Dictionary<Instruction, int> stack_sizes, Instruction target, int stack_size)
+		{
+			if (stack_sizes == null)
+				stack_sizes = new Dictionary<Instruction, int> ();
+
+			int branch_stack_size = stack_size;
+
+			int computed_size;
+			if (stack_sizes.TryGetValue (target, out computed_size))
+				branch_stack_size = System.Math.Max (branch_stack_size, computed_size);
+
+			stack_sizes [target] = branch_stack_size;
+		}
+
+		static void ComputeStackSize (Instruction instruction, ref int stack_size)
+		{
+			switch (instruction.opcode.FlowControl) {
+			case FlowControl.Branch:
+			case FlowControl.Break:
+			case FlowControl.Throw:
+			case FlowControl.Return:
+				stack_size = 0;
+				break;
+			}
+		}
+
+		static void ComputeStackDelta (Instruction instruction, ref int stack_size)
+		{
+			switch (instruction.opcode.FlowControl) {
+			case FlowControl.Call: {
+				var method = (IMethodSignature) instruction.operand;
+				stack_size -= (method.HasParameters ? method.Parameters.Count : 0)
+					+ (method.HasThis && instruction.opcode.Code != Code.Newobj ? 1 : 0);
+				stack_size += (method.ReturnType.etype == ElementType.Void ? 0 : 1)
+					+ (method.HasThis && instruction.opcode.Code == Code.Newobj ? 1 : 0);
+				break;
+			}
+			default:
+				ComputePopDelta (instruction.opcode.StackBehaviourPop, ref stack_size);
+				ComputePushDelta (instruction.opcode.StackBehaviourPush, ref stack_size);
+				break;
+			}
+		}
+
+		static void ComputePopDelta (StackBehaviour pop_behavior, ref int stack_size)
+		{
+			switch (pop_behavior) {
+			case StackBehaviour.Popi:
+			case StackBehaviour.Popref:
+			case StackBehaviour.Pop1:
+				stack_size--;
+				break;
+			case StackBehaviour.Pop1_pop1:
+			case StackBehaviour.Popi_pop1:
+			case StackBehaviour.Popi_popi:
+			case StackBehaviour.Popi_popi8:
+			case StackBehaviour.Popi_popr4:
+			case StackBehaviour.Popi_popr8:
+			case StackBehaviour.Popref_pop1:
+			case StackBehaviour.Popref_popi:
+				stack_size -= 2;
+				break;
+			case StackBehaviour.Popi_popi_popi:
+			case StackBehaviour.Popref_popi_popi:
+			case StackBehaviour.Popref_popi_popi8:
+			case StackBehaviour.Popref_popi_popr4:
+			case StackBehaviour.Popref_popi_popr8:
+			case StackBehaviour.Popref_popi_popref:
+				stack_size -= 3;
+				break;
+			case StackBehaviour.PopAll:
+				stack_size = 0;
+				break;
+			}
+		}
+
+		static void ComputePushDelta (StackBehaviour push_behaviour, ref int stack_size)
+		{
+			switch (push_behaviour) {
+			case StackBehaviour.Push1:
+			case StackBehaviour.Pushi:
+			case StackBehaviour.Pushi8:
+			case StackBehaviour.Pushr4:
+			case StackBehaviour.Pushr8:
+			case StackBehaviour.Pushref:
+				stack_size++;
+				break;
+			case StackBehaviour.Push1_push1:
+				stack_size += 2;
+				break;
+			}
+		}
+
+		void WriteExceptionHandlers ()
+		{
+			Align (4);
+
+			var handlers = body.ExceptionHandlers;
+
+			if (handlers.Count < 0x15 && !RequiresFatSection (handlers))
+				WriteSmallSection (handlers);
+			else
+				WriteFatSection (handlers);
+		}
+
+		static bool RequiresFatSection (Collection<ExceptionHandler> handlers)
+		{
+			for (int i = 0; i < handlers.Count; i++) {
+				var handler = handlers [i];
+
+				if (IsFatRange (handler.TryStart, handler.TryEnd))
+					return true;
+
+				if (IsFatRange (handler.HandlerStart, handler.HandlerEnd))
+					return true;
+
+				if (handler.HandlerType == ExceptionHandlerType.Filter
+					&& IsFatRange (handler.FilterStart, handler.HandlerStart))
+					return true;
+			}
+
+			return false;
+		}
+
+		static bool IsFatRange (Instruction start, Instruction end)
+		{
+			if (end == null)
+				return true;
+
+			return end.Offset - start.Offset > 255 || start.Offset > 65535;
+		}
+
+		void WriteSmallSection (Collection<ExceptionHandler> handlers)
+		{
+			const byte eh_table = 0x1;
+
+			WriteByte (eh_table);
+			WriteByte ((byte) (handlers.Count * 12 + 4));
+			WriteBytes (2);
+
+			WriteExceptionHandlers (
+				handlers,
+				i => WriteUInt16 ((ushort) i),
+				i => WriteByte ((byte) i));
+		}
+
+		void WriteFatSection (Collection<ExceptionHandler> handlers)
+		{
+			const byte eh_table = 0x1;
+			const byte fat_format = 0x40;
+
+			WriteByte (eh_table | fat_format);
+
+			int size = handlers.Count * 24 + 4;
+			WriteByte ((byte) (size & 0xff));
+			WriteByte ((byte) ((size >> 8) & 0xff));
+			WriteByte ((byte) ((size >> 16) & 0xff));
+
+			WriteExceptionHandlers (handlers, WriteInt32, WriteInt32);
+		}
+
+		void WriteExceptionHandlers (Collection<ExceptionHandler> handlers, Action<int> write_entry, Action<int> write_length)
+		{
+			for (int i = 0; i < handlers.Count; i++) {
+				var handler = handlers [i];
+
+				write_entry ((int) handler.HandlerType);
+
+				write_entry (handler.TryStart.Offset);
+				write_length (GetTargetOffset (handler.TryEnd) - handler.TryStart.Offset);
+
+				write_entry (handler.HandlerStart.Offset);
+				write_length (GetTargetOffset (handler.HandlerEnd) - handler.HandlerStart.Offset);
+
+				WriteExceptionHandlerSpecific (handler);
+			}
+		}
+
+		void WriteExceptionHandlerSpecific (ExceptionHandler handler)
+		{
+			switch (handler.HandlerType) {
+			case ExceptionHandlerType.Catch:
+				WriteMetadataToken (metadata.LookupToken (handler.CatchType));
+				break;
+			case ExceptionHandlerType.Filter:
+				WriteInt32 (handler.FilterStart.Offset);
+				break;
+			default:
+				WriteInt32 (0);
+				break;
+			}
+		}
+
+		public MetadataToken GetStandAloneSignature (Collection<VariableDefinition> variables)
+		{
+			var signature = metadata.GetLocalVariableBlobIndex (variables);
+
+			return GetStandAloneSignatureToken (signature);
+		}
+
+		public MetadataToken GetStandAloneSignature (CallSite call_site)
+		{
+			var signature = metadata.GetCallSiteBlobIndex (call_site);
+			var token = GetStandAloneSignatureToken (signature);
+			call_site.MetadataToken = token;
+			return token;
+		}
+
+		MetadataToken GetStandAloneSignatureToken (uint signature)
+		{
+			MetadataToken token;
+			if (standalone_signatures.TryGetValue (signature, out token))
+				return token;
+
+			token = new MetadataToken (TokenType.Signature, metadata.AddStandAloneSignature (signature));
+			standalone_signatures.Add (signature, token);
+			return token;
+		}
+
+		RVA BeginMethod ()
+		{
+			return current;
+		}
+
+		void WriteMetadataToken (MetadataToken token)
+		{
+			WriteUInt32 (token.ToUInt32 ());
+		}
+
+		void Align (int align)
+		{
+			align--;
+			WriteBytes (((position + align) & ~align) - position);
+		}
+
+		void EndMethod ()
+		{
+			current = (RVA) (code_base + position);
+		}
+	}
+}
+
+#endif
diff --git a/src/Core/Compiler/Importer/IL/Cil/Document.cs b/src/Core/Compiler/Importer/IL/Cil/Document.cs
new file mode 100644
index 000000000..ab48c0edb
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/Document.cs
@@ -0,0 +1,111 @@
+//
+// Document.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+    internal /* public */ enum DocumentType {
+		Other,
+		Text,
+	}
+
+    internal /* public */ enum DocumentHashAlgorithm {
+		None,
+		MD5,
+		SHA1,
+	}
+
+    internal /* public */ enum DocumentLanguage {
+		Other,
+		C,
+		Cpp,
+		CSharp,
+		Basic,
+		Java,
+		Cobol,
+		Pascal,
+		Cil,
+		JScript,
+		Smc,
+		MCpp,
+	}
+
+    internal /* public */ enum DocumentLanguageVendor {
+		Other,
+		Microsoft,
+	}
+
+    internal /* public */ sealed class Document {
+
+		string url;
+
+		byte type;
+		byte hash_algorithm;
+		byte language;
+		byte language_vendor;
+
+		byte [] hash;
+
+		public string Url {
+			get { return url; }
+			set { url = value; }
+		}
+
+		public DocumentType Type {
+			get { return (DocumentType) type; }
+			set { type = (byte) value; }
+		}
+
+		public DocumentHashAlgorithm HashAlgorithm {
+			get { return (DocumentHashAlgorithm) hash_algorithm; }
+			set { hash_algorithm = (byte) value; }
+		}
+
+		public DocumentLanguage Language {
+			get { return (DocumentLanguage) language; }
+			set { language = (byte) value; }
+		}
+
+		public DocumentLanguageVendor LanguageVendor {
+			get { return (DocumentLanguageVendor) language_vendor; }
+			set { language_vendor = (byte) value; }
+		}
+
+		public byte [] Hash {
+			get { return hash; }
+			set { hash = value; }
+		}
+
+		public Document (string url)
+		{
+			this.url = url;
+			this.hash = Empty<byte>.Array;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Cil/ExceptionHandler.cs b/src/Core/Compiler/Importer/IL/Cil/ExceptionHandler.cs
new file mode 100644
index 000000000..78a963a68
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/ExceptionHandler.cs
@@ -0,0 +1,89 @@
+//
+// ExceptionHandler.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+    internal /* public */ enum ExceptionHandlerType {
+		Catch = 0,
+		Filter = 1,
+		Finally = 2,
+		Fault = 4,
+	}
+
+    internal /* public */ sealed class ExceptionHandler {
+
+		Instruction try_start;
+		Instruction try_end;
+		Instruction filter_start;
+		Instruction handler_start;
+		Instruction handler_end;
+
+		TypeReference catch_type;
+		ExceptionHandlerType handler_type;
+
+		public Instruction TryStart {
+			get { return try_start; }
+			set { try_start = value; }
+		}
+
+		public Instruction TryEnd {
+			get { return try_end; }
+			set { try_end = value; }
+		}
+
+		public Instruction FilterStart {
+			get { return filter_start; }
+			set { filter_start = value; }
+		}
+
+		public Instruction HandlerStart {
+			get { return handler_start; }
+			set { handler_start = value; }
+		}
+
+		public Instruction HandlerEnd {
+			get { return handler_end; }
+			set { handler_end = value; }
+		}
+
+		public TypeReference CatchType {
+			get { return catch_type; }
+			set { catch_type = value; }
+		}
+
+		public ExceptionHandlerType HandlerType {
+			get { return handler_type; }
+			set { handler_type = value; }
+		}
+
+		public ExceptionHandler (ExceptionHandlerType handlerType)
+		{
+			this.handler_type = handlerType;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Cil/ILProcessor.cs b/src/Core/Compiler/Importer/IL/Cil/ILProcessor.cs
new file mode 100644
index 000000000..33b7315ea
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/ILProcessor.cs
@@ -0,0 +1,277 @@
+//
+// ILProcessor.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+    internal /* public */ sealed class ILProcessor {
+
+		readonly MethodBody body;
+		readonly Collection<Instruction> instructions;
+
+		public MethodBody Body {
+			get { return body; }
+		}
+
+		internal ILProcessor (MethodBody body)
+		{
+			this.body = body;
+			this.instructions = body.Instructions;
+		}
+
+		public Instruction Create (OpCode opcode)
+		{
+			return Instruction.Create (opcode);
+		}
+
+		public Instruction Create (OpCode opcode, TypeReference type)
+		{
+			return Instruction.Create (opcode, type);
+		}
+
+		public Instruction Create (OpCode opcode, CallSite site)
+		{
+			return Instruction.Create (opcode, site);
+		}
+
+		public Instruction Create (OpCode opcode, MethodReference method)
+		{
+			return Instruction.Create (opcode, method);
+		}
+
+		public Instruction Create (OpCode opcode, FieldReference field)
+		{
+			return Instruction.Create (opcode, field);
+		}
+
+		public Instruction Create (OpCode opcode, string value)
+		{
+			return Instruction.Create (opcode, value);
+		}
+
+		public Instruction Create (OpCode opcode, sbyte value)
+		{
+			return Instruction.Create (opcode, value);
+		}
+
+		public Instruction Create (OpCode opcode, byte value)
+		{
+			if (opcode.OperandType == OperandType.ShortInlineVar)
+				return Instruction.Create (opcode, body.Variables [value]);
+
+			if (opcode.OperandType == OperandType.ShortInlineArg)
+				return Instruction.Create (opcode, body.GetParameter (value));
+
+			return Instruction.Create (opcode, value);
+		}
+
+		public Instruction Create (OpCode opcode, int value)
+		{
+			if (opcode.OperandType == OperandType.InlineVar)
+				return Instruction.Create (opcode, body.Variables [value]);
+
+			if (opcode.OperandType == OperandType.InlineArg)
+				return Instruction.Create (opcode, body.GetParameter (value));
+
+			return Instruction.Create (opcode, value);
+		}
+
+		public Instruction Create (OpCode opcode, long value)
+		{
+			return Instruction.Create (opcode, value);
+		}
+
+		public Instruction Create (OpCode opcode, float value)
+		{
+			return Instruction.Create (opcode, value);
+		}
+
+		public Instruction Create (OpCode opcode, double value)
+		{
+			return Instruction.Create (opcode, value);
+		}
+
+		public Instruction Create (OpCode opcode, Instruction target)
+		{
+			return Instruction.Create (opcode, target);
+		}
+
+		public Instruction Create (OpCode opcode, Instruction [] targets)
+		{
+			return Instruction.Create (opcode, targets);
+		}
+
+		public Instruction Create (OpCode opcode, VariableDefinition variable)
+		{
+			return Instruction.Create (opcode, variable);
+		}
+
+		public Instruction Create (OpCode opcode, ParameterDefinition parameter)
+		{
+			return Instruction.Create (opcode, parameter);
+		}
+
+		public void Emit (OpCode opcode)
+		{
+			Append (Create (opcode));
+		}
+
+		public void Emit (OpCode opcode, TypeReference type)
+		{
+			Append (Create (opcode, type));
+		}
+
+		public void Emit (OpCode opcode, MethodReference method)
+		{
+			Append (Create (opcode, method));
+		}
+
+		public void Emit (OpCode opcode, CallSite site)
+		{
+			Append (Create (opcode, site));
+		}
+
+		public void Emit (OpCode opcode, FieldReference field)
+		{
+			Append (Create (opcode, field));
+		}
+
+		public void Emit (OpCode opcode, string value)
+		{
+			Append (Create (opcode, value));
+		}
+
+		public void Emit (OpCode opcode, byte value)
+		{
+			Append (Create (opcode, value));
+		}
+
+		public void Emit (OpCode opcode, sbyte value)
+		{
+			Append (Create (opcode, value));
+		}
+
+		public void Emit (OpCode opcode, int value)
+		{
+			Append (Create (opcode, value));
+		}
+
+		public void Emit (OpCode opcode, long value)
+		{
+			Append (Create (opcode, value));
+		}
+
+		public void Emit (OpCode opcode, float value)
+		{
+			Append (Create (opcode, value));
+		}
+
+		public void Emit (OpCode opcode, double value)
+		{
+			Append (Create (opcode, value));
+		}
+
+		public void Emit (OpCode opcode, Instruction target)
+		{
+			Append (Create (opcode, target));
+		}
+
+		public void Emit (OpCode opcode, Instruction [] targets)
+		{
+			Append (Create (opcode, targets));
+		}
+
+		public void Emit (OpCode opcode, VariableDefinition variable)
+		{
+			Append (Create (opcode, variable));
+		}
+
+		public void Emit (OpCode opcode, ParameterDefinition parameter)
+		{
+			Append (Create (opcode, parameter));
+		}
+
+		public void InsertBefore (Instruction target, Instruction instruction)
+		{
+			if (target == null)
+				throw new ArgumentNullException ("target");
+			if (instruction == null)
+				throw new ArgumentNullException ("instruction");
+
+			var index = instructions.IndexOf (target);
+			if (index == -1)
+				throw new ArgumentOutOfRangeException ("target");
+
+			instructions.Insert (index, instruction);
+		}
+
+		public void InsertAfter (Instruction target, Instruction instruction)
+		{
+			if (target == null)
+				throw new ArgumentNullException ("target");
+			if (instruction == null)
+				throw new ArgumentNullException ("instruction");
+
+			var index = instructions.IndexOf (target);
+			if (index == -1)
+				throw new ArgumentOutOfRangeException ("target");
+
+			instructions.Insert (index + 1, instruction);
+		}
+
+		public void Append (Instruction instruction)
+		{
+			if (instruction == null)
+				throw new ArgumentNullException ("instruction");
+
+			instructions.Add (instruction);
+		}
+
+		public void Replace (Instruction target, Instruction instruction)
+		{
+			if (target == null)
+				throw new ArgumentNullException ("target");
+			if (instruction == null)
+				throw new ArgumentNullException ("instruction");
+
+			InsertAfter (target, instruction);
+			Remove (target);
+		}
+
+		public void Remove (Instruction instruction)
+		{
+			if (instruction == null)
+				throw new ArgumentNullException ("instruction");
+
+			if (!instructions.Remove (instruction))
+				throw new ArgumentOutOfRangeException ("instruction");
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Cil/Instruction.cs b/src/Core/Compiler/Importer/IL/Cil/Instruction.cs
new file mode 100644
index 000000000..dba79fdb6
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/Instruction.cs
@@ -0,0 +1,321 @@
+//
+// Instruction.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Text;
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+    internal /* public */ sealed class Instruction {
+
+		internal int offset;
+		internal OpCode opcode;
+		internal object operand;
+
+		internal Instruction previous;
+		internal Instruction next;
+
+		SequencePoint sequence_point;
+
+		public int Offset {
+			get { return offset; }
+			set { offset = value; }
+		}
+
+		public OpCode OpCode {
+			get { return opcode; }
+			set { opcode = value; }
+		}
+
+		public object Operand {
+			get { return operand; }
+			set { operand = value; }
+		}
+
+		public Instruction Previous {
+			get { return previous; }
+			set { previous = value; }
+		}
+
+		public Instruction Next {
+			get { return next; }
+			set { next = value; }
+		}
+
+		public SequencePoint SequencePoint {
+			get { return sequence_point; }
+			set { sequence_point = value; }
+		}
+
+		internal Instruction (int offset, OpCode opCode)
+		{
+			this.offset = offset;
+			this.opcode = opCode;
+		}
+
+		internal Instruction (OpCode opcode, object operand)
+		{
+			this.opcode = opcode;
+			this.operand = operand;
+		}
+
+		public int GetSize ()
+		{
+			int size = opcode.Size;
+
+			switch (opcode.OperandType) {
+			case OperandType.InlineSwitch:
+				return size + (1 + ((Instruction []) operand).Length) * 4;
+			case OperandType.InlineI8:
+			case OperandType.InlineR:
+				return size + 8;
+			case OperandType.InlineBrTarget:
+			case OperandType.InlineField:
+			case OperandType.InlineI:
+			case OperandType.InlineMethod:
+			case OperandType.InlineString:
+			case OperandType.InlineTok:
+			case OperandType.InlineType:
+			case OperandType.ShortInlineR:
+			case OperandType.InlineSig:
+				return size + 4;
+			case OperandType.InlineArg:
+			case OperandType.InlineVar:
+				return size + 2;
+			case OperandType.ShortInlineBrTarget:
+			case OperandType.ShortInlineI:
+			case OperandType.ShortInlineArg:
+			case OperandType.ShortInlineVar:
+				return size + 1;
+			default:
+				return size;
+			}
+		}
+
+		public override string ToString ()
+		{
+			var instruction = new StringBuilder ();
+
+			AppendLabel (instruction, this);
+			instruction.Append (':');
+			instruction.Append (' ');
+			instruction.Append (opcode.Name);
+
+			if (operand == null)
+				return instruction.ToString ();
+
+			instruction.Append (' ');
+
+			switch (opcode.OperandType) {
+			case OperandType.ShortInlineBrTarget:
+			case OperandType.InlineBrTarget:
+				AppendLabel (instruction, (Instruction) operand);
+				break;
+			case OperandType.InlineSwitch:
+				var labels = (Instruction []) operand;
+				for (int i = 0; i < labels.Length; i++) {
+					if (i > 0)
+						instruction.Append (',');
+
+					AppendLabel (instruction, labels [i]);
+				}
+				break;
+			case OperandType.InlineString:
+				instruction.Append ('\"');
+				instruction.Append (operand);
+				instruction.Append ('\"');
+				break;
+			default:
+				instruction.Append (operand);
+				break;
+			}
+
+			return instruction.ToString ();
+		}
+
+		static void AppendLabel (StringBuilder builder, Instruction instruction)
+		{
+			builder.Append ("IL_");
+			builder.Append (instruction.offset.ToString ("x4"));
+		}
+
+		public static Instruction Create (OpCode opcode)
+		{
+			if (opcode.OperandType != OperandType.InlineNone)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, null);
+		}
+
+		public static Instruction Create (OpCode opcode, TypeReference type)
+		{
+			if (type == null)
+				throw new ArgumentNullException ("type");
+			if (opcode.OperandType != OperandType.InlineType &&
+				opcode.OperandType != OperandType.InlineTok)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, type);
+		}
+
+		public static Instruction Create (OpCode opcode, CallSite site)
+		{
+			if (site == null)
+				throw new ArgumentNullException ("site");
+			if (opcode.Code != Code.Calli)
+				throw new ArgumentException ("code");
+
+			return new Instruction (opcode, site);
+		}
+
+		public static Instruction Create (OpCode opcode, MethodReference method)
+		{
+			if (method == null)
+				throw new ArgumentNullException ("method");
+			if (opcode.OperandType != OperandType.InlineMethod &&
+				opcode.OperandType != OperandType.InlineTok)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, method);
+		}
+
+		public static Instruction Create (OpCode opcode, FieldReference field)
+		{
+			if (field == null)
+				throw new ArgumentNullException ("field");
+			if (opcode.OperandType != OperandType.InlineField &&
+				opcode.OperandType != OperandType.InlineTok)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, field);
+		}
+
+		public static Instruction Create (OpCode opcode, string value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value");
+			if (opcode.OperandType != OperandType.InlineString)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, value);
+		}
+
+		public static Instruction Create (OpCode opcode, sbyte value)
+		{
+			if (opcode.OperandType != OperandType.ShortInlineI &&
+				opcode != OpCodes.Ldc_I4_S)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, value);
+		}
+
+		public static Instruction Create (OpCode opcode, byte value)
+		{
+			if (opcode.OperandType != OperandType.ShortInlineI ||
+				opcode == OpCodes.Ldc_I4_S)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, value);
+		}
+
+		public static Instruction Create (OpCode opcode, int value)
+		{
+			if (opcode.OperandType != OperandType.InlineI)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, value);
+		}
+
+		public static Instruction Create (OpCode opcode, long value)
+		{
+			if (opcode.OperandType != OperandType.InlineI8)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, value);
+		}
+
+		public static Instruction Create (OpCode opcode, float value)
+		{
+			if (opcode.OperandType != OperandType.ShortInlineR)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, value);
+		}
+
+		public static Instruction Create (OpCode opcode, double value)
+		{
+			if (opcode.OperandType != OperandType.InlineR)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, value);
+		}
+
+		public static Instruction Create (OpCode opcode, Instruction target)
+		{
+			if (target == null)
+				throw new ArgumentNullException ("target");
+			if (opcode.OperandType != OperandType.InlineBrTarget &&
+				opcode.OperandType != OperandType.ShortInlineBrTarget)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, target);
+		}
+
+		public static Instruction Create (OpCode opcode, Instruction [] targets)
+		{
+			if (targets == null)
+				throw new ArgumentNullException ("targets");
+			if (opcode.OperandType != OperandType.InlineSwitch)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, targets);
+		}
+
+		public static Instruction Create (OpCode opcode, VariableDefinition variable)
+		{
+			if (variable == null)
+				throw new ArgumentNullException ("variable");
+			if (opcode.OperandType != OperandType.ShortInlineVar &&
+				opcode.OperandType != OperandType.InlineVar)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, variable);
+		}
+
+		public static Instruction Create (OpCode opcode, ParameterDefinition parameter)
+		{
+			if (parameter == null)
+				throw new ArgumentNullException ("parameter");
+			if (opcode.OperandType != OperandType.ShortInlineArg &&
+				opcode.OperandType != OperandType.InlineArg)
+				throw new ArgumentException ("opcode");
+
+			return new Instruction (opcode, parameter);
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Cil/MethodBody.cs b/src/Core/Compiler/Importer/IL/Cil/MethodBody.cs
new file mode 100644
index 000000000..f55f14313
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/MethodBody.cs
@@ -0,0 +1,229 @@
+//
+// MethodBody.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+    internal /* public */ sealed class MethodBody : IVariableDefinitionProvider {
+
+		readonly internal MethodDefinition method;
+
+		internal ParameterDefinition this_parameter;
+		internal int max_stack_size;
+		internal int code_size;
+		internal bool init_locals;
+		internal MetadataToken local_var_token;
+
+		internal Collection<Instruction> instructions;
+		internal Collection<ExceptionHandler> exceptions;
+		internal Collection<VariableDefinition> variables;
+		Scope scope;
+
+		public MethodDefinition Method {
+			get { return method; }
+		}
+
+		public int MaxStackSize {
+			get { return max_stack_size; }
+			set { max_stack_size = value; }
+		}
+
+		public int CodeSize {
+			get { return code_size; }
+		}
+
+		public bool InitLocals {
+			get { return init_locals; }
+			set { init_locals = value; }
+		}
+
+		public MetadataToken LocalVarToken {
+			get { return local_var_token; }
+			set { local_var_token = value; }
+		}
+
+		public Collection<Instruction> Instructions {
+			get { return instructions ?? (instructions = new InstructionCollection ()); }
+		}
+
+		public bool HasExceptionHandlers {
+			get { return !exceptions.IsNullOrEmpty (); }
+		}
+
+		public Collection<ExceptionHandler> ExceptionHandlers {
+			get { return exceptions ?? (exceptions = new Collection<ExceptionHandler> ()); }
+		}
+
+		public bool HasVariables {
+			get { return !variables.IsNullOrEmpty (); }
+		}
+
+		public Collection<VariableDefinition> Variables {
+			get { return variables ?? (variables = new VariableDefinitionCollection ()); }
+		}
+
+		public Scope Scope {
+			get { return scope; }
+			set { scope = value; }
+		}
+
+		public ParameterDefinition ThisParameter {
+			get {
+				if (method == null || method.DeclaringType == null)
+					throw new NotSupportedException ();
+
+				return this_parameter ?? (this_parameter = new ParameterDefinition ("0", ParameterAttributes.None, method.DeclaringType));
+			}
+		}
+
+		public MethodBody (MethodDefinition method)
+		{
+			this.method = method;
+		}
+
+		public ILProcessor GetILProcessor ()
+		{
+			return new ILProcessor (this);
+		}
+	}
+
+    internal /* public */ interface IVariableDefinitionProvider {
+		bool HasVariables { get; }
+		Collection<VariableDefinition> Variables { get; }
+	}
+
+	class VariableDefinitionCollection : Collection<VariableDefinition> {
+
+		internal VariableDefinitionCollection ()
+		{
+		}
+
+		internal VariableDefinitionCollection (int capacity)
+			: base (capacity)
+		{
+		}
+
+		protected override void OnAdd (VariableDefinition item, int index)
+		{
+			item.index = index;
+		}
+
+		protected override void OnInsert (VariableDefinition item, int index)
+		{
+			item.index = index;
+
+			for (int i = index; i < size; i++)
+				items [i].index = i + 1;
+		}
+
+		protected override void OnSet (VariableDefinition item, int index)
+		{
+			item.index = index;
+		}
+
+		protected override void OnRemove (VariableDefinition item, int index)
+		{
+			item.index = -1;
+
+			for (int i = index + 1; i < size; i++)
+				items [i].index = i - 1;
+		}
+	}
+
+	class InstructionCollection : Collection<Instruction> {
+
+		internal InstructionCollection ()
+		{
+		}
+
+		internal InstructionCollection (int capacity)
+			: base (capacity)
+		{
+		}
+
+		protected override void OnAdd (Instruction item, int index)
+		{
+			if (index == 0)
+				return;
+
+			var previous = items [index - 1];
+			previous.next = item;
+			item.previous = previous;
+		}
+
+		protected override void OnInsert (Instruction item, int index)
+		{
+			if (size == 0)
+				return;
+
+			var current = items [index];
+			if (current == null) {
+				var last = items [index - 1];
+				last.next = item;
+				item.previous = last;
+				return;
+			}
+
+			var previous = current.previous;
+			if (previous != null) {
+				previous.next = item;
+				item.previous = previous;
+			}
+
+			current.previous = item;
+			item.next = current;
+		}
+
+		protected override void OnSet (Instruction item, int index)
+		{
+			var current = items [index];
+
+			item.previous = current.previous;
+			item.next = current.next;
+
+			current.previous = null;
+			current.next = null;
+		}
+
+		protected override void OnRemove (Instruction item, int index)
+		{
+			var previous = item.previous;
+			if (previous != null)
+				previous.next = item.next;
+
+			var next = item.next;
+			if (next != null)
+				next.previous = item.previous;
+
+			item.previous = null;
+			item.next = null;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Cil/OpCode.cs b/src/Core/Compiler/Importer/IL/Cil/OpCode.cs
new file mode 100644
index 000000000..4ba0d712a
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/OpCode.cs
@@ -0,0 +1,524 @@
+//
+// OpCode.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+    internal /* public */ enum FlowControl {
+		Branch,
+		Break,
+		Call,
+		Cond_Branch,
+		Meta,
+		Next,
+		Phi,
+		Return,
+		Throw,
+	}
+
+    internal /* public */ enum OpCodeType {
+		Annotation,
+		Macro,
+		Nternal,
+		Objmodel,
+		Prefix,
+		Primitive,
+	}
+
+    internal /* public */ enum OperandType {
+		InlineBrTarget,
+		InlineField,
+		InlineI,
+		InlineI8,
+		InlineMethod,
+		InlineNone,
+		InlinePhi,
+		InlineR,
+		InlineSig,
+		InlineString,
+		InlineSwitch,
+		InlineTok,
+		InlineType,
+		InlineVar,
+		InlineArg,
+		ShortInlineBrTarget,
+		ShortInlineI,
+		ShortInlineR,
+		ShortInlineVar,
+		ShortInlineArg,
+	}
+
+    internal /* public */ enum StackBehaviour {
+		Pop0,
+		Pop1,
+		Pop1_pop1,
+		Popi,
+		Popi_pop1,
+		Popi_popi,
+		Popi_popi8,
+		Popi_popi_popi,
+		Popi_popr4,
+		Popi_popr8,
+		Popref,
+		Popref_pop1,
+		Popref_popi,
+		Popref_popi_popi,
+		Popref_popi_popi8,
+		Popref_popi_popr4,
+		Popref_popi_popr8,
+		Popref_popi_popref,
+		PopAll,
+		Push0,
+		Push1,
+		Push1_push1,
+		Pushi,
+		Pushi8,
+		Pushr4,
+		Pushr8,
+		Pushref,
+		Varpop,
+		Varpush,
+	}
+
+    internal /* public */ struct OpCode {
+
+		readonly byte op1;
+		readonly byte op2;
+		readonly byte code;
+		readonly byte flow_control;
+		readonly byte opcode_type;
+		readonly byte operand_type;
+		readonly byte stack_behavior_pop;
+		readonly byte stack_behavior_push;
+
+		public string Name {
+			get { return OpCodeNames.names [op1 == 0xff ? op2 : op2 + 256]; }
+		}
+
+		public int Size {
+			get { return op1 == 0xff ? 1 : 2; }
+		}
+
+		public byte Op1 {
+			get { return op1; }
+		}
+
+		public byte Op2 {
+			get { return op2; }
+		}
+
+		public short Value {
+			get { return (short) ((op1 << 8) | op2); }
+		}
+
+		public Code Code {
+			get { return (Code) code; }
+		}
+
+		public FlowControl FlowControl {
+			get { return (FlowControl) flow_control; }
+		}
+
+		public OpCodeType OpCodeType {
+			get { return (OpCodeType) opcode_type; }
+		}
+
+		public OperandType OperandType {
+			get { return (OperandType) operand_type; }
+		}
+
+		public StackBehaviour StackBehaviourPop {
+			get { return (StackBehaviour) stack_behavior_pop; }
+		}
+
+		public StackBehaviour StackBehaviourPush {
+			get { return (StackBehaviour) stack_behavior_push; }
+		}
+
+		internal OpCode (int x, int y)
+		{
+			this.op1 = (byte) ((x >> 0) & 0xff);
+			this.op2 = (byte) ((x >> 8) & 0xff);
+			this.code = (byte) ((x >> 16) & 0xff);
+			this.flow_control = (byte) ((x >> 24) & 0xff);
+
+			this.opcode_type = (byte) ((y >> 0) & 0xff);
+			this.operand_type = (byte) ((y >> 8) & 0xff);
+			this.stack_behavior_pop = (byte) ((y >> 16) & 0xff);
+			this.stack_behavior_push = (byte) ((y >> 24) & 0xff);
+
+			if (op1 == 0xff)
+				OpCodes.OneByteOpCode [op2] = this;
+			else
+				OpCodes.TwoBytesOpCode [op2] = this;
+		}
+
+		public override int GetHashCode ()
+		{
+			return Value;
+		}
+
+		public override bool Equals (object obj)
+		{
+			if (!(obj is OpCode))
+				return false;
+
+			var opcode = (OpCode) obj;
+			return op1 == opcode.op1 && op2 == opcode.op2;
+		}
+
+		public bool Equals (OpCode opcode)
+		{
+			return op1 == opcode.op1 && op2 == opcode.op2;
+		}
+
+		public static bool operator == (OpCode one, OpCode other)
+		{
+			return one.op1 == other.op1 && one.op2 == other.op2;
+		}
+
+		public static bool operator != (OpCode one, OpCode other)
+		{
+			return one.op1 != other.op1 || one.op2 != other.op2;
+		}
+
+		public override string ToString ()
+		{
+			return Name;
+		}
+	}
+
+	static class OpCodeNames {
+
+		internal static readonly string [] names = {
+			"nop",
+			"break",
+			"ldarg.0",
+			"ldarg.1",
+			"ldarg.2",
+			"ldarg.3",
+			"ldloc.0",
+			"ldloc.1",
+			"ldloc.2",
+			"ldloc.3",
+			"stloc.0",
+			"stloc.1",
+			"stloc.2",
+			"stloc.3",
+			"ldarg.s",
+			"ldarga.s",
+			"starg.s",
+			"ldloc.s",
+			"ldloca.s",
+			"stloc.s",
+			"ldnull",
+			"ldc.i4.m1",
+			"ldc.i4.0",
+			"ldc.i4.1",
+			"ldc.i4.2",
+			"ldc.i4.3",
+			"ldc.i4.4",
+			"ldc.i4.5",
+			"ldc.i4.6",
+			"ldc.i4.7",
+			"ldc.i4.8",
+			"ldc.i4.s",
+			"ldc.i4",
+			"ldc.i8",
+			"ldc.r4",
+			"ldc.r8",
+			null,
+			"dup",
+			"pop",
+			"jmp",
+			"call",
+			"calli",
+			"ret",
+			"br.s",
+			"brfalse.s",
+			"brtrue.s",
+			"beq.s",
+			"bge.s",
+			"bgt.s",
+			"ble.s",
+			"blt.s",
+			"bne.un.s",
+			"bge.un.s",
+			"bgt.un.s",
+			"ble.un.s",
+			"blt.un.s",
+			"br",
+			"brfalse",
+			"brtrue",
+			"beq",
+			"bge",
+			"bgt",
+			"ble",
+			"blt",
+			"bne.un",
+			"bge.un",
+			"bgt.un",
+			"ble.un",
+			"blt.un",
+			"switch",
+			"ldind.i1",
+			"ldind.u1",
+			"ldind.i2",
+			"ldind.u2",
+			"ldind.i4",
+			"ldind.u4",
+			"ldind.i8",
+			"ldind.i",
+			"ldind.r4",
+			"ldind.r8",
+			"ldind.ref",
+			"stind.ref",
+			"stind.i1",
+			"stind.i2",
+			"stind.i4",
+			"stind.i8",
+			"stind.r4",
+			"stind.r8",
+			"add",
+			"sub",
+			"mul",
+			"div",
+			"div.un",
+			"rem",
+			"rem.un",
+			"and",
+			"or",
+			"xor",
+			"shl",
+			"shr",
+			"shr.un",
+			"neg",
+			"not",
+			"conv.i1",
+			"conv.i2",
+			"conv.i4",
+			"conv.i8",
+			"conv.r4",
+			"conv.r8",
+			"conv.u4",
+			"conv.u8",
+			"callvirt",
+			"cpobj",
+			"ldobj",
+			"ldstr",
+			"newobj",
+			"castclass",
+			"isinst",
+			"conv.r.un",
+			null,
+			null,
+			"unbox",
+			"throw",
+			"ldfld",
+			"ldflda",
+			"stfld",
+			"ldsfld",
+			"ldsflda",
+			"stsfld",
+			"stobj",
+			"conv.ovf.i1.un",
+			"conv.ovf.i2.un",
+			"conv.ovf.i4.un",
+			"conv.ovf.i8.un",
+			"conv.ovf.u1.un",
+			"conv.ovf.u2.un",
+			"conv.ovf.u4.un",
+			"conv.ovf.u8.un",
+			"conv.ovf.i.un",
+			"conv.ovf.u.un",
+			"box",
+			"newarr",
+			"ldlen",
+			"ldelema",
+			"ldelem.i1",
+			"ldelem.u1",
+			"ldelem.i2",
+			"ldelem.u2",
+			"ldelem.i4",
+			"ldelem.u4",
+			"ldelem.i8",
+			"ldelem.i",
+			"ldelem.r4",
+			"ldelem.r8",
+			"ldelem.ref",
+			"stelem.i",
+			"stelem.i1",
+			"stelem.i2",
+			"stelem.i4",
+			"stelem.i8",
+			"stelem.r4",
+			"stelem.r8",
+			"stelem.ref",
+			"ldelem.any",
+			"stelem.any",
+			"unbox.any",
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			"conv.ovf.i1",
+			"conv.ovf.u1",
+			"conv.ovf.i2",
+			"conv.ovf.u2",
+			"conv.ovf.i4",
+			"conv.ovf.u4",
+			"conv.ovf.i8",
+			"conv.ovf.u8",
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			"refanyval",
+			"ckfinite",
+			null,
+			null,
+			"mkrefany",
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			"ldtoken",
+			"conv.u2",
+			"conv.u1",
+			"conv.i",
+			"conv.ovf.i",
+			"conv.ovf.u",
+			"add.ovf",
+			"add.ovf.un",
+			"mul.ovf",
+			"mul.ovf.un",
+			"sub.ovf",
+			"sub.ovf.un",
+			"endfinally",
+			"leave",
+			"leave.s",
+			"stind.i",
+			"conv.u",
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			"prefix7",
+			"prefix6",
+			"prefix5",
+			"prefix4",
+			"prefix3",
+			"prefix2",
+			"prefix1",
+			"prefixref",
+			"arglist",
+			"ceq",
+			"cgt",
+			"cgt.un",
+			"clt",
+			"clt.un",
+			"ldftn",
+			"ldvirtftn",
+			null,
+			"ldarg",
+			"ldarga",
+			"starg",
+			"ldloc",
+			"ldloca",
+			"stloc",
+			"localloc",
+			null,
+			"endfilter",
+			"unaligned.",
+			"volatile.",
+			"tail.",
+			"initobj",
+			"constrained.",
+			"cpblk",
+			"initblk",
+			"no.",		// added by spouliot to match Cecil existing definitions
+			"rethrow",
+			null,
+			"sizeof",
+			"refanytype",
+			"readonly.",	// added by spouliot to match Cecil existing definitions
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+			null,
+		};
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Cil/OpCodes.cs b/src/Core/Compiler/Importer/IL/Cil/OpCodes.cs
new file mode 100644
index 000000000..cb958c102
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/OpCodes.cs
@@ -0,0 +1,912 @@
+//
+// OpCodes.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+    internal /* public */ static class OpCodes {
+
+		internal static readonly OpCode [] OneByteOpCode = new OpCode [0xe0 + 1];
+		internal static readonly OpCode [] TwoBytesOpCode = new OpCode [0x1e + 1];
+
+		public static readonly OpCode Nop = new OpCode (
+			0xff << 0 | 0x00 << 8 | (byte) Code.Nop << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Break = new OpCode (
+			0xff << 0 | 0x01 << 8 | (byte) Code.Break << 16 | (byte) FlowControl.Break << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ldarg_0 = new OpCode (
+			0xff << 0 | 0x02 << 8 | (byte) Code.Ldarg_0 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldarg_1 = new OpCode (
+			0xff << 0 | 0x03 << 8 | (byte) Code.Ldarg_1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldarg_2 = new OpCode (
+			0xff << 0 | 0x04 << 8 | (byte) Code.Ldarg_2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldarg_3 = new OpCode (
+			0xff << 0 | 0x05 << 8 | (byte) Code.Ldarg_3 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldloc_0 = new OpCode (
+			0xff << 0 | 0x06 << 8 | (byte) Code.Ldloc_0 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldloc_1 = new OpCode (
+			0xff << 0 | 0x07 << 8 | (byte) Code.Ldloc_1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldloc_2 = new OpCode (
+			0xff << 0 | 0x08 << 8 | (byte) Code.Ldloc_2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldloc_3 = new OpCode (
+			0xff << 0 | 0x09 << 8 | (byte) Code.Ldloc_3 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Stloc_0 = new OpCode (
+			0xff << 0 | 0x0a << 8 | (byte) Code.Stloc_0 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stloc_1 = new OpCode (
+			0xff << 0 | 0x0b << 8 | (byte) Code.Stloc_1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stloc_2 = new OpCode (
+			0xff << 0 | 0x0c << 8 | (byte) Code.Stloc_2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stloc_3 = new OpCode (
+			0xff << 0 | 0x0d << 8 | (byte) Code.Stloc_3 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ldarg_S = new OpCode (
+			0xff << 0 | 0x0e << 8 | (byte) Code.Ldarg_S << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineArg << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldarga_S = new OpCode (
+			0xff << 0 | 0x0f << 8 | (byte) Code.Ldarga_S << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineArg << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Starg_S = new OpCode (
+			0xff << 0 | 0x10 << 8 | (byte) Code.Starg_S << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineArg << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ldloc_S = new OpCode (
+			0xff << 0 | 0x11 << 8 | (byte) Code.Ldloc_S << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineVar << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldloca_S = new OpCode (
+			0xff << 0 | 0x12 << 8 | (byte) Code.Ldloca_S << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineVar << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Stloc_S = new OpCode (
+			0xff << 0 | 0x13 << 8 | (byte) Code.Stloc_S << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineVar << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ldnull = new OpCode (
+			0xff << 0 | 0x14 << 8 | (byte) Code.Ldnull << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushref << 24);
+
+		public static readonly OpCode Ldc_I4_M1 = new OpCode (
+			0xff << 0 | 0x15 << 8 | (byte) Code.Ldc_I4_M1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldc_I4_0 = new OpCode (
+			0xff << 0 | 0x16 << 8 | (byte) Code.Ldc_I4_0 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldc_I4_1 = new OpCode (
+			0xff << 0 | 0x17 << 8 | (byte) Code.Ldc_I4_1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldc_I4_2 = new OpCode (
+			0xff << 0 | 0x18 << 8 | (byte) Code.Ldc_I4_2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldc_I4_3 = new OpCode (
+			0xff << 0 | 0x19 << 8 | (byte) Code.Ldc_I4_3 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldc_I4_4 = new OpCode (
+			0xff << 0 | 0x1a << 8 | (byte) Code.Ldc_I4_4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldc_I4_5 = new OpCode (
+			0xff << 0 | 0x1b << 8 | (byte) Code.Ldc_I4_5 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldc_I4_6 = new OpCode (
+			0xff << 0 | 0x1c << 8 | (byte) Code.Ldc_I4_6 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldc_I4_7 = new OpCode (
+			0xff << 0 | 0x1d << 8 | (byte) Code.Ldc_I4_7 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldc_I4_8 = new OpCode (
+			0xff << 0 | 0x1e << 8 | (byte) Code.Ldc_I4_8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldc_I4_S = new OpCode (
+			0xff << 0 | 0x1f << 8 | (byte) Code.Ldc_I4_S << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineI << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldc_I4 = new OpCode (
+			0xff << 0 | 0x20 << 8 | (byte) Code.Ldc_I4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineI << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldc_I8 = new OpCode (
+			0xff << 0 | 0x21 << 8 | (byte) Code.Ldc_I8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineI8 << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi8 << 24);
+
+		public static readonly OpCode Ldc_R4 = new OpCode (
+			0xff << 0 | 0x22 << 8 | (byte) Code.Ldc_R4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.ShortInlineR << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushr4 << 24);
+
+		public static readonly OpCode Ldc_R8 = new OpCode (
+			0xff << 0 | 0x23 << 8 | (byte) Code.Ldc_R8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineR << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushr8 << 24);
+
+		public static readonly OpCode Dup = new OpCode (
+			0xff << 0 | 0x25 << 8 | (byte) Code.Dup << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Push1_push1 << 24);
+
+		public static readonly OpCode Pop = new OpCode (
+			0xff << 0 | 0x26 << 8 | (byte) Code.Pop << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Jmp = new OpCode (
+			0xff << 0 | 0x27 << 8 | (byte) Code.Jmp << 16 | (byte) FlowControl.Call << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineMethod << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Call = new OpCode (
+			0xff << 0 | 0x28 << 8 | (byte) Code.Call << 16 | (byte) FlowControl.Call << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineMethod << 8 | (byte) StackBehaviour.Varpop << 16 | (byte) StackBehaviour.Varpush << 24);
+
+		public static readonly OpCode Calli = new OpCode (
+			0xff << 0 | 0x29 << 8 | (byte) Code.Calli << 16 | (byte) FlowControl.Call << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineSig << 8 | (byte) StackBehaviour.Varpop << 16 | (byte) StackBehaviour.Varpush << 24);
+
+		public static readonly OpCode Ret = new OpCode (
+			0xff << 0 | 0x2a << 8 | (byte) Code.Ret << 16 | (byte) FlowControl.Return << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Varpop << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Br_S = new OpCode (
+			0xff << 0 | 0x2b << 8 | (byte) Code.Br_S << 16 | (byte) FlowControl.Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Brfalse_S = new OpCode (
+			0xff << 0 | 0x2c << 8 | (byte) Code.Brfalse_S << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Brtrue_S = new OpCode (
+			0xff << 0 | 0x2d << 8 | (byte) Code.Brtrue_S << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Beq_S = new OpCode (
+			0xff << 0 | 0x2e << 8 | (byte) Code.Beq_S << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Bge_S = new OpCode (
+			0xff << 0 | 0x2f << 8 | (byte) Code.Bge_S << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Bgt_S = new OpCode (
+			0xff << 0 | 0x30 << 8 | (byte) Code.Bgt_S << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ble_S = new OpCode (
+			0xff << 0 | 0x31 << 8 | (byte) Code.Ble_S << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Blt_S = new OpCode (
+			0xff << 0 | 0x32 << 8 | (byte) Code.Blt_S << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Bne_Un_S = new OpCode (
+			0xff << 0 | 0x33 << 8 | (byte) Code.Bne_Un_S << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Bge_Un_S = new OpCode (
+			0xff << 0 | 0x34 << 8 | (byte) Code.Bge_Un_S << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Bgt_Un_S = new OpCode (
+			0xff << 0 | 0x35 << 8 | (byte) Code.Bgt_Un_S << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ble_Un_S = new OpCode (
+			0xff << 0 | 0x36 << 8 | (byte) Code.Ble_Un_S << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Blt_Un_S = new OpCode (
+			0xff << 0 | 0x37 << 8 | (byte) Code.Blt_Un_S << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Br = new OpCode (
+			0xff << 0 | 0x38 << 8 | (byte) Code.Br << 16 | (byte) FlowControl.Branch << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Brfalse = new OpCode (
+			0xff << 0 | 0x39 << 8 | (byte) Code.Brfalse << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Brtrue = new OpCode (
+			0xff << 0 | 0x3a << 8 | (byte) Code.Brtrue << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Beq = new OpCode (
+			0xff << 0 | 0x3b << 8 | (byte) Code.Beq << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Bge = new OpCode (
+			0xff << 0 | 0x3c << 8 | (byte) Code.Bge << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Bgt = new OpCode (
+			0xff << 0 | 0x3d << 8 | (byte) Code.Bgt << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ble = new OpCode (
+			0xff << 0 | 0x3e << 8 | (byte) Code.Ble << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Blt = new OpCode (
+			0xff << 0 | 0x3f << 8 | (byte) Code.Blt << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Bne_Un = new OpCode (
+			0xff << 0 | 0x40 << 8 | (byte) Code.Bne_Un << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Bge_Un = new OpCode (
+			0xff << 0 | 0x41 << 8 | (byte) Code.Bge_Un << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Bgt_Un = new OpCode (
+			0xff << 0 | 0x42 << 8 | (byte) Code.Bgt_Un << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ble_Un = new OpCode (
+			0xff << 0 | 0x43 << 8 | (byte) Code.Ble_Un << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Blt_Un = new OpCode (
+			0xff << 0 | 0x44 << 8 | (byte) Code.Blt_Un << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Switch = new OpCode (
+			0xff << 0 | 0x45 << 8 | (byte) Code.Switch << 16 | (byte) FlowControl.Cond_Branch << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineSwitch << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ldind_I1 = new OpCode (
+			0xff << 0 | 0x46 << 8 | (byte) Code.Ldind_I1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldind_U1 = new OpCode (
+			0xff << 0 | 0x47 << 8 | (byte) Code.Ldind_U1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldind_I2 = new OpCode (
+			0xff << 0 | 0x48 << 8 | (byte) Code.Ldind_I2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldind_U2 = new OpCode (
+			0xff << 0 | 0x49 << 8 | (byte) Code.Ldind_U2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldind_I4 = new OpCode (
+			0xff << 0 | 0x4a << 8 | (byte) Code.Ldind_I4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldind_U4 = new OpCode (
+			0xff << 0 | 0x4b << 8 | (byte) Code.Ldind_U4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldind_I8 = new OpCode (
+			0xff << 0 | 0x4c << 8 | (byte) Code.Ldind_I8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Pushi8 << 24);
+
+		public static readonly OpCode Ldind_I = new OpCode (
+			0xff << 0 | 0x4d << 8 | (byte) Code.Ldind_I << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldind_R4 = new OpCode (
+			0xff << 0 | 0x4e << 8 | (byte) Code.Ldind_R4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Pushr4 << 24);
+
+		public static readonly OpCode Ldind_R8 = new OpCode (
+			0xff << 0 | 0x4f << 8 | (byte) Code.Ldind_R8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Pushr8 << 24);
+
+		public static readonly OpCode Ldind_Ref = new OpCode (
+			0xff << 0 | 0x50 << 8 | (byte) Code.Ldind_Ref << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Pushref << 24);
+
+		public static readonly OpCode Stind_Ref = new OpCode (
+			0xff << 0 | 0x51 << 8 | (byte) Code.Stind_Ref << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi_popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stind_I1 = new OpCode (
+			0xff << 0 | 0x52 << 8 | (byte) Code.Stind_I1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi_popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stind_I2 = new OpCode (
+			0xff << 0 | 0x53 << 8 | (byte) Code.Stind_I2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi_popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stind_I4 = new OpCode (
+			0xff << 0 | 0x54 << 8 | (byte) Code.Stind_I4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi_popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stind_I8 = new OpCode (
+			0xff << 0 | 0x55 << 8 | (byte) Code.Stind_I8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi_popi8 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stind_R4 = new OpCode (
+			0xff << 0 | 0x56 << 8 | (byte) Code.Stind_R4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi_popr4 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stind_R8 = new OpCode (
+			0xff << 0 | 0x57 << 8 | (byte) Code.Stind_R8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi_popr8 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Add = new OpCode (
+			0xff << 0 | 0x58 << 8 | (byte) Code.Add << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Sub = new OpCode (
+			0xff << 0 | 0x59 << 8 | (byte) Code.Sub << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Mul = new OpCode (
+			0xff << 0 | 0x5a << 8 | (byte) Code.Mul << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Div = new OpCode (
+			0xff << 0 | 0x5b << 8 | (byte) Code.Div << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Div_Un = new OpCode (
+			0xff << 0 | 0x5c << 8 | (byte) Code.Div_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Rem = new OpCode (
+			0xff << 0 | 0x5d << 8 | (byte) Code.Rem << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Rem_Un = new OpCode (
+			0xff << 0 | 0x5e << 8 | (byte) Code.Rem_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode And = new OpCode (
+			0xff << 0 | 0x5f << 8 | (byte) Code.And << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Or = new OpCode (
+			0xff << 0 | 0x60 << 8 | (byte) Code.Or << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Xor = new OpCode (
+			0xff << 0 | 0x61 << 8 | (byte) Code.Xor << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Shl = new OpCode (
+			0xff << 0 | 0x62 << 8 | (byte) Code.Shl << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Shr = new OpCode (
+			0xff << 0 | 0x63 << 8 | (byte) Code.Shr << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Shr_Un = new OpCode (
+			0xff << 0 | 0x64 << 8 | (byte) Code.Shr_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Neg = new OpCode (
+			0xff << 0 | 0x65 << 8 | (byte) Code.Neg << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Not = new OpCode (
+			0xff << 0 | 0x66 << 8 | (byte) Code.Not << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Conv_I1 = new OpCode (
+			0xff << 0 | 0x67 << 8 | (byte) Code.Conv_I1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_I2 = new OpCode (
+			0xff << 0 | 0x68 << 8 | (byte) Code.Conv_I2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_I4 = new OpCode (
+			0xff << 0 | 0x69 << 8 | (byte) Code.Conv_I4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_I8 = new OpCode (
+			0xff << 0 | 0x6a << 8 | (byte) Code.Conv_I8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi8 << 24);
+
+		public static readonly OpCode Conv_R4 = new OpCode (
+			0xff << 0 | 0x6b << 8 | (byte) Code.Conv_R4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushr4 << 24);
+
+		public static readonly OpCode Conv_R8 = new OpCode (
+			0xff << 0 | 0x6c << 8 | (byte) Code.Conv_R8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushr8 << 24);
+
+		public static readonly OpCode Conv_U4 = new OpCode (
+			0xff << 0 | 0x6d << 8 | (byte) Code.Conv_U4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_U8 = new OpCode (
+			0xff << 0 | 0x6e << 8 | (byte) Code.Conv_U8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi8 << 24);
+
+		public static readonly OpCode Callvirt = new OpCode (
+			0xff << 0 | 0x6f << 8 | (byte) Code.Callvirt << 16 | (byte) FlowControl.Call << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineMethod << 8 | (byte) StackBehaviour.Varpop << 16 | (byte) StackBehaviour.Varpush << 24);
+
+		public static readonly OpCode Cpobj = new OpCode (
+			0xff << 0 | 0x70 << 8 | (byte) Code.Cpobj << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Popi_popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ldobj = new OpCode (
+			0xff << 0 | 0x71 << 8 | (byte) Code.Ldobj << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldstr = new OpCode (
+			0xff << 0 | 0x72 << 8 | (byte) Code.Ldstr << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineString << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushref << 24);
+
+		public static readonly OpCode Newobj = new OpCode (
+			0xff << 0 | 0x73 << 8 | (byte) Code.Newobj << 16 | (byte) FlowControl.Call << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineMethod << 8 | (byte) StackBehaviour.Varpop << 16 | (byte) StackBehaviour.Pushref << 24);
+
+		public static readonly OpCode Castclass = new OpCode (
+			0xff << 0 | 0x74 << 8 | (byte) Code.Castclass << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Popref << 16 | (byte) StackBehaviour.Pushref << 24);
+
+		public static readonly OpCode Isinst = new OpCode (
+			0xff << 0 | 0x75 << 8 | (byte) Code.Isinst << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Popref << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_R_Un = new OpCode (
+			0xff << 0 | 0x76 << 8 | (byte) Code.Conv_R_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushr8 << 24);
+
+		public static readonly OpCode Unbox = new OpCode (
+			0xff << 0 | 0x79 << 8 | (byte) Code.Unbox << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Popref << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Throw = new OpCode (
+			0xff << 0 | 0x7a << 8 | (byte) Code.Throw << 16 | (byte) FlowControl.Throw << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ldfld = new OpCode (
+			0xff << 0 | 0x7b << 8 | (byte) Code.Ldfld << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineField << 8 | (byte) StackBehaviour.Popref << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldflda = new OpCode (
+			0xff << 0 | 0x7c << 8 | (byte) Code.Ldflda << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineField << 8 | (byte) StackBehaviour.Popref << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Stfld = new OpCode (
+			0xff << 0 | 0x7d << 8 | (byte) Code.Stfld << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineField << 8 | (byte) StackBehaviour.Popref_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ldsfld = new OpCode (
+			0xff << 0 | 0x7e << 8 | (byte) Code.Ldsfld << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineField << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldsflda = new OpCode (
+			0xff << 0 | 0x7f << 8 | (byte) Code.Ldsflda << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineField << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Stsfld = new OpCode (
+			0xff << 0 | 0x80 << 8 | (byte) Code.Stsfld << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineField << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stobj = new OpCode (
+			0xff << 0 | 0x81 << 8 | (byte) Code.Stobj << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Popi_pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Conv_Ovf_I1_Un = new OpCode (
+			0xff << 0 | 0x82 << 8 | (byte) Code.Conv_Ovf_I1_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_I2_Un = new OpCode (
+			0xff << 0 | 0x83 << 8 | (byte) Code.Conv_Ovf_I2_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_I4_Un = new OpCode (
+			0xff << 0 | 0x84 << 8 | (byte) Code.Conv_Ovf_I4_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_I8_Un = new OpCode (
+			0xff << 0 | 0x85 << 8 | (byte) Code.Conv_Ovf_I8_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi8 << 24);
+
+		public static readonly OpCode Conv_Ovf_U1_Un = new OpCode (
+			0xff << 0 | 0x86 << 8 | (byte) Code.Conv_Ovf_U1_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_U2_Un = new OpCode (
+			0xff << 0 | 0x87 << 8 | (byte) Code.Conv_Ovf_U2_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_U4_Un = new OpCode (
+			0xff << 0 | 0x88 << 8 | (byte) Code.Conv_Ovf_U4_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_U8_Un = new OpCode (
+			0xff << 0 | 0x89 << 8 | (byte) Code.Conv_Ovf_U8_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi8 << 24);
+
+		public static readonly OpCode Conv_Ovf_I_Un = new OpCode (
+			0xff << 0 | 0x8a << 8 | (byte) Code.Conv_Ovf_I_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_U_Un = new OpCode (
+			0xff << 0 | 0x8b << 8 | (byte) Code.Conv_Ovf_U_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Box = new OpCode (
+			0xff << 0 | 0x8c << 8 | (byte) Code.Box << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushref << 24);
+
+		public static readonly OpCode Newarr = new OpCode (
+			0xff << 0 | 0x8d << 8 | (byte) Code.Newarr << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Pushref << 24);
+
+		public static readonly OpCode Ldlen = new OpCode (
+			0xff << 0 | 0x8e << 8 | (byte) Code.Ldlen << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldelema = new OpCode (
+			0xff << 0 | 0x8f << 8 | (byte) Code.Ldelema << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Popref_popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldelem_I1 = new OpCode (
+			0xff << 0 | 0x90 << 8 | (byte) Code.Ldelem_I1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldelem_U1 = new OpCode (
+			0xff << 0 | 0x91 << 8 | (byte) Code.Ldelem_U1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldelem_I2 = new OpCode (
+			0xff << 0 | 0x92 << 8 | (byte) Code.Ldelem_I2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldelem_U2 = new OpCode (
+			0xff << 0 | 0x93 << 8 | (byte) Code.Ldelem_U2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldelem_I4 = new OpCode (
+			0xff << 0 | 0x94 << 8 | (byte) Code.Ldelem_I4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldelem_U4 = new OpCode (
+			0xff << 0 | 0x95 << 8 | (byte) Code.Ldelem_U4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldelem_I8 = new OpCode (
+			0xff << 0 | 0x96 << 8 | (byte) Code.Ldelem_I8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi << 16 | (byte) StackBehaviour.Pushi8 << 24);
+
+		public static readonly OpCode Ldelem_I = new OpCode (
+			0xff << 0 | 0x97 << 8 | (byte) Code.Ldelem_I << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldelem_R4 = new OpCode (
+			0xff << 0 | 0x98 << 8 | (byte) Code.Ldelem_R4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi << 16 | (byte) StackBehaviour.Pushr4 << 24);
+
+		public static readonly OpCode Ldelem_R8 = new OpCode (
+			0xff << 0 | 0x99 << 8 | (byte) Code.Ldelem_R8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi << 16 | (byte) StackBehaviour.Pushr8 << 24);
+
+		public static readonly OpCode Ldelem_Ref = new OpCode (
+			0xff << 0 | 0x9a << 8 | (byte) Code.Ldelem_Ref << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi << 16 | (byte) StackBehaviour.Pushref << 24);
+
+		public static readonly OpCode Stelem_I = new OpCode (
+			0xff << 0 | 0x9b << 8 | (byte) Code.Stelem_I << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi_popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stelem_I1 = new OpCode (
+			0xff << 0 | 0x9c << 8 | (byte) Code.Stelem_I1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi_popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stelem_I2 = new OpCode (
+			0xff << 0 | 0x9d << 8 | (byte) Code.Stelem_I2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi_popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stelem_I4 = new OpCode (
+			0xff << 0 | 0x9e << 8 | (byte) Code.Stelem_I4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi_popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stelem_I8 = new OpCode (
+			0xff << 0 | 0x9f << 8 | (byte) Code.Stelem_I8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi_popi8 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stelem_R4 = new OpCode (
+			0xff << 0 | 0xa0 << 8 | (byte) Code.Stelem_R4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi_popr4 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stelem_R8 = new OpCode (
+			0xff << 0 | 0xa1 << 8 | (byte) Code.Stelem_R8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi_popr8 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stelem_Ref = new OpCode (
+			0xff << 0 | 0xa2 << 8 | (byte) Code.Stelem_Ref << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popref_popi_popref << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ldelem_Any = new OpCode (
+			0xff << 0 | 0xa3 << 8 | (byte) Code.Ldelem_Any << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Popref_popi << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Stelem_Any = new OpCode (
+			0xff << 0 | 0xa4 << 8 | (byte) Code.Stelem_Any << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Popref_popi_popref << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Unbox_Any = new OpCode (
+			0xff << 0 | 0xa5 << 8 | (byte) Code.Unbox_Any << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Popref << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Conv_Ovf_I1 = new OpCode (
+			0xff << 0 | 0xb3 << 8 | (byte) Code.Conv_Ovf_I1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_U1 = new OpCode (
+			0xff << 0 | 0xb4 << 8 | (byte) Code.Conv_Ovf_U1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_I2 = new OpCode (
+			0xff << 0 | 0xb5 << 8 | (byte) Code.Conv_Ovf_I2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_U2 = new OpCode (
+			0xff << 0 | 0xb6 << 8 | (byte) Code.Conv_Ovf_U2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_I4 = new OpCode (
+			0xff << 0 | 0xb7 << 8 | (byte) Code.Conv_Ovf_I4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_U4 = new OpCode (
+			0xff << 0 | 0xb8 << 8 | (byte) Code.Conv_Ovf_U4 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_I8 = new OpCode (
+			0xff << 0 | 0xb9 << 8 | (byte) Code.Conv_Ovf_I8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi8 << 24);
+
+		public static readonly OpCode Conv_Ovf_U8 = new OpCode (
+			0xff << 0 | 0xba << 8 | (byte) Code.Conv_Ovf_U8 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi8 << 24);
+
+		public static readonly OpCode Refanyval = new OpCode (
+			0xff << 0 | 0xc2 << 8 | (byte) Code.Refanyval << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ckfinite = new OpCode (
+			0xff << 0 | 0xc3 << 8 | (byte) Code.Ckfinite << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushr8 << 24);
+
+		public static readonly OpCode Mkrefany = new OpCode (
+			0xff << 0 | 0xc6 << 8 | (byte) Code.Mkrefany << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldtoken = new OpCode (
+			0xff << 0 | 0xd0 << 8 | (byte) Code.Ldtoken << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineTok << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_U2 = new OpCode (
+			0xff << 0 | 0xd1 << 8 | (byte) Code.Conv_U2 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_U1 = new OpCode (
+			0xff << 0 | 0xd2 << 8 | (byte) Code.Conv_U1 << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_I = new OpCode (
+			0xff << 0 | 0xd3 << 8 | (byte) Code.Conv_I << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_I = new OpCode (
+			0xff << 0 | 0xd4 << 8 | (byte) Code.Conv_Ovf_I << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Conv_Ovf_U = new OpCode (
+			0xff << 0 | 0xd5 << 8 | (byte) Code.Conv_Ovf_U << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Add_Ovf = new OpCode (
+			0xff << 0 | 0xd6 << 8 | (byte) Code.Add_Ovf << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Add_Ovf_Un = new OpCode (
+			0xff << 0 | 0xd7 << 8 | (byte) Code.Add_Ovf_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Mul_Ovf = new OpCode (
+			0xff << 0 | 0xd8 << 8 | (byte) Code.Mul_Ovf << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Mul_Ovf_Un = new OpCode (
+			0xff << 0 | 0xd9 << 8 | (byte) Code.Mul_Ovf_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Sub_Ovf = new OpCode (
+			0xff << 0 | 0xda << 8 | (byte) Code.Sub_Ovf << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Sub_Ovf_Un = new OpCode (
+			0xff << 0 | 0xdb << 8 | (byte) Code.Sub_Ovf_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Endfinally = new OpCode (
+			0xff << 0 | 0xdc << 8 | (byte) Code.Endfinally << 16 | (byte) FlowControl.Return << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Leave = new OpCode (
+			0xff << 0 | 0xdd << 8 | (byte) Code.Leave << 16 | (byte) FlowControl.Branch << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineBrTarget << 8 | (byte) StackBehaviour.PopAll << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Leave_S = new OpCode (
+			0xff << 0 | 0xde << 8 | (byte) Code.Leave_S << 16 | (byte) FlowControl.Branch << 24,
+			(byte) OpCodeType.Macro << 0 | (byte) OperandType.ShortInlineBrTarget << 8 | (byte) StackBehaviour.PopAll << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Stind_I = new OpCode (
+			0xff << 0 | 0xdf << 8 | (byte) Code.Stind_I << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi_popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Conv_U = new OpCode (
+			0xff << 0 | 0xe0 << 8 | (byte) Code.Conv_U << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Arglist = new OpCode (
+			0xfe << 0 | 0x00 << 8 | (byte) Code.Arglist << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ceq = new OpCode (
+			0xfe << 0 | 0x01 << 8 | (byte) Code.Ceq << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Cgt = new OpCode (
+			0xfe << 0 | 0x02 << 8 | (byte) Code.Cgt << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Cgt_Un = new OpCode (
+			0xfe << 0 | 0x03 << 8 | (byte) Code.Cgt_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Clt = new OpCode (
+			0xfe << 0 | 0x04 << 8 | (byte) Code.Clt << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Clt_Un = new OpCode (
+			0xfe << 0 | 0x05 << 8 | (byte) Code.Clt_Un << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1_pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldftn = new OpCode (
+			0xfe << 0 | 0x06 << 8 | (byte) Code.Ldftn << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineMethod << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldvirtftn = new OpCode (
+			0xfe << 0 | 0x07 << 8 | (byte) Code.Ldvirtftn << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineMethod << 8 | (byte) StackBehaviour.Popref << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Ldarg = new OpCode (
+			0xfe << 0 | 0x09 << 8 | (byte) Code.Ldarg << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineArg << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldarga = new OpCode (
+			0xfe << 0 | 0x0a << 8 | (byte) Code.Ldarga << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineArg << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Starg = new OpCode (
+			0xfe << 0 | 0x0b << 8 | (byte) Code.Starg << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineArg << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Ldloc = new OpCode (
+			0xfe << 0 | 0x0c << 8 | (byte) Code.Ldloc << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineVar << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push1 << 24);
+
+		public static readonly OpCode Ldloca = new OpCode (
+			0xfe << 0 | 0x0d << 8 | (byte) Code.Ldloca << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineVar << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Stloc = new OpCode (
+			0xfe << 0 | 0x0e << 8 | (byte) Code.Stloc << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineVar << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Localloc = new OpCode (
+			0xfe << 0 | 0x0f << 8 | (byte) Code.Localloc << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Endfilter = new OpCode (
+			0xfe << 0 | 0x11 << 8 | (byte) Code.Endfilter << 16 | (byte) FlowControl.Return << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Unaligned = new OpCode (
+			0xfe << 0 | 0x12 << 8 | (byte) Code.Unaligned << 16 | (byte) FlowControl.Meta << 24,
+			(byte) OpCodeType.Prefix << 0 | (byte) OperandType.ShortInlineI << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Volatile = new OpCode (
+			0xfe << 0 | 0x13 << 8 | (byte) Code.Volatile << 16 | (byte) FlowControl.Meta << 24,
+			(byte) OpCodeType.Prefix << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Tail = new OpCode (
+			0xfe << 0 | 0x14 << 8 | (byte) Code.Tail << 16 | (byte) FlowControl.Meta << 24,
+			(byte) OpCodeType.Prefix << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Initobj = new OpCode (
+			0xfe << 0 | 0x15 << 8 | (byte) Code.Initobj << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Constrained = new OpCode (
+			0xfe << 0 | 0x16 << 8 | (byte) Code.Constrained << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Prefix << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Cpblk = new OpCode (
+			0xfe << 0 | 0x17 << 8 | (byte) Code.Cpblk << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi_popi_popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Initblk = new OpCode (
+			0xfe << 0 | 0x18 << 8 | (byte) Code.Initblk << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Popi_popi_popi << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode No = new OpCode (
+			0xfe << 0 | 0x19 << 8 | (byte) Code.No << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Prefix << 0 | (byte) OperandType.ShortInlineI << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Rethrow = new OpCode (
+			0xfe << 0 | 0x1a << 8 | (byte) Code.Rethrow << 16 | (byte) FlowControl.Throw << 24,
+			(byte) OpCodeType.Objmodel << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push0 << 24);
+
+		public static readonly OpCode Sizeof = new OpCode (
+			0xfe << 0 | 0x1c << 8 | (byte) Code.Sizeof << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineType << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Refanytype = new OpCode (
+			0xfe << 0 | 0x1d << 8 | (byte) Code.Refanytype << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Primitive << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop1 << 16 | (byte) StackBehaviour.Pushi << 24);
+
+		public static readonly OpCode Readonly = new OpCode (
+			0xfe << 0 | 0x1e << 8 | (byte) Code.Readonly << 16 | (byte) FlowControl.Next << 24,
+			(byte) OpCodeType.Prefix << 0 | (byte) OperandType.InlineNone << 8 | (byte) StackBehaviour.Pop0 << 16 | (byte) StackBehaviour.Push0 << 24);
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Cil/SequencePoint.cs b/src/Core/Compiler/Importer/IL/Cil/SequencePoint.cs
new file mode 100644
index 000000000..6ecb9169f
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/SequencePoint.cs
@@ -0,0 +1,70 @@
+//
+// SequencePoint.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+    internal /* public */ sealed class SequencePoint {
+
+		Document document;
+
+		int start_line;
+		int start_column;
+		int end_line;
+		int end_column;
+
+		public int StartLine {
+			get { return start_line; }
+			set { start_line = value; }
+		}
+
+		public int StartColumn {
+			get { return start_column; }
+			set { start_column = value; }
+		}
+
+		public int EndLine {
+			get { return end_line; }
+			set { end_line = value; }
+		}
+
+		public int EndColumn {
+			get { return end_column; }
+			set { end_column = value; }
+		}
+
+		public Document Document {
+			get { return document; }
+			set { document = value; }
+		}
+
+		public SequencePoint (Document document)
+		{
+			this.document = document;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Cil/Symbols.cs b/src/Core/Compiler/Importer/IL/Cil/Symbols.cs
new file mode 100644
index 000000000..317b80c22
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/Symbols.cs
@@ -0,0 +1,277 @@
+//
+// Symbols.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using SR = System.Reflection;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+	[StructLayout (LayoutKind.Sequential)]
+    internal /* public */ struct ImageDebugDirectory {
+		public int Characteristics;
+		public int TimeDateStamp;
+		public short MajorVersion;
+		public short MinorVersion;
+		public int Type;
+		public int SizeOfData;
+		public int AddressOfRawData;
+		public int PointerToRawData;
+	}
+
+    internal /* public */ sealed class Scope : IVariableDefinitionProvider {
+
+		Instruction start;
+		Instruction end;
+
+		Collection<Scope> scopes;
+		Collection<VariableDefinition> variables;
+
+		public Instruction Start {
+			get { return start; }
+			set { start = value; }
+		}
+
+		public Instruction End {
+			get { return end; }
+			set { end = value; }
+		}
+
+		public bool HasScopes {
+			get { return !scopes.IsNullOrEmpty (); }
+		}
+
+		public Collection<Scope> Scopes {
+			get {
+				if (scopes == null)
+					scopes = new Collection<Scope> ();
+
+				return scopes;
+			}
+		}
+
+		public bool HasVariables {
+			get { return !variables.IsNullOrEmpty (); }
+		}
+
+		public Collection<VariableDefinition> Variables {
+			get {
+				if (variables == null)
+					variables = new Collection<VariableDefinition> ();
+
+				return variables;
+			}
+		}
+	}
+
+    internal /* public */ struct InstructionSymbol {
+
+		public readonly int Offset;
+		public readonly SequencePoint SequencePoint;
+
+		public InstructionSymbol (int offset, SequencePoint sequencePoint)
+		{
+			this.Offset = offset;
+			this.SequencePoint = sequencePoint;
+		}
+	}
+
+    internal /* public */ sealed class MethodSymbols {
+
+#if !IL_READ_ONLY
+		internal int code_size;
+		internal MetadataToken method_token;
+		internal MetadataToken local_var_token;
+#endif
+        internal string method_name;
+		internal Collection<VariableDefinition> variables;
+		internal Collection<InstructionSymbol> instructions;
+
+		public bool HasVariables {
+			get { return !variables.IsNullOrEmpty (); }
+		}
+
+		public Collection<VariableDefinition> Variables {
+			get {
+				if (variables == null)
+					variables = new Collection<VariableDefinition> ();
+
+				return variables;
+			}
+		}
+
+		public Collection<InstructionSymbol> Instructions {
+			get {
+				if (instructions == null)
+					instructions = new Collection<InstructionSymbol> ();
+
+				return instructions;
+			}
+		}
+
+#if !IL_READ_ONLY
+		public int CodeSize {
+			get { return code_size; }
+		}
+#endif
+
+		public string MethodName {
+			get { return method_name; }
+		}
+
+#if !IL_READ_ONLY
+		public MetadataToken MethodToken {
+			get { return method_token; }
+		}
+
+        public MetadataToken LocalVarToken {
+			get { return local_var_token; }
+		}
+#endif
+
+        public MethodSymbols (string methodName)
+		{
+			this.method_name = methodName;
+		}
+	}
+
+    internal /* public */ delegate Instruction InstructionMapper(int offset);
+
+    internal /* public */ interface ISymbolReader : IDisposable {
+
+		bool ProcessDebugHeader (ImageDebugDirectory directory, byte [] header);
+		void Read (MethodBody body, InstructionMapper mapper);
+		void Read (MethodSymbols symbols);
+	}
+
+    internal /* public */ interface ISymbolReaderProvider {
+
+		ISymbolReader GetSymbolReader (ModuleDefinition module, string fileName);
+		ISymbolReader GetSymbolReader (ModuleDefinition module, Stream symbolStream);
+	}
+
+	static class SymbolProvider {
+
+		static readonly string symbol_kind = Type.GetType ("Mono.Runtime") != null ? "Mdb" : "Pdb";
+
+		static SR.AssemblyName GetPlatformSymbolAssemblyName ()
+		{
+			var cecil_name = typeof (SymbolProvider).Assembly.GetName ();
+
+			var name = new SR.AssemblyName {
+				Name = "Mono.Cecil." + symbol_kind,
+				Version = cecil_name.Version,
+			};
+
+			name.SetPublicKeyToken (cecil_name.GetPublicKeyToken ());
+
+			return name;
+		}
+
+		static Type GetPlatformType (string fullname)
+		{
+			var type = Type.GetType (fullname);
+			if (type != null)
+				return type;
+
+			var assembly_name = GetPlatformSymbolAssemblyName ();
+
+			type = Type.GetType (fullname + ", " + assembly_name.FullName);
+			if (type != null)
+				return type;
+
+			try {
+				var assembly = SR.Assembly.Load (assembly_name);
+				if (assembly != null)
+					return assembly.GetType (fullname);
+			} catch (FileNotFoundException) {
+#if !CF
+			} catch (FileLoadException) {
+#endif
+			}
+
+			return null;
+		}
+
+		static ISymbolReaderProvider reader_provider;
+
+		public static ISymbolReaderProvider GetPlatformReaderProvider ()
+		{
+			if (reader_provider != null)
+				return reader_provider;
+
+			var type = GetPlatformType (GetProviderTypeName ("ReaderProvider"));
+			if (type == null)
+				return null;
+
+			return reader_provider = (ISymbolReaderProvider) Activator.CreateInstance (type);
+		}
+
+		static string GetProviderTypeName (string name)
+		{
+			return "Mono.Cecil." + symbol_kind + "." + symbol_kind + name;
+		}
+
+#if !IL_READ_ONLY
+
+        static ISymbolWriterProvider writer_provider;
+
+		public static ISymbolWriterProvider GetPlatformWriterProvider ()
+		{
+			if (writer_provider != null)
+				return writer_provider;
+
+			var type = GetPlatformType (GetProviderTypeName ("WriterProvider"));
+			if (type == null)
+				return null;
+
+			return writer_provider = (ISymbolWriterProvider) Activator.CreateInstance (type);
+		}
+
+#endif
+	}
+
+#if !IL_READ_ONLY
+
+    internal /* public */ interface ISymbolWriter : IDisposable {
+
+		bool GetDebugHeader (out ImageDebugDirectory directory, out byte [] header);
+		void Write (MethodBody body);
+		void Write (MethodSymbols symbols);
+	}
+
+    internal /* public */ interface ISymbolWriterProvider {
+
+		ISymbolWriter GetSymbolWriter (ModuleDefinition module, string fileName);
+		ISymbolWriter GetSymbolWriter (ModuleDefinition module, Stream symbolStream);
+	}
+
+#endif
+}
diff --git a/src/Core/Compiler/Importer/IL/Cil/VariableDefinition.cs b/src/Core/Compiler/Importer/IL/Cil/VariableDefinition.cs
new file mode 100644
index 000000000..bddfa5d85
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/VariableDefinition.cs
@@ -0,0 +1,52 @@
+//
+// VariableDefinition.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+    internal /* public */ sealed class VariableDefinition : VariableReference {
+
+		public bool IsPinned {
+			get { return variable_type.IsPinned; }
+		}
+
+		public VariableDefinition (TypeReference variableType)
+			: base (variableType)
+		{
+		}
+
+		public VariableDefinition (string name, TypeReference variableType)
+			: base (name, variableType)
+		{
+		}
+
+		public override VariableDefinition Resolve ()
+		{
+			return this;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Cil/VariableReference.cs b/src/Core/Compiler/Importer/IL/Cil/VariableReference.cs
new file mode 100644
index 000000000..07fb659c9
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Cil/VariableReference.cs
@@ -0,0 +1,75 @@
+//
+// VariableReference.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL.Cil {
+
+    internal /* public */ abstract class VariableReference {
+
+		string name;
+		internal int index = -1;
+		protected TypeReference variable_type;
+
+		public string Name {
+			get { return name; }
+			set { name = value; }
+		}
+
+		public TypeReference VariableType {
+			get { return variable_type; }
+			set { variable_type = value; }
+		}
+
+		public int Index {
+			get { return index; }
+		}
+
+		internal VariableReference (TypeReference variable_type)
+			: this (string.Empty, variable_type)
+		{
+		}
+
+		internal VariableReference (string name, TypeReference variable_type)
+		{
+			this.name = name;
+			this.variable_type = variable_type;
+		}
+
+		public abstract VariableDefinition Resolve ();
+
+		public override string ToString ()
+		{
+			if (!string.IsNullOrEmpty (name))
+				return name;
+
+			if (index >= 0)
+				return "V_" + index;
+
+			return string.Empty;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/CustomAttribute.cs b/src/Core/Compiler/Importer/IL/CustomAttribute.cs
new file mode 100644
index 000000000..47bd81b52
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/CustomAttribute.cs
@@ -0,0 +1,232 @@
+//
+// CustomAttribute.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ struct CustomAttributeArgument {
+
+		readonly TypeReference type;
+		readonly object value;
+
+		public TypeReference Type {
+			get { return type; }
+		}
+
+		public object Value {
+			get { return value; }
+		}
+
+		public CustomAttributeArgument (TypeReference type, object value)
+		{
+			Mixin.CheckType (type);
+			this.type = type;
+			this.value = value;
+		}
+	}
+
+    internal /* public */ struct CustomAttributeNamedArgument {
+
+		readonly string name;
+		readonly CustomAttributeArgument argument;
+
+		public string Name {
+			get { return name; }
+		}
+
+		public CustomAttributeArgument Argument {
+			get { return argument; }
+		}
+
+		public CustomAttributeNamedArgument (string name, CustomAttributeArgument argument)
+		{
+			Mixin.CheckName (name);
+			this.name = name;
+			this.argument = argument;
+		}
+	}
+
+    internal /* public */ interface ICustomAttribute {
+
+		TypeReference AttributeType { get; }
+
+		bool HasFields { get; }
+		bool HasProperties { get; }
+		Collection<CustomAttributeNamedArgument> Fields { get; }
+		Collection<CustomAttributeNamedArgument> Properties { get; }
+	}
+
+    internal /* public */ sealed class CustomAttribute : ICustomAttribute {
+
+		readonly internal uint signature;
+		internal bool resolved;
+		MethodReference constructor;
+		byte [] blob;
+		internal Collection<CustomAttributeArgument> arguments;
+		internal Collection<CustomAttributeNamedArgument> fields;
+		internal Collection<CustomAttributeNamedArgument> properties;
+
+		public MethodReference Constructor {
+			get { return constructor; }
+			set { constructor = value; }
+		}
+
+		public TypeReference AttributeType {
+			get { return constructor.DeclaringType; }
+		}
+
+		public bool IsResolved {
+			get { return resolved; }
+		}
+
+		public bool HasConstructorArguments {
+			get {
+				Resolve ();
+
+				return !arguments.IsNullOrEmpty ();
+			}
+		}
+
+		public Collection<CustomAttributeArgument> ConstructorArguments {
+			get {
+				Resolve ();
+
+				return arguments ?? (arguments = new Collection<CustomAttributeArgument> ());
+			}
+		}
+
+		public bool HasFields {
+			get {
+				Resolve ();
+
+				return !fields.IsNullOrEmpty ();
+			}
+		}
+
+		public Collection<CustomAttributeNamedArgument> Fields {
+			get {
+				Resolve ();
+
+				return fields ?? (fields = new Collection<CustomAttributeNamedArgument> ());
+			}
+		}
+
+		public bool HasProperties {
+			get {
+				Resolve ();
+
+				return !properties.IsNullOrEmpty ();
+			}
+		}
+
+		public Collection<CustomAttributeNamedArgument> Properties {
+			get {
+				Resolve ();
+
+				return properties ?? (properties = new Collection<CustomAttributeNamedArgument> ());
+			}
+		}
+
+		internal bool HasImage {
+			get { return constructor != null && constructor.HasImage; }
+		}
+
+		internal ModuleDefinition Module {
+			get { return constructor.Module; }
+		}
+
+		internal CustomAttribute (uint signature, MethodReference constructor)
+		{
+			this.signature = signature;
+			this.constructor = constructor;
+			this.resolved = false;
+		}
+
+		public CustomAttribute (MethodReference constructor)
+		{
+			this.constructor = constructor;
+			this.resolved = true;
+		}
+
+		public CustomAttribute (MethodReference constructor, byte [] blob)
+		{
+			this.constructor = constructor;
+			this.resolved = false;
+			this.blob = blob;
+		}
+
+		public byte [] GetBlob ()
+		{
+			if (blob != null)
+				return blob;
+
+			if (!HasImage || signature == 0)
+				throw new NotSupportedException ();
+
+			return blob = Module.Read (this, (attribute, reader) => reader.ReadCustomAttributeBlob (attribute.signature));
+		}
+
+		void Resolve ()
+		{
+			if (resolved || !HasImage)
+				return;
+
+			try {
+				Module.Read (this, (attribute, reader) => {
+					reader.ReadCustomAttributeSignature (attribute);
+					return this;
+				});
+
+				resolved = true;
+			} catch (ResolutionException) {
+				if (arguments != null)
+					arguments.Clear ();
+				if (fields != null)
+					fields.Clear ();
+				if (properties != null)
+					properties.Clear ();
+
+				resolved = false;
+			}
+		}
+	}
+
+	static partial class Mixin {
+
+		public static void CheckName (string name)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (name.Length == 0)
+				throw new ArgumentException ("Empty name");
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/DefaultAssemblyResolver.cs b/src/Core/Compiler/Importer/IL/DefaultAssemblyResolver.cs
new file mode 100644
index 000000000..923648fe7
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/DefaultAssemblyResolver.cs
@@ -0,0 +1,75 @@
+//
+// DefaultAssemblyResolver.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ static class GlobalAssemblyResolver {
+
+		public static readonly IAssemblyResolver Instance = new DefaultAssemblyResolver ();
+	}
+
+    internal /* public */ class DefaultAssemblyResolver : BaseAssemblyResolver {
+
+		readonly IDictionary<string, AssemblyDefinition> cache;
+
+		public DefaultAssemblyResolver ()
+		{
+			cache = new Dictionary<string, AssemblyDefinition> ();
+		}
+
+		public override AssemblyDefinition Resolve (AssemblyNameReference name)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+
+			AssemblyDefinition assembly;
+			if (cache.TryGetValue (name.FullName, out assembly))
+				return assembly;
+
+			assembly = base.Resolve (name);
+			cache [name.FullName] = assembly;
+
+			return assembly;
+		}
+
+		protected void RegisterAssembly (AssemblyDefinition assembly)
+		{
+			if (assembly == null)
+				throw new ArgumentNullException ("assembly");
+
+			var name = assembly.Name.FullName;
+			if (cache.ContainsKey (name))
+				return;
+
+			cache [name] = assembly;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/EmbeddedResource.cs b/src/Core/Compiler/Importer/IL/EmbeddedResource.cs
new file mode 100644
index 000000000..ff27e5ef3
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/EmbeddedResource.cs
@@ -0,0 +1,105 @@
+//
+// EmbeddedResource.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class EmbeddedResource : Resource {
+
+		readonly MetadataReader reader;
+
+		uint? offset;
+		byte [] data;
+		Stream stream;
+
+		public override ResourceType ResourceType {
+			get { return ResourceType.Embedded; }
+		}
+
+		public EmbeddedResource (string name, ManifestResourceAttributes attributes, byte [] data) :
+			base (name, attributes)
+		{
+			this.data = data;
+		}
+
+		public EmbeddedResource (string name, ManifestResourceAttributes attributes, Stream stream) :
+			base (name, attributes)
+		{
+			this.stream = stream;
+		}
+
+		internal EmbeddedResource (string name, ManifestResourceAttributes attributes, uint offset, MetadataReader reader)
+			: base (name, attributes)
+		{
+			this.offset = offset;
+			this.reader = reader;
+		}
+
+		public Stream GetResourceStream ()
+		{
+			if (stream != null)
+				return stream;
+
+			if (data != null)
+				return new MemoryStream (data);
+
+			if (offset.HasValue)
+				return reader.GetManagedResourceStream (offset.Value);
+
+			throw new InvalidOperationException ();
+		}
+
+		public byte [] GetResourceData ()
+		{
+			if (stream != null)
+				return ReadStream (stream);
+
+			if (data != null)
+				return data;
+
+			if (offset.HasValue)
+				return reader.GetManagedResourceStream (offset.Value).ToArray ();
+
+			throw new InvalidOperationException ();
+		}
+
+		static byte [] ReadStream (Stream stream)
+		{
+			var length = (int) stream.Length;
+			var data = new byte [length];
+			int offset = 0, read;
+
+			while ((read = stream.Read (data, offset, length - offset)) > 0)
+				offset += read;
+
+			return data;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/EventAttributes.cs b/src/Core/Compiler/Importer/IL/EventAttributes.cs
new file mode 100644
index 000000000..309a1f299
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/EventAttributes.cs
@@ -0,0 +1,39 @@
+//
+// EventAttributes.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+	[Flags]
+    internal /* public */ enum EventAttributes : ushort {
+		None			= 0x0000,
+		SpecialName		= 0x0200,	// Event is special
+		RTSpecialName	= 0x0400	 // CLI provides 'special' behavior, depending upon the name of the event
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/EventDefinition.cs b/src/Core/Compiler/Importer/IL/EventDefinition.cs
new file mode 100644
index 000000000..687d2ff43
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/EventDefinition.cs
@@ -0,0 +1,168 @@
+//
+// EventDefinition.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class EventDefinition : EventReference, IMemberDefinition {
+
+		ushort attributes;
+
+		Collection<CustomAttribute> custom_attributes;
+
+		internal MethodDefinition add_method;
+		internal MethodDefinition invoke_method;
+		internal MethodDefinition remove_method;
+		internal Collection<MethodDefinition> other_methods;
+
+		public EventAttributes Attributes {
+			get { return (EventAttributes) attributes; }
+			set { attributes = (ushort) value; }
+		}
+
+		public MethodDefinition AddMethod {
+			get {
+				if (add_method != null)
+					return add_method;
+
+				InitializeMethods ();
+				return add_method;
+			}
+			set { add_method = value; }
+		}
+
+		public MethodDefinition InvokeMethod {
+			get {
+				if (invoke_method != null)
+					return invoke_method;
+
+				InitializeMethods ();
+				return invoke_method;
+			}
+			set { invoke_method = value; }
+		}
+
+		public MethodDefinition RemoveMethod {
+			get {
+				if (remove_method != null)
+					return remove_method;
+
+				InitializeMethods ();
+				return remove_method;
+			}
+			set { remove_method = value; }
+		}
+
+		public bool HasOtherMethods {
+			get {
+				if (other_methods != null)
+					return other_methods.Count > 0;
+
+				InitializeMethods ();
+				return !other_methods.IsNullOrEmpty ();
+			}
+		}
+
+		public Collection<MethodDefinition> OtherMethods {
+			get {
+				if (other_methods != null)
+					return other_methods;
+
+				InitializeMethods ();
+
+				if (other_methods != null)
+					return other_methods;
+
+				return other_methods = new Collection<MethodDefinition> ();
+			}
+		}
+
+		public bool HasCustomAttributes {
+			get {
+				if (custom_attributes != null)
+					return custom_attributes.Count > 0;
+
+				return this.GetHasCustomAttributes (Module);
+			}
+		}
+
+		public Collection<CustomAttribute> CustomAttributes {
+			get { return custom_attributes ?? (custom_attributes = this.GetCustomAttributes (Module)); }
+		}
+
+		#region EventAttributes
+
+		public bool IsSpecialName {
+			get { return attributes.GetAttributes ((ushort) EventAttributes.SpecialName); }
+			set { attributes = attributes.SetAttributes ((ushort) EventAttributes.SpecialName, value); }
+		}
+
+		public bool IsRuntimeSpecialName {
+			get { return attributes.GetAttributes ((ushort) FieldAttributes.RTSpecialName); }
+			set { attributes = attributes.SetAttributes ((ushort) FieldAttributes.RTSpecialName, value); }
+		}
+
+		#endregion
+
+		public new TypeDefinition DeclaringType {
+			get { return (TypeDefinition) base.DeclaringType; }
+			set { base.DeclaringType = value; }
+		}
+
+		public override bool IsDefinition {
+			get { return true; }
+		}
+
+		public EventDefinition (string name, EventAttributes attributes, TypeReference eventType)
+			: base (name, eventType)
+		{
+			this.attributes = (ushort) attributes;
+			this.token = new MetadataToken (TokenType.Event);
+		}
+
+		void InitializeMethods ()
+		{
+			if (add_method != null
+				|| invoke_method != null
+				|| remove_method != null)
+				return;
+
+			var module = this.Module;
+			if (!module.HasImage ())
+				return;
+
+			module.Read (this, (@event, reader) => reader.ReadMethods (@event));
+		}
+
+		public override EventDefinition Resolve ()
+		{
+			return this;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/EventReference.cs b/src/Core/Compiler/Importer/IL/EventReference.cs
new file mode 100644
index 000000000..fcf4d383b
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/EventReference.cs
@@ -0,0 +1,57 @@
+//
+// EventReference.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ abstract class EventReference : MemberReference {
+
+		TypeReference event_type;
+
+		public TypeReference EventType {
+			get { return event_type; }
+			set { event_type = value; }
+		}
+
+		public override string FullName {
+			get { return event_type.FullName + " " + MemberFullName (); }
+		}
+
+		protected EventReference (string name, TypeReference eventType)
+			: base (name)
+		{
+			if (eventType == null)
+				throw new ArgumentNullException ("eventType");
+
+			event_type = eventType;
+		}
+
+		public abstract EventDefinition Resolve ();
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/ExportedType.cs b/src/Core/Compiler/Importer/IL/ExportedType.cs
new file mode 100644
index 000000000..f939d3596
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/ExportedType.cs
@@ -0,0 +1,249 @@
+//
+// ExportedType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ class ExportedType : IMetadataTokenProvider {
+
+		string @namespace;
+		string name;
+		uint attributes;
+		IMetadataScope scope;
+		ModuleDefinition module;
+		int identifier;
+		ExportedType declaring_type;
+		internal MetadataToken token;
+
+		public string Namespace {
+			get { return @namespace; }
+			set { @namespace = value; }
+		}
+
+		public string Name {
+			get { return name; }
+			set { name = value; }
+		}
+
+		public TypeAttributes Attributes {
+			get { return (TypeAttributes) attributes; }
+			set { attributes = (uint) value; }
+		}
+
+		public IMetadataScope Scope {
+			get {
+				if (declaring_type != null)
+					return declaring_type.Scope;
+
+				return scope;
+			}
+		}
+
+		public ExportedType DeclaringType {
+			get { return declaring_type; }
+			set { declaring_type = value; }
+		}
+
+		public MetadataToken MetadataToken {
+			get { return token; }
+			set { token = value; }
+		}
+
+		public int Identifier {
+			get { return identifier; }
+			set { identifier = value; }
+		}
+
+		#region TypeAttributes
+
+		public bool IsNotPublic {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NotPublic); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NotPublic, value); }
+		}
+
+		public bool IsPublic {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.Public); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.Public, value); }
+		}
+
+		public bool IsNestedPublic {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedPublic); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedPublic, value); }
+		}
+
+		public bool IsNestedPrivate {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedPrivate); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedPrivate, value); }
+		}
+
+		public bool IsNestedFamily {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedFamily); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedFamily, value); }
+		}
+
+		public bool IsNestedAssembly {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedAssembly); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedAssembly, value); }
+		}
+
+		public bool IsNestedFamilyAndAssembly {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedFamANDAssem); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedFamANDAssem, value); }
+		}
+
+		public bool IsNestedFamilyOrAssembly {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedFamORAssem); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedFamORAssem, value); }
+		}
+
+		public bool IsAutoLayout {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.LayoutMask, (uint) TypeAttributes.AutoLayout); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.LayoutMask, (uint) TypeAttributes.AutoLayout, value); }
+		}
+
+		public bool IsSequentialLayout {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.LayoutMask, (uint) TypeAttributes.SequentialLayout); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.LayoutMask, (uint) TypeAttributes.SequentialLayout, value); }
+		}
+
+		public bool IsExplicitLayout {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.LayoutMask, (uint) TypeAttributes.ExplicitLayout); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.LayoutMask, (uint) TypeAttributes.ExplicitLayout, value); }
+		}
+
+		public bool IsClass {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.ClassSemanticMask, (uint) TypeAttributes.Class); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.ClassSemanticMask, (uint) TypeAttributes.Class, value); }
+		}
+
+		public bool IsInterface {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.ClassSemanticMask, (uint) TypeAttributes.Interface); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.ClassSemanticMask, (uint) TypeAttributes.Interface, value); }
+		}
+
+		public bool IsAbstract {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.Abstract); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.Abstract, value); }
+		}
+
+		public bool IsSealed {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.Sealed); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.Sealed, value); }
+		}
+
+		public bool IsSpecialName {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.SpecialName); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.SpecialName, value); }
+		}
+
+		public bool IsImport {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.Import); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.Import, value); }
+		}
+
+		public bool IsSerializable {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.Serializable); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.Serializable, value); }
+		}
+
+		public bool IsAnsiClass {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.StringFormatMask, (uint) TypeAttributes.AnsiClass); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.StringFormatMask, (uint) TypeAttributes.AnsiClass, value); }
+		}
+
+		public bool IsUnicodeClass {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.StringFormatMask, (uint) TypeAttributes.UnicodeClass); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.StringFormatMask, (uint) TypeAttributes.UnicodeClass, value); }
+		}
+
+		public bool IsAutoClass {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.StringFormatMask, (uint) TypeAttributes.AutoClass); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.StringFormatMask, (uint) TypeAttributes.AutoClass, value); }
+		}
+
+		public bool IsBeforeFieldInit {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.BeforeFieldInit); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.BeforeFieldInit, value); }
+		}
+
+		public bool IsRuntimeSpecialName {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.RTSpecialName); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.RTSpecialName, value); }
+		}
+
+		public bool HasSecurity {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.HasSecurity); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.HasSecurity, value); }
+		}
+
+		#endregion
+
+		public bool IsForwarder {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.Forwarder); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.Forwarder, value); }
+		}
+
+		public string FullName {
+			get {
+				if (declaring_type != null)
+					return declaring_type.FullName + "/" + name;
+
+				if (string.IsNullOrEmpty (@namespace))
+					return name;
+
+				return @namespace + "." + name;
+			}
+		}
+
+		public ExportedType (string @namespace, string name, ModuleDefinition module, IMetadataScope scope)
+		{
+			this.@namespace = @namespace;
+			this.name = name;
+			this.scope = scope;
+			this.module = module;
+		}
+
+		public override string ToString ()
+		{
+			return FullName;
+		}
+
+		public TypeDefinition Resolve ()
+		{
+			return module.Resolve (CreateReference ());
+		}
+
+		internal TypeReference CreateReference ()
+		{
+			return new TypeReference (@namespace, name, module, scope) {
+				DeclaringType = declaring_type != null ? declaring_type.CreateReference () : null,
+			};
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/FieldAttributes.cs b/src/Core/Compiler/Importer/IL/FieldAttributes.cs
new file mode 100644
index 000000000..862268305
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/FieldAttributes.cs
@@ -0,0 +1,59 @@
+//
+// FieldAttributes.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+	[Flags]
+    internal /* public */ enum FieldAttributes : ushort {
+		FieldAccessMask		= 0x0007,
+		CompilerControlled	= 0x0000,	// Member not referenceable
+		Private				= 0x0001,	// Accessible only by the parent type
+		FamANDAssem			= 0x0002,	// Accessible by sub-types only in this assembly
+		Assembly			= 0x0003,	// Accessible by anyone in the Assembly
+		Family				= 0x0004,	// Accessible only by type and sub-types
+		FamORAssem			= 0x0005,	// Accessible by sub-types anywhere, plus anyone in the assembly
+		Public				= 0x0006,	// Accessible by anyone who has visibility to this scope field contract attributes
+
+		Static				= 0x0010,	// Defined on type, else per instance
+		InitOnly			= 0x0020,	// Field may only be initialized, not written after init
+		Literal				= 0x0040,	// Value is compile time constant
+		NotSerialized		= 0x0080,	// Field does not have to be serialized when type is remoted
+		SpecialName			= 0x0200,	// Field is special
+
+		// Interop Attributes
+		PInvokeImpl			= 0x2000,	// Implementation is forwarded through PInvoke
+
+		// Additional flags
+		RTSpecialName		= 0x0400,	// CLI provides 'special' behavior, depending upon the name of the field
+		HasFieldMarshal		= 0x1000,	// Field has marshalling information
+		HasDefault			= 0x8000,	// Field has default
+		HasFieldRVA			= 0x0100	 // Field has RVA
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/FieldDefinition.cs b/src/Core/Compiler/Importer/IL/FieldDefinition.cs
new file mode 100644
index 000000000..2a61437bb
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/FieldDefinition.cs
@@ -0,0 +1,279 @@
+//
+// FieldDefinition.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class FieldDefinition : FieldReference, IMemberDefinition, IConstantProvider, IMarshalInfoProvider {
+
+		ushort attributes;
+		Collection<CustomAttribute> custom_attributes;
+
+		int offset = Mixin.NotResolvedMarker;
+
+		internal int rva = Mixin.NotResolvedMarker;
+		byte [] initial_value;
+
+		object constant = Mixin.NotResolved;
+
+		MarshalInfo marshal_info;
+
+		void ResolveLayout ()
+		{
+			if (offset != Mixin.NotResolvedMarker)
+				return;
+
+			if (!HasImage) {
+				offset = Mixin.NoDataMarker;
+				return;
+			}
+
+			offset = Module.Read (this, (field, reader) => reader.ReadFieldLayout (field));
+		}
+
+		public bool HasLayoutInfo {
+			get {
+				if (offset >= 0)
+					return true;
+
+				ResolveLayout ();
+
+				return offset >= 0;
+			}
+		}
+
+		public int Offset {
+			get {
+				if (offset >= 0)
+					return offset;
+
+				ResolveLayout ();
+
+				return offset >= 0 ? offset : -1;
+			}
+			set { offset = value; }
+		}
+
+		void ResolveRVA ()
+		{
+			if (rva != Mixin.NotResolvedMarker)
+				return;
+
+			if (!HasImage)
+				return;
+
+			rva = Module.Read (this, (field, reader) => reader.ReadFieldRVA (field));
+		}
+
+		public int RVA {
+			get {
+				if (rva > 0)
+					return rva;
+
+				ResolveRVA ();
+
+				return rva > 0 ? rva : 0;
+			}
+		}
+
+		public byte [] InitialValue {
+			get {
+				if (initial_value != null)
+					return initial_value;
+
+				ResolveRVA ();
+
+				if (initial_value == null)
+					initial_value = Empty<byte>.Array;
+
+				return initial_value;
+			}
+			set { initial_value = value; }
+		}
+
+		public FieldAttributes Attributes {
+			get { return (FieldAttributes) attributes; }
+			set { attributes = (ushort) value; }
+		}
+
+		public bool HasConstant {
+			get {
+				ResolveConstant ();
+
+				return constant != Mixin.NoValue;
+			}
+			set { if (!value) constant = Mixin.NoValue; }
+		}
+
+		public object Constant {
+			get { return HasConstant ? constant : null;	}
+			set { constant = value; }
+		}
+
+		void ResolveConstant ()
+		{
+			if (constant != Mixin.NotResolved)
+				return;
+
+			this.ResolveConstant (ref constant, Module);
+		}
+
+		public bool HasCustomAttributes {
+			get {
+				if (custom_attributes != null)
+					return custom_attributes.Count > 0;
+
+				return this.GetHasCustomAttributes (Module);
+			}
+		}
+
+		public Collection<CustomAttribute> CustomAttributes {
+			get { return custom_attributes ?? (custom_attributes = this.GetCustomAttributes (Module)); }
+		}
+
+		public bool HasMarshalInfo {
+			get {
+				if (marshal_info != null)
+					return true;
+
+				return this.GetHasMarshalInfo (Module);
+			}
+		}
+
+		public MarshalInfo MarshalInfo {
+			get { return marshal_info ?? (marshal_info = this.GetMarshalInfo (Module)); }
+			set { marshal_info = value; }
+		}
+
+		#region FieldAttributes
+
+		public bool IsCompilerControlled {
+			get { return attributes.GetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.CompilerControlled); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.CompilerControlled, value); }
+		}
+
+		public bool IsPrivate {
+			get { return attributes.GetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.Private); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.Private, value); }
+		}
+
+		public bool IsFamilyAndAssembly {
+			get { return attributes.GetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.FamANDAssem); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.FamANDAssem, value); }
+		}
+
+		public bool IsAssembly {
+			get { return attributes.GetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.Assembly); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.Assembly, value); }
+		}
+
+		public bool IsFamily {
+			get { return attributes.GetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.Family); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.Family, value); }
+		}
+
+		public bool IsFamilyOrAssembly {
+			get { return attributes.GetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.FamORAssem); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.FamORAssem, value); }
+		}
+
+		public bool IsPublic {
+			get { return attributes.GetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.Public); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) FieldAttributes.FieldAccessMask, (ushort) FieldAttributes.Public, value); }
+		}
+
+		public bool IsStatic {
+			get { return attributes.GetAttributes ((ushort) FieldAttributes.Static); }
+			set { attributes = attributes.SetAttributes ((ushort) FieldAttributes.Static, value); }
+		}
+
+		public bool IsInitOnly {
+			get { return attributes.GetAttributes ((ushort) FieldAttributes.InitOnly); }
+			set { attributes = attributes.SetAttributes ((ushort) FieldAttributes.InitOnly, value); }
+		}
+
+		public bool IsLiteral {
+			get { return attributes.GetAttributes ((ushort) FieldAttributes.Literal); }
+			set { attributes = attributes.SetAttributes ((ushort) FieldAttributes.Literal, value); }
+		}
+
+		public bool IsNotSerialized {
+			get { return attributes.GetAttributes ((ushort) FieldAttributes.NotSerialized); }
+			set { attributes = attributes.SetAttributes ((ushort) FieldAttributes.NotSerialized, value); }
+		}
+
+		public bool IsSpecialName {
+			get { return attributes.GetAttributes ((ushort) FieldAttributes.SpecialName); }
+			set { attributes = attributes.SetAttributes ((ushort) FieldAttributes.SpecialName, value); }
+		}
+
+		public bool IsPInvokeImpl {
+			get { return attributes.GetAttributes ((ushort) FieldAttributes.PInvokeImpl); }
+			set { attributes = attributes.SetAttributes ((ushort) FieldAttributes.PInvokeImpl, value); }
+		}
+
+		public bool IsRuntimeSpecialName {
+			get { return attributes.GetAttributes ((ushort) FieldAttributes.RTSpecialName); }
+			set { attributes = attributes.SetAttributes ((ushort) FieldAttributes.RTSpecialName, value); }
+		}
+
+		public bool HasDefault {
+			get { return attributes.GetAttributes ((ushort) FieldAttributes.HasDefault); }
+			set { attributes = attributes.SetAttributes ((ushort) FieldAttributes.HasDefault, value); }
+		}
+
+		#endregion
+
+		public override bool IsDefinition {
+			get { return true; }
+		}
+
+		public new TypeDefinition DeclaringType {
+			get { return (TypeDefinition) base.DeclaringType; }
+			set { base.DeclaringType = value; }
+		}
+
+		public FieldDefinition (string name, FieldAttributes attributes, TypeReference fieldType)
+			: base (name, fieldType)
+		{
+			this.attributes = (ushort) attributes;
+		}
+
+		public override FieldDefinition Resolve ()
+		{
+			return this;
+		}
+	}
+
+	static partial class Mixin {
+
+		public const int NotResolvedMarker = -2;
+		public const int NoDataMarker = -1;
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/FieldReference.cs b/src/Core/Compiler/Importer/IL/FieldReference.cs
new file mode 100644
index 000000000..6da298d88
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/FieldReference.cs
@@ -0,0 +1,83 @@
+//
+// FieldReference.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ class FieldReference : MemberReference {
+
+		TypeReference field_type;
+
+		public TypeReference FieldType {
+			get { return field_type; }
+			set { field_type = value; }
+		}
+
+		public override string FullName {
+			get { return field_type.FullName + " " + MemberFullName (); }
+		}
+
+		internal override bool ContainsGenericParameter {
+			get { return field_type.ContainsGenericParameter || base.ContainsGenericParameter; }
+		}
+
+		internal FieldReference ()
+		{
+			this.token = new MetadataToken (TokenType.MemberRef);
+		}
+
+		public FieldReference (string name, TypeReference fieldType)
+			: base (name)
+		{
+			if (fieldType == null)
+				throw new ArgumentNullException ("fieldType");
+
+			this.field_type = fieldType;
+			this.token = new MetadataToken (TokenType.MemberRef);
+		}
+
+		public FieldReference (string name, TypeReference fieldType, TypeReference declaringType)
+			: this (name, fieldType)
+		{
+			if (declaringType == null)
+				throw new ArgumentNullException("declaringType");
+
+			this.DeclaringType = declaringType;
+		}
+
+		public virtual FieldDefinition Resolve ()
+		{
+			var module = this.Module;
+			if (module == null)
+				throw new NotSupportedException ();
+
+			return module.Resolve (this);
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/FileAttributes.cs b/src/Core/Compiler/Importer/IL/FileAttributes.cs
new file mode 100644
index 000000000..072a49bee
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/FileAttributes.cs
@@ -0,0 +1,35 @@
+//
+// FileAttributes.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+	enum FileAttributes : uint {
+		ContainsMetaData	= 0x0000,	// This is not a resource file
+		ContainsNoMetaData  = 0x0001,	// This is a resource file or other non-metadata-containing file
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/FunctionPointerType.cs b/src/Core/Compiler/Importer/IL/FunctionPointerType.cs
new file mode 100644
index 000000000..8aa5aabb1
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/FunctionPointerType.cs
@@ -0,0 +1,128 @@
+//
+// FunctionPointerType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Text;
+using ScriptSharp.Collections.Generic;
+using MD = ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class FunctionPointerType : TypeSpecification, IMethodSignature {
+
+		readonly MethodReference function;
+
+		public bool HasThis {
+			get { return function.HasThis; }
+			set { function.HasThis = value; }
+		}
+
+		public bool ExplicitThis {
+			get { return function.ExplicitThis; }
+			set { function.ExplicitThis = value; }
+		}
+
+		public MethodCallingConvention CallingConvention {
+			get { return function.CallingConvention; }
+			set { function.CallingConvention = value; }
+		}
+
+		public bool HasParameters {
+			get { return function.HasParameters; }
+		}
+
+		public Collection<ParameterDefinition> Parameters {
+			get { return function.Parameters; }
+		}
+
+		public TypeReference ReturnType {
+			get { return function.MethodReturnType.ReturnType; }
+			set { function.MethodReturnType.ReturnType = value; }
+		}
+
+		public MethodReturnType MethodReturnType {
+			get { return function.MethodReturnType; }
+		}
+
+		public override string Name {
+			get { return function.Name; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override string Namespace {
+			get { return string.Empty; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override ModuleDefinition Module {
+			get { return ReturnType.Module; }
+		}
+
+		public override IMetadataScope Scope {
+			get { return function.ReturnType.Scope; }
+		}
+
+		public override bool IsFunctionPointer {
+			get { return true; }
+		}
+
+		internal override bool ContainsGenericParameter {
+			get { return function.ContainsGenericParameter; }
+		}
+
+		public override string FullName {
+			get {
+				var signature = new StringBuilder ();
+				signature.Append (function.Name);
+				signature.Append (" ");
+				signature.Append (function.ReturnType.FullName);
+				signature.Append (" *");
+				this.MethodSignatureFullName (signature);
+				return signature.ToString ();
+			}
+		}
+
+		public FunctionPointerType ()
+			: base (null)
+		{
+			this.function = new MethodReference ();
+			this.function.Name = "method";
+			this.etype = MD.ElementType.FnPtr;
+		}
+
+		public override TypeDefinition Resolve ()
+		{
+			return null;
+		}
+
+		public override TypeReference GetElementType ()
+		{
+			return this;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/GenericInstanceMethod.cs b/src/Core/Compiler/Importer/IL/GenericInstanceMethod.cs
new file mode 100644
index 000000000..370000a28
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/GenericInstanceMethod.cs
@@ -0,0 +1,85 @@
+//
+// GenericInstanceMethod.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Text;
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class GenericInstanceMethod : MethodSpecification, IGenericInstance, IGenericContext {
+
+		Collection<TypeReference> arguments;
+
+		public bool HasGenericArguments {
+			get { return !arguments.IsNullOrEmpty (); }
+		}
+
+		public Collection<TypeReference> GenericArguments {
+			get { return arguments ?? (arguments = new Collection<TypeReference> ()); }
+		}
+
+		public override bool IsGenericInstance {
+			get { return true; }
+		}
+
+		IGenericParameterProvider IGenericContext.Method {
+			get { return ElementMethod; }
+		}
+
+		IGenericParameterProvider IGenericContext.Type {
+			get { return ElementMethod.DeclaringType; }
+		}
+
+		internal override bool ContainsGenericParameter {
+			get { return this.ContainsGenericParameter () || base.ContainsGenericParameter; }
+		}
+
+		public override string FullName {
+			get {
+				var signature = new StringBuilder ();
+				var method = this.ElementMethod;
+				signature.Append (method.ReturnType.FullName)
+					.Append (" ")
+					.Append (method.DeclaringType.FullName)
+					.Append ("::")
+					.Append (method.Name);
+				this.GenericInstanceFullName (signature);
+				this.MethodSignatureFullName (signature);
+				return signature.ToString ();
+
+			}
+		}
+
+		public GenericInstanceMethod (MethodReference method)
+			: base (method)
+		{
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/GenericInstanceType.cs b/src/Core/Compiler/Importer/IL/GenericInstanceType.cs
new file mode 100644
index 000000000..df5bb6274
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/GenericInstanceType.cs
@@ -0,0 +1,83 @@
+//
+// GenericInstanceType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Text;
+
+using ScriptSharp.Collections.Generic;
+
+using MD = ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class GenericInstanceType : TypeSpecification, IGenericInstance, IGenericContext {
+
+		Collection<TypeReference> arguments;
+
+		public bool HasGenericArguments {
+			get { return !arguments.IsNullOrEmpty (); }
+		}
+
+		public Collection<TypeReference> GenericArguments {
+			get { return arguments ?? (arguments = new Collection<TypeReference> ()); }
+		}
+
+		public override TypeReference DeclaringType {
+			get { return ElementType.DeclaringType; }
+			set { throw new NotSupportedException (); }
+		}
+
+		public override string FullName {
+			get {
+				var name = new StringBuilder ();
+				name.Append (base.FullName);
+				this.GenericInstanceFullName (name);
+				return name.ToString ();
+			}
+		}
+
+		public override bool IsGenericInstance {
+			get { return true; }
+		}
+
+		internal override bool ContainsGenericParameter {
+			get { return this.ContainsGenericParameter () || base.ContainsGenericParameter; }
+		}
+
+		IGenericParameterProvider IGenericContext.Type {
+			get { return ElementType; }
+		}
+
+		public GenericInstanceType (TypeReference type)
+			: base (type)
+		{
+			base.IsValueType = type.IsValueType;
+			this.etype = MD.ElementType.GenericInst;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/GenericParameter.cs b/src/Core/Compiler/Importer/IL/GenericParameter.cs
new file mode 100644
index 000000000..2b15fc043
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/GenericParameter.cs
@@ -0,0 +1,201 @@
+//
+// GenericParameter.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using ScriptSharp.Collections.Generic;
+
+using ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class GenericParameter : TypeReference, ICustomAttributeProvider {
+
+		readonly IGenericParameterProvider owner;
+
+		ushort attributes;
+		Collection<TypeReference> constraints;
+		Collection<CustomAttribute> custom_attributes;
+
+		public GenericParameterAttributes Attributes {
+			get { return (GenericParameterAttributes) attributes; }
+			set { attributes = (ushort) value; }
+		}
+
+		public int Position {
+			get {
+				if (owner == null)
+					return -1;
+
+				return owner.GenericParameters.IndexOf (this);
+			}
+		}
+
+		public IGenericParameterProvider Owner {
+			get { return owner; }
+		}
+
+		public bool HasConstraints {
+			get {
+				if (constraints != null)
+					return constraints.Count > 0;
+
+				if (HasImage)
+					return Module.Read (this, (generic_parameter, reader) => reader.HasGenericConstraints (generic_parameter));
+
+				return false;
+			}
+		}
+
+		public Collection<TypeReference> Constraints {
+			get {
+				if (constraints != null)
+					return constraints;
+
+				if (HasImage)
+					return constraints = Module.Read (this, (generic_parameter, reader) => reader.ReadGenericConstraints (generic_parameter));
+
+				return constraints = new Collection<TypeReference> ();
+			}
+		}
+
+		public bool HasCustomAttributes {
+			get {
+				if (custom_attributes != null)
+					return custom_attributes.Count > 0;
+
+				return this.GetHasCustomAttributes (Module);
+			}
+		}
+
+		public Collection<CustomAttribute> CustomAttributes {
+			get { return custom_attributes ?? (custom_attributes = this.GetCustomAttributes (Module)); }
+		}
+
+		internal new bool HasImage {
+			get { return Module != null && Module.HasImage; }
+		}
+
+		public override IMetadataScope Scope {
+			get {
+				if (owner.GenericParameterType == GenericParameterType.Method)
+					return ((MethodReference) owner).DeclaringType.Scope;
+
+				return ((TypeReference) owner).Scope;
+			}
+		}
+
+		public override ModuleDefinition Module {
+			get { return ((MemberReference) owner).Module; }
+		}
+
+		public override string Name {
+			get {
+				if (!string.IsNullOrEmpty (base.Name))
+					return base.Name;
+
+				return base.Name = (owner.GenericParameterType == GenericParameterType.Type ? "!" : "!!") + Position;
+			}
+		}
+
+		public override string Namespace {
+			get { return string.Empty; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override string FullName {
+			get { return Name; }
+		}
+
+		public override bool IsGenericParameter {
+			get { return true; }
+		}
+
+		internal override bool ContainsGenericParameter {
+			get { return true; }
+		}
+
+		public override MetadataType MetadataType {
+			get { return (MetadataType) etype; }
+		}
+
+		#region GenericParameterAttributes
+
+		public bool IsNonVariant {
+			get { return attributes.GetMaskedAttributes ((ushort) GenericParameterAttributes.VarianceMask, (ushort) GenericParameterAttributes.NonVariant); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) GenericParameterAttributes.VarianceMask, (ushort) GenericParameterAttributes.NonVariant, value); }
+		}
+
+		public bool IsCovariant {
+			get { return attributes.GetMaskedAttributes ((ushort) GenericParameterAttributes.VarianceMask, (ushort) GenericParameterAttributes.Covariant); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) GenericParameterAttributes.VarianceMask, (ushort) GenericParameterAttributes.Covariant, value); }
+		}
+
+		public bool IsContravariant {
+			get { return attributes.GetMaskedAttributes ((ushort) GenericParameterAttributes.VarianceMask, (ushort) GenericParameterAttributes.Contravariant); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) GenericParameterAttributes.VarianceMask, (ushort) GenericParameterAttributes.Contravariant, value); }
+		}
+
+		public bool HasReferenceTypeConstraint {
+			get { return attributes.GetAttributes ((ushort) GenericParameterAttributes.ReferenceTypeConstraint); }
+			set { attributes = attributes.SetAttributes ((ushort) GenericParameterAttributes.ReferenceTypeConstraint, value); }
+		}
+
+		public bool HasNotNullableValueTypeConstraint {
+			get { return attributes.GetAttributes ((ushort) GenericParameterAttributes.NotNullableValueTypeConstraint); }
+			set { attributes = attributes.SetAttributes ((ushort) GenericParameterAttributes.NotNullableValueTypeConstraint, value); }
+		}
+
+		public bool HasDefaultConstructorConstraint {
+			get { return attributes.GetAttributes ((ushort) GenericParameterAttributes.DefaultConstructorConstraint); }
+			set { attributes = attributes.SetAttributes ((ushort) GenericParameterAttributes.DefaultConstructorConstraint, value); }
+		}
+
+		#endregion
+
+		public GenericParameter (IGenericParameterProvider owner)
+			: this (string.Empty, owner)
+		{
+		}
+
+		public GenericParameter (string name, IGenericParameterProvider owner)
+			: base (string.Empty, name)
+		{
+			if (owner == null)
+				throw new ArgumentNullException ();
+
+			this.owner = owner;
+			this.etype = owner.GenericParameterType == GenericParameterType.Type ? ElementType.Var : ElementType.MVar;
+		}
+
+		public override TypeDefinition Resolve ()
+		{
+			return null;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/GenericParameterAttributes.cs b/src/Core/Compiler/Importer/IL/GenericParameterAttributes.cs
new file mode 100644
index 000000000..8fc8d3bca
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/GenericParameterAttributes.cs
@@ -0,0 +1,45 @@
+//
+// GenericParameterAttributes.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+	[Flags]
+    internal /* public */ enum GenericParameterAttributes : ushort {
+		VarianceMask	= 0x0003,
+		NonVariant		= 0x0000,
+		Covariant		= 0x0001,
+		Contravariant	= 0x0002,
+
+		SpecialConstraintMask			= 0x001c,
+		ReferenceTypeConstraint			= 0x0004,
+		NotNullableValueTypeConstraint	= 0x0008,
+		DefaultConstructorConstraint	= 0x0010
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/IConstantProvider.cs b/src/Core/Compiler/Importer/IL/IConstantProvider.cs
new file mode 100644
index 000000000..cb3394b83
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/IConstantProvider.cs
@@ -0,0 +1,52 @@
+//
+// IConstantProvider.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ interface IConstantProvider : IMetadataTokenProvider {
+
+		bool HasConstant { get; set; }
+		object Constant { get; set; }
+	}
+
+	static partial class Mixin {
+
+		internal static object NoValue = new object ();
+		internal static object NotResolved = new object ();
+
+		public static void ResolveConstant (
+			this IConstantProvider self,
+			ref object constant,
+			ModuleDefinition module)
+		{
+			constant = module.HasImage ()
+				? module.Read (self, (provider, reader) => reader.ReadConstant (provider))
+				: Mixin.NoValue;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/ICustomAttributeProvider.cs b/src/Core/Compiler/Importer/IL/ICustomAttributeProvider.cs
new file mode 100644
index 000000000..9be0b6728
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/ICustomAttributeProvider.cs
@@ -0,0 +1,61 @@
+//
+// ICustomAttributeProvider.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ interface ICustomAttributeProvider : IMetadataTokenProvider {
+
+		Collection<CustomAttribute> CustomAttributes { get; }
+
+		bool HasCustomAttributes { get; }
+	}
+
+	static partial class Mixin {
+
+		public static bool GetHasCustomAttributes (
+			this ICustomAttributeProvider self,
+			ModuleDefinition module)
+		{
+			return module.HasImage ()
+				? module.Read (self, (provider, reader) => reader.HasCustomAttributes (provider))
+				: false;
+		}
+
+		public static Collection<CustomAttribute> GetCustomAttributes (
+			this ICustomAttributeProvider self,
+			ModuleDefinition module)
+		{
+			return module.HasImage ()
+				? module.Read (self, (provider, reader) => reader.ReadCustomAttributes (provider))
+				: new Collection<CustomAttribute> ();
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/IGenericInstance.cs b/src/Core/Compiler/Importer/IL/IGenericInstance.cs
new file mode 100644
index 000000000..9e0458a55
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/IGenericInstance.cs
@@ -0,0 +1,65 @@
+//
+// IGenericInstance.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System.Text;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ interface IGenericInstance : IMetadataTokenProvider {
+
+		bool HasGenericArguments { get; }
+		Collection<TypeReference> GenericArguments { get; }
+	}
+
+	static partial class Mixin {
+
+		public static bool ContainsGenericParameter (this IGenericInstance self)
+		{
+			var arguments = self.GenericArguments;
+
+			for (int i = 0; i < arguments.Count; i++)
+				if (arguments [i].ContainsGenericParameter)
+					return true;
+
+			return false;
+		}
+
+		public static void GenericInstanceFullName (this IGenericInstance self, StringBuilder builder)
+		{
+			builder.Append ("<");
+			var arguments = self.GenericArguments;
+			for (int i = 0; i < arguments.Count; i++) {
+				if (i > 0)
+					builder.Append (",");
+				builder.Append (arguments [i].FullName);
+			}
+			builder.Append (">");
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/IGenericParameterProvider.cs b/src/Core/Compiler/Importer/IL/IGenericParameterProvider.cs
new file mode 100644
index 000000000..54fb39e95
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/IGenericParameterProvider.cs
@@ -0,0 +1,74 @@
+//
+// IGenericParameterProvider.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ interface IGenericParameterProvider : IMetadataTokenProvider {
+
+		bool HasGenericParameters { get; }
+		bool IsDefinition { get; }
+		ModuleDefinition Module { get; }
+		Collection<GenericParameter> GenericParameters { get; }
+		GenericParameterType GenericParameterType { get; }
+	}
+
+    internal /* public */ enum GenericParameterType {
+		Type,
+		Method
+	}
+
+	interface IGenericContext {
+
+		bool IsDefinition { get; }
+		IGenericParameterProvider Type { get; }
+		IGenericParameterProvider Method { get; }
+	}
+
+	static partial class Mixin {
+
+		public static bool GetHasGenericParameters (
+			this IGenericParameterProvider self,
+			ModuleDefinition module)
+		{
+			return module.HasImage ()
+				? module.Read (self, (provider, reader) => reader.HasGenericParameters (provider))
+				: false;
+		}
+
+		public static Collection<GenericParameter> GetGenericParameters (
+			this IGenericParameterProvider self,
+			ModuleDefinition module)
+		{
+			return module.HasImage ()
+				? module.Read (self, (provider, reader) => reader.ReadGenericParameters (provider))
+				: new Collection<GenericParameter> ();
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/IMarshalInfoProvider.cs b/src/Core/Compiler/Importer/IL/IMarshalInfoProvider.cs
new file mode 100644
index 000000000..8e2e06494
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/IMarshalInfoProvider.cs
@@ -0,0 +1,57 @@
+//
+// IMarshalInfoProvider.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ interface IMarshalInfoProvider : IMetadataTokenProvider {
+
+		bool HasMarshalInfo { get; }
+		MarshalInfo MarshalInfo { get; set; }
+	}
+
+	static partial class Mixin {
+
+		public static bool GetHasMarshalInfo (
+			this IMarshalInfoProvider self,
+			ModuleDefinition module)
+		{
+			return module.HasImage ()
+				? module.Read (self, (provider, reader) => reader.HasMarshalInfo (provider))
+				: false;
+		}
+
+		public static MarshalInfo GetMarshalInfo (
+			this IMarshalInfoProvider self,
+			ModuleDefinition module)
+		{
+			return module.HasImage ()
+				? module.Read (self, (provider, reader) => reader.ReadMarshalInfo (provider))
+				: null;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/IMemberDefinition.cs b/src/Core/Compiler/Importer/IL/IMemberDefinition.cs
new file mode 100644
index 000000000..ab4882c3a
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/IMemberDefinition.cs
@@ -0,0 +1,100 @@
+//
+// IMemberDefinition.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ interface IMemberDefinition : ICustomAttributeProvider {
+
+		string Name { get; set; }
+		string FullName { get; }
+
+		bool IsSpecialName { get; set; }
+		bool IsRuntimeSpecialName { get; set; }
+
+		TypeDefinition DeclaringType { get; set; }
+	}
+
+	static partial class Mixin {
+
+		public static bool GetAttributes (this uint self, uint attributes)
+		{
+			return (self & attributes) != 0;
+		}
+
+		public static uint SetAttributes (this uint self, uint attributes, bool value)
+		{
+			if (value)
+				return self | attributes;
+
+			return self & ~attributes;
+		}
+
+		public static bool GetMaskedAttributes (this uint self, uint mask, uint attributes)
+		{
+			return (self & mask) == attributes;
+		}
+
+		public static uint SetMaskedAttributes (this uint self, uint mask, uint attributes, bool value)
+		{
+			if (value) {
+				self &= ~mask;
+				return self | attributes;
+			}
+
+			return self & ~(mask & attributes);
+		}
+
+		public static bool GetAttributes (this ushort self, ushort attributes)
+		{
+			return (self & attributes) != 0;
+		}
+
+		public static ushort SetAttributes (this ushort self, ushort attributes, bool value)
+		{
+			if (value)
+				return (ushort) (self | attributes);
+
+			return (ushort) (self & ~attributes);
+		}
+
+		public static bool GetMaskedAttributes (this ushort self, ushort mask, uint attributes)
+		{
+			return (self & mask) == attributes;
+		}
+
+		public static ushort SetMaskedAttributes (this ushort self, ushort mask, uint attributes, bool value)
+		{
+			if (value) {
+				self = (ushort) (self & ~mask);
+				return (ushort) (self | attributes);
+			}
+
+			return (ushort) (self & ~(mask & attributes));
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/IMetadataScope.cs b/src/Core/Compiler/Importer/IL/IMetadataScope.cs
new file mode 100644
index 000000000..b39142d5a
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/IMetadataScope.cs
@@ -0,0 +1,41 @@
+//
+// IMetadataScope.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ enum MetadataScopeType {
+		AssemblyNameReference,
+		ModuleReference,
+		ModuleDefinition,
+	}
+
+    internal /* public */ interface IMetadataScope : IMetadataTokenProvider {
+		MetadataScopeType MetadataScopeType { get; }
+		string Name { get; set; }
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/IMetadataTokenProvider.cs b/src/Core/Compiler/Importer/IL/IMetadataTokenProvider.cs
new file mode 100644
index 000000000..a6c5bb187
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/IMetadataTokenProvider.cs
@@ -0,0 +1,35 @@
+//
+// IMetadataTokenProvider.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ interface IMetadataTokenProvider {
+
+		MetadataToken MetadataToken { get; set; }
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/IMethodSignature.cs b/src/Core/Compiler/Importer/IL/IMethodSignature.cs
new file mode 100644
index 000000000..cf3e9d507
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/IMethodSignature.cs
@@ -0,0 +1,69 @@
+//
+// IMethodSignature.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System.Text;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ interface IMethodSignature : IMetadataTokenProvider {
+
+		bool HasThis { get; set; }
+		bool ExplicitThis { get; set; }
+		MethodCallingConvention CallingConvention { get; set; }
+
+		bool HasParameters { get; }
+		Collection<ParameterDefinition> Parameters { get; }
+		TypeReference ReturnType { get; set; }
+		MethodReturnType MethodReturnType { get; }
+	}
+
+	static partial class Mixin {
+
+		public static void MethodSignatureFullName (this IMethodSignature self, StringBuilder builder)
+		{
+			builder.Append ("(");
+
+			if (self.HasParameters) {
+				var parameters = self.Parameters;
+				for (int i = 0; i < parameters.Count; i++) {
+					var parameter = parameters [i];
+					if (i > 0)
+						builder.Append (",");
+
+					if (parameter.ParameterType.IsSentinel)
+						builder.Append ("...,");
+
+					builder.Append (parameter.ParameterType.FullName);
+				}
+			}
+
+			builder.Append (")");
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Import.cs b/src/Core/Compiler/Importer/IL/Import.cs
new file mode 100644
index 000000000..201ebf135
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Import.cs
@@ -0,0 +1,566 @@
+//
+// Import.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using SR = System.Reflection;
+
+using ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+	enum ImportGenericKind {
+		Definition,
+		Open,
+	}
+
+	class MetadataImporter {
+
+		readonly ModuleDefinition module;
+
+		public MetadataImporter (ModuleDefinition module)
+		{
+			this.module = module;
+		}
+
+#if !CF
+		static readonly Dictionary<Type, ElementType> type_etype_mapping = new Dictionary<Type, ElementType> (18) {
+			{ typeof (void), ElementType.Void },
+			{ typeof (bool), ElementType.Boolean },
+			{ typeof (char), ElementType.Char },
+			{ typeof (sbyte), ElementType.I1 },
+			{ typeof (byte), ElementType.U1 },
+			{ typeof (short), ElementType.I2 },
+			{ typeof (ushort), ElementType.U2 },
+			{ typeof (int), ElementType.I4 },
+			{ typeof (uint), ElementType.U4 },
+			{ typeof (long), ElementType.I8 },
+			{ typeof (ulong), ElementType.U8 },
+			{ typeof (float), ElementType.R4 },
+			{ typeof (double), ElementType.R8 },
+			{ typeof (string), ElementType.String },
+			{ typeof (TypedReference), ElementType.TypedByRef },
+			{ typeof (IntPtr), ElementType.I },
+			{ typeof (UIntPtr), ElementType.U },
+			{ typeof (object), ElementType.Object },
+		};
+
+		public TypeReference ImportType (Type type, IGenericContext context)
+		{
+			return ImportType (type, context, ImportGenericKind.Open);
+		}
+
+		public TypeReference ImportType (Type type, IGenericContext context, ImportGenericKind import_kind)
+		{
+			if (IsTypeSpecification (type) || ImportOpenGenericType (type, import_kind))
+				return ImportTypeSpecification (type, context);
+
+			var reference = new TypeReference (
+				string.Empty,
+				type.Name,
+				module,
+				ImportScope (type.Assembly),
+				type.IsValueType);
+
+			reference.etype = ImportElementType (type);
+
+			if (IsNestedType (type))
+				reference.DeclaringType = ImportType (type.DeclaringType, context, import_kind);
+			else
+				reference.Namespace = type.Namespace;
+
+			if (type.IsGenericType)
+				ImportGenericParameters (reference, type.GetGenericArguments ());
+
+			return reference;
+		}
+
+		static bool ImportOpenGenericType (Type type, ImportGenericKind import_kind)
+		{
+			return type.IsGenericType && type.IsGenericTypeDefinition && import_kind == ImportGenericKind.Open;
+		}
+
+		static bool ImportOpenGenericMethod (SR.MethodBase method, ImportGenericKind import_kind)
+		{
+			return method.IsGenericMethod && method.IsGenericMethodDefinition && import_kind == ImportGenericKind.Open;
+		}
+
+		static bool IsNestedType (Type type)
+		{
+#if !SILVERLIGHT
+			return type.IsNested;
+#else
+			return type.DeclaringType != null;
+#endif
+		}
+
+		TypeReference ImportTypeSpecification (Type type, IGenericContext context)
+		{
+			if (type.IsByRef)
+				return new ByReferenceType (ImportType (type.GetElementType (), context));
+
+			if (type.IsPointer)
+				return new PointerType (ImportType (type.GetElementType (), context));
+
+			if (type.IsArray)
+				return new ArrayType (ImportType (type.GetElementType (), context), type.GetArrayRank ());
+
+			if (type.IsGenericType)
+				return ImportGenericInstance (type, context);
+
+			if (type.IsGenericParameter)
+				return ImportGenericParameter (type, context);
+
+			throw new NotSupportedException (type.FullName);
+		}
+
+		static TypeReference ImportGenericParameter (Type type, IGenericContext context)
+		{
+			if (context == null)
+				throw new InvalidOperationException ();
+
+			var owner = type.DeclaringMethod != null
+				? context.Method
+				: context.Type;
+
+			if (owner == null)
+				throw new InvalidOperationException ();
+
+			return owner.GenericParameters [type.GenericParameterPosition];
+		}
+
+		TypeReference ImportGenericInstance (Type type, IGenericContext context)
+		{
+			var element_type = ImportType (type.GetGenericTypeDefinition (), context, ImportGenericKind.Definition);
+			var instance = new GenericInstanceType (element_type);
+			var arguments = type.GetGenericArguments ();
+			var instance_arguments = instance.GenericArguments;
+
+			for (int i = 0; i < arguments.Length; i++)
+				instance_arguments.Add (ImportType (arguments [i], context ?? element_type));
+
+			return instance;
+		}
+
+		static bool IsTypeSpecification (Type type)
+		{
+			return type.HasElementType
+				|| IsGenericInstance (type)
+				|| type.IsGenericParameter;
+		}
+
+		static bool IsGenericInstance (Type type)
+		{
+			return type.IsGenericType && !type.IsGenericTypeDefinition;
+		}
+
+		static ElementType ImportElementType (Type type)
+		{
+			ElementType etype;
+			if (!type_etype_mapping.TryGetValue (type, out etype))
+				return ElementType.None;
+
+			return etype;
+		}
+
+		AssemblyNameReference ImportScope (SR.Assembly assembly)
+		{
+			AssemblyNameReference scope;
+#if !SILVERLIGHT
+			var name = assembly.GetName ();
+
+			if (TryGetAssemblyNameReference (name, out scope))
+				return scope;
+
+			scope = new AssemblyNameReference (name.Name, name.Version) {
+				Culture = name.CultureInfo.Name,
+				PublicKeyToken = name.GetPublicKeyToken (),
+				HashAlgorithm = (AssemblyHashAlgorithm) name.HashAlgorithm,
+			};
+
+			module.AssemblyReferences.Add (scope);
+
+			return scope;
+#else
+			var name = AssemblyNameReference.Parse (assembly.FullName);
+
+			if (TryGetAssemblyNameReference (name, out scope))
+				return scope;
+
+			module.AssemblyReferences.Add (name);
+
+			return name;
+#endif
+		}
+
+#if !SILVERLIGHT
+		bool TryGetAssemblyNameReference (SR.AssemblyName name, out AssemblyNameReference assembly_reference)
+		{
+			var references = module.AssemblyReferences;
+
+			for (int i = 0; i < references.Count; i++) {
+				var reference = references [i];
+				if (name.FullName != reference.FullName) // TODO compare field by field
+					continue;
+
+				assembly_reference = reference;
+				return true;
+			}
+
+			assembly_reference = null;
+			return false;
+		}
+#endif
+
+		public FieldReference ImportField (SR.FieldInfo field, IGenericContext context)
+		{
+			var declaring_type = ImportType (field.DeclaringType, context);
+
+			if (IsGenericInstance (field.DeclaringType))
+				field = ResolveFieldDefinition (field);
+
+			return new FieldReference {
+				Name = field.Name,
+				DeclaringType = declaring_type,
+				FieldType = ImportType (field.FieldType, context ?? declaring_type),
+			};
+		}
+
+		static SR.FieldInfo ResolveFieldDefinition (SR.FieldInfo field)
+		{
+#if !SILVERLIGHT
+			return field.Module.ResolveField (field.MetadataToken);
+#else
+			return field.DeclaringType.GetGenericTypeDefinition ().GetField (field.Name,
+				SR.BindingFlags.Public
+				| SR.BindingFlags.NonPublic
+				| (field.IsStatic ? SR.BindingFlags.Static : SR.BindingFlags.Instance));
+#endif
+		}
+
+		public MethodReference ImportMethod (SR.MethodBase method, IGenericContext context, ImportGenericKind import_kind)
+		{
+			if (IsMethodSpecification (method) || ImportOpenGenericMethod (method, import_kind))
+				return ImportMethodSpecification (method, context);
+
+			var declaring_type = ImportType (method.DeclaringType, context);
+
+			if (IsGenericInstance (method.DeclaringType))
+				method = method.Module.ResolveMethod (method.MetadataToken);
+
+			var reference = new MethodReference {
+				Name = method.Name,
+				HasThis = HasCallingConvention (method, SR.CallingConventions.HasThis),
+				ExplicitThis = HasCallingConvention (method, SR.CallingConventions.ExplicitThis),
+				DeclaringType = ImportType (method.DeclaringType, context, ImportGenericKind.Definition),
+			};
+
+			if (HasCallingConvention (method, SR.CallingConventions.VarArgs))
+				reference.CallingConvention &= MethodCallingConvention.VarArg;
+
+			if (method.IsGenericMethod)
+				ImportGenericParameters (reference, method.GetGenericArguments ());
+
+			var method_info = method as SR.MethodInfo;
+			reference.ReturnType = method_info != null
+				? ImportType (method_info.ReturnType, context ?? reference)
+				: ImportType (typeof (void), null);
+
+			var parameters = method.GetParameters ();
+			var reference_parameters = reference.Parameters;
+
+			for (int i = 0; i < parameters.Length; i++)
+				reference_parameters.Add (
+					new ParameterDefinition (ImportType (parameters [i].ParameterType, context ?? reference)));
+
+			reference.DeclaringType = declaring_type;
+
+			return reference;
+		}
+
+		static void ImportGenericParameters (IGenericParameterProvider provider, Type [] arguments)
+		{
+			var provider_parameters = provider.GenericParameters;
+
+			for (int i = 0; i < arguments.Length; i++)
+				provider_parameters.Add (new GenericParameter (arguments [i].Name, provider));
+		}
+
+		static bool IsMethodSpecification (SR.MethodBase method)
+		{
+			return method.IsGenericMethod && !method.IsGenericMethodDefinition;
+		}
+
+		MethodReference ImportMethodSpecification (SR.MethodBase method, IGenericContext context)
+		{
+			var method_info = method as SR.MethodInfo;
+			if (method_info == null)
+				throw new InvalidOperationException ();
+
+			var element_method = ImportMethod (method_info.GetGenericMethodDefinition (), context, ImportGenericKind.Definition);
+			var instance = new GenericInstanceMethod (element_method);
+			var arguments = method.GetGenericArguments ();
+			var instance_arguments = instance.GenericArguments;
+
+			for (int i = 0; i < arguments.Length; i++)
+				instance_arguments.Add (ImportType (arguments [i], context ?? element_method));
+
+			return instance;
+		}
+
+		static bool HasCallingConvention (SR.MethodBase method, SR.CallingConventions conventions)
+		{
+			return (method.CallingConvention & conventions) != 0;
+		}
+#endif
+
+		public TypeReference ImportType (TypeReference type, IGenericContext context)
+		{
+			if (type.IsTypeSpecification ())
+				return ImportTypeSpecification (type, context);
+
+			var reference = new TypeReference (
+				type.Namespace,
+				type.Name,
+				module,
+				ImportScope (type.Scope),
+				type.IsValueType);
+
+			MetadataSystem.TryProcessPrimitiveType (reference);
+
+			if (type.IsNested)
+				reference.DeclaringType = ImportType (type.DeclaringType, context);
+
+			if (type.HasGenericParameters)
+				ImportGenericParameters (reference, type);
+
+			return reference;
+		}
+
+		IMetadataScope ImportScope (IMetadataScope scope)
+		{
+			switch (scope.MetadataScopeType) {
+			case MetadataScopeType.AssemblyNameReference:
+				return ImportAssemblyName ((AssemblyNameReference) scope);
+			case MetadataScopeType.ModuleDefinition:
+				return ImportAssemblyName (((ModuleDefinition) scope).Assembly.Name);
+			case MetadataScopeType.ModuleReference:
+				throw new NotImplementedException ();
+			}
+
+			throw new NotSupportedException ();
+		}
+
+		AssemblyNameReference ImportAssemblyName (AssemblyNameReference name)
+		{
+			AssemblyNameReference reference;
+			if (TryGetAssemblyNameReference (name, out reference))
+				return reference;
+
+			reference = new AssemblyNameReference (name.Name, name.Version) {
+				Culture = name.Culture,
+				HashAlgorithm = name.HashAlgorithm,
+			};
+
+			var pk_token = !name.PublicKeyToken.IsNullOrEmpty ()
+				? new byte [name.PublicKeyToken.Length]
+				: Empty<byte>.Array;
+
+			if (pk_token.Length > 0)
+				Buffer.BlockCopy (name.PublicKeyToken, 0, pk_token, 0, pk_token.Length);
+
+			reference.PublicKeyToken = pk_token;
+
+			module.AssemblyReferences.Add (reference);
+
+			return reference;
+		}
+
+		bool TryGetAssemblyNameReference (AssemblyNameReference name_reference, out AssemblyNameReference assembly_reference)
+		{
+			var references = module.AssemblyReferences;
+
+			for (int i = 0; i < references.Count; i++) {
+				var reference = references [i];
+				if (name_reference.FullName != reference.FullName) // TODO compare field by field
+					continue;
+
+				assembly_reference = reference;
+				return true;
+			}
+
+			assembly_reference = null;
+			return false;
+		}
+
+		static void ImportGenericParameters (IGenericParameterProvider imported, IGenericParameterProvider original)
+		{
+			var parameters = original.GenericParameters;
+			var imported_parameters = imported.GenericParameters;
+
+			for (int i = 0; i < parameters.Count; i++)
+				imported_parameters.Add (new GenericParameter (parameters [i].Name, imported));
+		}
+
+		TypeReference ImportTypeSpecification (TypeReference type, IGenericContext context)
+		{
+			switch (type.etype) {
+			case ElementType.SzArray:
+				var vector = (ArrayType) type;
+				return new ArrayType (ImportType (vector.ElementType, context));
+			case ElementType.Ptr:
+				var pointer = (PointerType) type;
+				return new PointerType (ImportType (pointer.ElementType, context));
+			case ElementType.ByRef:
+				var byref = (ByReferenceType) type;
+				return new ByReferenceType (ImportType (byref.ElementType, context));
+			case ElementType.Pinned:
+				var pinned = (PinnedType) type;
+				return new PinnedType (ImportType (pinned.ElementType, context));
+			case ElementType.Sentinel:
+				var sentinel = (SentinelType) type;
+				return new SentinelType (ImportType (sentinel.ElementType, context));
+			case ElementType.CModOpt:
+				var modopt = (OptionalModifierType) type;
+				return new OptionalModifierType (
+					ImportType (modopt.ModifierType, context),
+					ImportType (modopt.ElementType, context));
+			case ElementType.CModReqD:
+				var modreq = (RequiredModifierType) type;
+				return new RequiredModifierType (
+					ImportType (modreq.ModifierType, context),
+					ImportType (modreq.ElementType, context));
+			case ElementType.Array:
+				var array = (ArrayType) type;
+				var imported_array = new ArrayType (ImportType (array.ElementType, context));
+				if (array.IsVector)
+					return imported_array;
+
+				var dimensions = array.Dimensions;
+				var imported_dimensions = imported_array.Dimensions;
+
+				imported_dimensions.Clear ();
+
+				for (int i = 0; i < dimensions.Count; i++) {
+					var dimension = dimensions [i];
+
+					imported_dimensions.Add (new ArrayDimension (dimension.LowerBound, dimension.UpperBound));
+				}
+
+				return imported_array;
+			case ElementType.GenericInst:
+				var instance = (GenericInstanceType) type;
+				var element_type = ImportType (instance.ElementType, context);
+				var imported_instance = new GenericInstanceType (element_type);
+
+				var arguments = instance.GenericArguments;
+				var imported_arguments = imported_instance.GenericArguments;
+
+				for (int i = 0; i < arguments.Count; i++)
+					imported_arguments.Add (ImportType (arguments [i], context));
+
+				return imported_instance;
+			case ElementType.Var:
+				if (context == null || context.Type == null)
+					throw new InvalidOperationException ();
+
+				return ((TypeReference) context.Type).GetElementType ().GenericParameters [((GenericParameter) type).Position];
+			case ElementType.MVar:
+				if (context == null || context.Method == null)
+					throw new InvalidOperationException ();
+
+				return context.Method.GenericParameters [((GenericParameter) type).Position];
+			}
+
+			throw new NotSupportedException (type.etype.ToString ());
+		}
+
+		public FieldReference ImportField (FieldReference field, IGenericContext context)
+		{
+			var declaring_type = ImportType (field.DeclaringType, context);
+
+			return new FieldReference {
+				Name = field.Name,
+				DeclaringType = declaring_type,
+				FieldType = ImportType (field.FieldType, context ?? declaring_type),
+			};
+		}
+
+		public MethodReference ImportMethod (MethodReference method, IGenericContext context)
+		{
+			if (method.IsGenericInstance)
+				return ImportMethodSpecification (method, context);
+
+			var declaring_type = ImportType (method.DeclaringType, context);
+
+			var reference = new MethodReference {
+				Name = method.Name,
+				HasThis = method.HasThis,
+				ExplicitThis = method.ExplicitThis,
+				DeclaringType = declaring_type,
+			};
+
+			reference.CallingConvention = method.CallingConvention;
+
+			if (method.HasGenericParameters)
+				ImportGenericParameters (reference, method);
+
+			reference.ReturnType = ImportType (method.ReturnType, context ?? reference);
+
+			if (!method.HasParameters)
+				return reference;
+
+			var reference_parameters = reference.Parameters;
+
+			var parameters = method.Parameters;
+			for (int i = 0; i < parameters.Count; i++)
+				reference_parameters.Add (
+					new ParameterDefinition (ImportType (parameters [i].ParameterType, context ?? reference)));
+
+			return reference;
+		}
+
+		MethodSpecification ImportMethodSpecification (MethodReference method, IGenericContext context)
+		{
+			if (!method.IsGenericInstance)
+				throw new NotSupportedException ();
+
+			var instance = (GenericInstanceMethod) method;
+			var element_method = ImportMethod (instance.ElementMethod, context);
+			var imported_instance = new GenericInstanceMethod (element_method);
+
+			var arguments = instance.GenericArguments;
+			var imported_arguments = imported_instance.GenericArguments;
+
+			for (int i = 0; i < arguments.Count; i++)
+				imported_arguments.Add (ImportType (arguments [i], context));
+
+			return imported_instance;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/LinkedResource.cs b/src/Core/Compiler/Importer/IL/LinkedResource.cs
new file mode 100644
index 000000000..a33bc3c65
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/LinkedResource.cs
@@ -0,0 +1,60 @@
+//
+// LinkedResource.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class LinkedResource : Resource {
+
+		internal byte [] hash;
+		string file;
+
+		public byte [] Hash {
+			get { return hash; }
+		}
+
+		public string File {
+			get { return file; }
+			set { file = value; }
+		}
+
+		public override ResourceType ResourceType {
+			get { return ResourceType.Linked; }
+		}
+
+		public LinkedResource (string name, ManifestResourceAttributes flags)
+			: base (name, flags)
+		{
+		}
+
+		public LinkedResource (string name, ManifestResourceAttributes flags, string file)
+			: base (name, flags)
+		{
+			this.file = file;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/ManifestResourceAttributes.cs b/src/Core/Compiler/Importer/IL/ManifestResourceAttributes.cs
new file mode 100644
index 000000000..7444e56f8
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/ManifestResourceAttributes.cs
@@ -0,0 +1,39 @@
+//
+// ManifestResourceAttributes.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+	[Flags]
+    internal /* public */ enum ManifestResourceAttributes : uint {
+		VisibilityMask	= 0x0007,
+		Public			= 0x0001,	// The resource is exported from the Assembly
+		Private			= 0x0002	 // The resource is private to the Assembly
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/MarshalInfo.cs b/src/Core/Compiler/Importer/IL/MarshalInfo.cs
new file mode 100644
index 000000000..1294d3fd5
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/MarshalInfo.cs
@@ -0,0 +1,171 @@
+//
+// MarshalInfo.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ class MarshalInfo {
+
+		internal NativeType native;
+
+		public NativeType NativeType {
+			get { return native; }
+			set { native = value; }
+		}
+
+		public MarshalInfo (NativeType native)
+		{
+			this.native = native;
+		}
+	}
+
+    internal /* public */ sealed class ArrayMarshalInfo : MarshalInfo {
+
+		internal NativeType element_type;
+		internal int size_parameter_index;
+		internal int size;
+		internal int size_parameter_multiplier;
+
+		public NativeType ElementType {
+			get { return element_type; }
+			set { element_type = value; }
+		}
+
+		public int SizeParameterIndex {
+			get { return size_parameter_index; }
+			set { size_parameter_index = value; }
+		}
+
+		public int Size {
+			get { return size; }
+			set { size = value; }
+		}
+
+		public int SizeParameterMultiplier {
+			get { return size_parameter_multiplier; }
+			set { size_parameter_multiplier = value; }
+		}
+
+		public ArrayMarshalInfo ()
+			: base (NativeType.Array)
+		{
+			element_type = NativeType.None;
+			size_parameter_index = -1;
+			size = -1;
+			size_parameter_multiplier = -1;
+		}
+	}
+
+    internal /* public */ sealed class CustomMarshalInfo : MarshalInfo {
+
+		internal Guid guid;
+		internal string unmanaged_type;
+		internal TypeReference managed_type;
+		internal string cookie;
+
+		public Guid Guid {
+			get { return guid; }
+			set { guid = value; }
+		}
+
+		public string UnmanagedType {
+			get { return unmanaged_type; }
+			set { unmanaged_type = value; }
+		}
+
+		public TypeReference ManagedType {
+			get { return managed_type; }
+			set { managed_type = value; }
+		}
+
+		public string Cookie {
+			get { return cookie; }
+			set { cookie = value; }
+		}
+
+		public CustomMarshalInfo ()
+			: base (NativeType.CustomMarshaler)
+		{
+		}
+	}
+
+    internal /* public */ sealed class SafeArrayMarshalInfo : MarshalInfo {
+
+		internal VariantType element_type;
+
+		public VariantType ElementType {
+			get { return element_type; }
+			set { element_type = value; }
+		}
+
+		public SafeArrayMarshalInfo ()
+			: base (NativeType.SafeArray)
+		{
+			element_type = VariantType.None;
+		}
+	}
+
+    internal /* public */ sealed class FixedArrayMarshalInfo : MarshalInfo {
+
+		internal NativeType element_type;
+		internal int size;
+
+		public NativeType ElementType {
+			get { return element_type; }
+			set { element_type = value; }
+		}
+
+		public int Size {
+			get { return size; }
+			set { size = value; }
+		}
+
+		public FixedArrayMarshalInfo ()
+			: base (NativeType.FixedArray)
+		{
+			element_type = NativeType.None;
+		}
+	}
+
+    internal /* public */ sealed class FixedSysStringMarshalInfo : MarshalInfo {
+
+		internal int size;
+
+		public int Size {
+			get { return size; }
+			set { size = value; }
+		}
+
+		public FixedSysStringMarshalInfo ()
+			: base (NativeType.FixedSysString)
+		{
+			size = -1;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/MemberDefinitionCollection.cs b/src/Core/Compiler/Importer/IL/MemberDefinitionCollection.cs
new file mode 100644
index 000000000..a5bf6196f
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/MemberDefinitionCollection.cs
@@ -0,0 +1,91 @@
+//
+// MemberDefinitionCollection.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+	class MemberDefinitionCollection<T> : Collection<T> where T : IMemberDefinition {
+
+		TypeDefinition container;
+
+		internal MemberDefinitionCollection (TypeDefinition container)
+		{
+			this.container = container;
+		}
+
+		internal MemberDefinitionCollection (TypeDefinition container, int capacity)
+			: base (capacity)
+		{
+			this.container = container;
+		}
+
+		protected override void OnAdd (T item, int index)
+		{
+			Attach (item);
+		}
+
+		protected sealed override void OnSet (T item, int index)
+		{
+			Attach (item);
+		}
+
+		protected sealed override void OnInsert (T item, int index)
+		{
+			Attach (item);
+		}
+
+		protected sealed override void OnRemove (T item, int index)
+		{
+			Detach (item);
+		}
+
+		protected sealed override void OnClear ()
+		{
+			foreach (var definition in this)
+				Detach (definition);
+		}
+
+		void Attach (T element)
+		{
+			if (element.DeclaringType == container)
+				return;
+
+			if (element.DeclaringType != null)
+				throw new ArgumentException ("Member already attached");
+
+			element.DeclaringType = this.container;
+		}
+
+		static void Detach (T element)
+		{
+			element.DeclaringType = null;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/MemberReference.cs b/src/Core/Compiler/Importer/IL/MemberReference.cs
new file mode 100644
index 000000000..4ad2f0790
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/MemberReference.cs
@@ -0,0 +1,101 @@
+//
+// MemberReference.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ abstract class MemberReference : IMetadataTokenProvider {
+
+		string name;
+		TypeReference declaring_type;
+
+		internal MetadataToken token;
+
+		public virtual string Name {
+			get { return name; }
+			set { name = value; }
+		}
+
+		public abstract string FullName {
+			get;
+		}
+
+		public virtual TypeReference DeclaringType {
+			get { return declaring_type; }
+			set { declaring_type = value; }
+		}
+
+		public MetadataToken MetadataToken {
+			get { return token; }
+			set { token = value; }
+		}
+
+		internal bool HasImage {
+			get {
+				var module = Module;
+				if (module == null)
+					return false;
+
+				return module.HasImage;
+			}
+		}
+
+		public virtual ModuleDefinition Module {
+			get { return declaring_type != null ? declaring_type.Module : null; }
+		}
+
+		public virtual bool IsDefinition {
+			get { return false; }
+		}
+
+		internal virtual bool ContainsGenericParameter {
+			get { return declaring_type != null && declaring_type.ContainsGenericParameter; }
+		}
+
+		internal MemberReference ()
+		{
+		}
+
+		internal MemberReference (string name)
+		{
+			this.name = name ?? string.Empty;
+		}
+
+		internal string MemberFullName ()
+		{
+			if (declaring_type == null)
+				return name;
+
+			return declaring_type.FullName + "::" + name;
+		}
+
+		public override string ToString ()
+		{
+			return FullName;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Metadata/BlobHeap.cs b/src/Core/Compiler/Importer/IL/Metadata/BlobHeap.cs
new file mode 100644
index 000000000..3dd8e8e1b
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Metadata/BlobHeap.cs
@@ -0,0 +1,59 @@
+//
+// BlobHeap.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using ScriptSharp.Importer.IL.PE;
+
+namespace ScriptSharp.Importer.IL.Metadata {
+
+	sealed class BlobHeap : Heap {
+
+		public BlobHeap (Section section, uint start, uint size)
+			: base (section, start, size)
+		{
+		}
+
+		public byte [] Read (uint index)
+		{
+			if (index == 0 || index > Size - 1)
+				return Empty<byte>.Array;
+
+			var data = Section.Data;
+
+			int position = (int) (index + Offset);
+			int length = (int) data.ReadCompressedUInt32 (ref position);
+
+			var buffer = new byte [length];
+
+			Buffer.BlockCopy (data, position, buffer, 0, length);
+
+			return buffer;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Metadata/Buffers.cs b/src/Core/Compiler/Importer/IL/Metadata/Buffers.cs
new file mode 100644
index 000000000..9299ee2b5
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Metadata/Buffers.cs
@@ -0,0 +1,373 @@
+//
+// TableHeapBuffer.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using ScriptSharp.Importer.IL.PE;
+
+using RVA = System.UInt32;
+
+#if !IL_READ_ONLY
+
+namespace ScriptSharp.Importer.IL.Metadata {
+
+	sealed class TableHeapBuffer : HeapBuffer {
+
+		readonly ModuleDefinition module;
+		readonly MetadataBuilder metadata;
+
+		internal MetadataTable [] tables = new MetadataTable [45];
+
+		bool large_string;
+		bool large_blob;
+		readonly int [] coded_index_sizes = new int [13];
+		readonly Func<Table, int> counter;
+
+		public override bool IsEmpty {
+			get { return false; }
+		}
+
+		public TableHeapBuffer (ModuleDefinition module, MetadataBuilder metadata)
+			: base (24)
+		{
+			this.module = module;
+			this.metadata = metadata;
+			this.counter = GetTableLength;
+		}
+
+		int GetTableLength (Table table)
+		{
+			var md_table = tables [(int) table];
+			return md_table != null ? md_table.Length : 0;
+		}
+
+		public TTable GetTable<TTable> (Table table) where TTable : MetadataTable, new ()
+		{
+			var md_table = (TTable) tables [(int) table];
+			if (md_table != null)
+				return md_table;
+
+			md_table = new TTable ();
+			tables [(int) table] = md_table;
+			return md_table;
+		}
+
+		public void WriteBySize (uint value, int size)
+		{
+			if (size == 4)
+				WriteUInt32 (value);
+			else
+				WriteUInt16 ((ushort) value);
+		}
+
+		public void WriteBySize (uint value, bool large)
+		{
+			if (large)
+				WriteUInt32 (value);
+			else
+				WriteUInt16 ((ushort) value);
+		}
+
+		public void WriteString (uint @string)
+		{
+			WriteBySize (@string, large_string);
+		}
+
+		public void WriteBlob (uint blob)
+		{
+			WriteBySize (blob, large_blob);
+		}
+
+		public void WriteRID (uint rid, Table table)
+		{
+			var md_table = tables [(int) table];
+			WriteBySize (rid, md_table == null ? false : md_table.IsLarge);
+		}
+
+		int GetCodedIndexSize (CodedIndex coded_index)
+		{
+			var index = (int) coded_index;
+			var size = coded_index_sizes [index];
+			if (size != 0)
+				return size;
+
+			return coded_index_sizes [index] = coded_index.GetSize (counter);
+		}
+
+		public void WriteCodedRID (uint rid, CodedIndex coded_index)
+		{
+			WriteBySize (rid, GetCodedIndexSize (coded_index));
+		}
+
+		public void WriteTableHeap ()
+		{
+			WriteUInt32 (0);					// Reserved
+			WriteByte (GetTableHeapVersion ());	// MajorVersion
+			WriteByte (0);						// MinorVersion
+			WriteByte (GetHeapSizes ());		// HeapSizes
+			WriteByte (10);						// Reserved2
+			WriteUInt64 (GetValid ());			// Valid
+			WriteUInt64 (0x0016003301fa00);		// Sorted
+
+			WriteRowCount ();
+			WriteTables ();
+		}
+
+		void WriteRowCount ()
+		{
+			for (int i = 0; i < tables.Length; i++) {
+				var table = tables [i];
+				if (table == null || table.Length == 0)
+					continue;
+
+				WriteUInt32 ((uint) table.Length);
+			}
+		}
+
+		void WriteTables ()
+		{
+			for (int i = 0; i < tables.Length; i++) {
+				var table = tables [i];
+				if (table == null || table.Length == 0)
+					continue;
+
+				table.Write (this);
+			}
+		}
+
+		ulong GetValid ()
+		{
+			ulong valid = 0;
+
+			for (int i = 0; i < tables.Length; i++) {
+				var table = tables [i];
+				if (table == null || table.Length == 0)
+					continue;
+
+				table.Sort ();
+				valid |= (1UL << i);
+			}
+
+			return valid;
+		}
+
+		byte GetHeapSizes ()
+		{
+			byte heap_sizes = 0;
+
+			if (metadata.string_heap.IsLarge) {
+				large_string = true;
+				heap_sizes |= 0x01;
+			}
+
+			if (metadata.blob_heap.IsLarge) {
+				large_blob = true;
+				heap_sizes |= 0x04;
+			}
+
+			return heap_sizes;
+		}
+
+		byte GetTableHeapVersion ()
+		{
+			switch (module.Runtime) {
+			case TargetRuntime.Net_1_0:
+			case TargetRuntime.Net_1_1:
+				return 1;
+			default:
+				return 2;
+			}
+		}
+
+		public void FixupData (RVA data_rva)
+		{
+			var table = GetTable<FieldRVATable> (Table.FieldRVA);
+			if (table.length == 0)
+				return;
+
+			var field_idx_size = GetTable<FieldTable> (Table.Field).IsLarge ? 4 : 2;
+			var previous = this.position;
+
+			base.position = table.position;
+			for (int i = 0; i < table.length; i++) {
+				var rva = ReadUInt32 ();
+				base.position -= 4;
+				WriteUInt32 (rva + data_rva);
+				base.position += field_idx_size;
+			}
+
+			base.position = previous;
+		}
+	}
+
+	sealed class ResourceBuffer : ByteBuffer {
+
+		public ResourceBuffer ()
+			: base (0)
+		{
+		}
+
+		public uint AddResource (byte [] resource)
+		{
+			var offset = (uint) this.position;
+			WriteInt32 (resource.Length);
+			WriteBytes (resource);
+			return offset;
+		}
+	}
+
+	sealed class DataBuffer : ByteBuffer {
+
+		public DataBuffer ()
+			: base (0)
+		{
+		}
+
+		public RVA AddData (byte [] data)
+		{
+			var rva = (RVA) position;
+			WriteBytes (data);
+			return rva;
+		}
+	}
+
+	abstract class HeapBuffer : ByteBuffer {
+
+		public bool IsLarge {
+			get { return base.length > 65536; }
+		}
+
+		public abstract bool IsEmpty { get; }
+
+		protected HeapBuffer (int length)
+			: base (length)
+		{
+		}
+	}
+
+	class StringHeapBuffer : HeapBuffer {
+
+		readonly Dictionary<string, uint> strings = new Dictionary<string, uint> ();
+
+		public sealed override bool IsEmpty {
+			get { return length <= 1; }
+		}
+
+		public StringHeapBuffer ()
+			: base (1)
+		{
+			WriteByte (0);
+		}
+
+		public uint GetStringIndex (string @string)
+		{
+			uint index;
+			if (strings.TryGetValue (@string, out index))
+				return index;
+
+			index = (uint) base.position;
+			WriteString (@string);
+			strings.Add (@string, index);
+			return index;
+		}
+
+		protected virtual void WriteString (string @string)
+		{
+			WriteBytes (Encoding.UTF8.GetBytes (@string));
+			WriteByte (0);
+		}
+	}
+
+	sealed class BlobHeapBuffer : HeapBuffer {
+
+		readonly Dictionary<ByteBuffer, uint> blobs = new Dictionary<ByteBuffer, uint> (new ByteBufferEqualityComparer ());
+
+		public override bool IsEmpty {
+			get { return length <= 1; }
+		}
+
+		public BlobHeapBuffer ()
+			: base (1)
+		{
+			WriteByte (0);
+		}
+
+		public uint GetBlobIndex (ByteBuffer blob)
+		{
+			uint index;
+			if (blobs.TryGetValue (blob, out index))
+				return index;
+
+			index = (uint) base.position;
+			WriteBlob (blob);
+			blobs.Add (blob, index);
+			return index;
+		}
+
+		void WriteBlob (ByteBuffer blob)
+		{
+			WriteCompressedUInt32 ((uint) blob.length);
+			WriteBytes (blob);
+		}
+	}
+
+	sealed class UserStringHeapBuffer : StringHeapBuffer {
+
+		protected override void WriteString (string @string)
+		{
+			WriteCompressedUInt32 ((uint) @string.Length * 2 + 1);
+
+			byte special = 0;
+
+			for (int i = 0; i < @string.Length; i++) {
+				var @char = @string [i];
+				WriteUInt16 (@char);
+
+				if (special == 1)
+					continue;
+
+				if (@char < 0x20 || @char > 0x7e) {
+					if (@char > 0x7e
+						|| (@char >= 0x01 && @char <= 0x08)
+						|| (@char >= 0x0e && @char <= 0x1f)
+						|| @char == 0x27
+						|| @char == 0x2d) {
+
+						special = 1;
+					}
+				}
+			}
+
+			WriteByte (special);
+		}
+	}
+}
+
+#endif
diff --git a/src/Core/Compiler/Importer/IL/Metadata/CodedIndex.cs b/src/Core/Compiler/Importer/IL/Metadata/CodedIndex.cs
new file mode 100644
index 000000000..e58e2b66a
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Metadata/CodedIndex.cs
@@ -0,0 +1,46 @@
+//
+// CodedIndex.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL.Metadata {
+
+	enum CodedIndex {
+		TypeDefOrRef,
+		HasConstant,
+		HasCustomAttribute,
+		HasFieldMarshal,
+		HasDeclSecurity,
+		MemberRefParent,
+		HasSemantics,
+		MethodDefOrRef,
+		MemberForwarded,
+		Implementation,
+		CustomAttributeType,
+		ResolutionScope,
+		TypeOrMethodDef
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Metadata/ElementType.cs b/src/Core/Compiler/Importer/IL/Metadata/ElementType.cs
new file mode 100644
index 000000000..b89197180
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Metadata/ElementType.cs
@@ -0,0 +1,73 @@
+//
+// ElementType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL.Metadata {
+
+	enum ElementType : byte {
+		None = 0x00,
+		Void = 0x01,
+		Boolean = 0x02,
+		Char = 0x03,
+		I1 = 0x04,
+		U1 = 0x05,
+		I2 = 0x06,
+		U2 = 0x07,
+		I4 = 0x08,
+		U4 = 0x09,
+		I8 = 0x0a,
+		U8 = 0x0b,
+		R4 = 0x0c,
+		R8 = 0x0d,
+		String = 0x0e,
+		Ptr = 0x0f,   // Followed by <type> token
+		ByRef = 0x10,   // Followed by <type> token
+		ValueType = 0x11,   // Followed by <type> token
+		Class = 0x12,   // Followed by <type> token
+		Var = 0x13,   // Followed by generic parameter number
+		Array = 0x14,   // <type> <rank> <boundsCount> <bound1>  <loCount> <lo1>
+		GenericInst = 0x15,   // <type> <type-arg-count> <type-1> ... <type-n> */
+		TypedByRef = 0x16,
+		I = 0x18,   // System.IntPtr
+		U = 0x19,   // System.UIntPtr
+		FnPtr = 0x1b,   // Followed by full method signature
+		Object = 0x1c,   // System.Object
+		SzArray = 0x1d,   // Single-dim array with 0 lower bound
+		MVar = 0x1e,   // Followed by generic parameter number
+		CModReqD = 0x1f,   // Required modifier : followed by a TypeDef or TypeRef token
+		CModOpt = 0x20,   // Optional modifier : followed by a TypeDef or TypeRef token
+		Internal = 0x21,   // Implemented within the CLI
+		Modifier = 0x40,   // Or'd with following element types
+		Sentinel = 0x41,   // Sentinel for varargs method signature
+		Pinned = 0x45,   // Denotes a local variable that points at a pinned object
+
+		// special undocumented constants
+		Type = 0x50,
+		Boxed = 0x51,
+		Enum = 0x55
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Metadata/GuidHeap.cs b/src/Core/Compiler/Importer/IL/Metadata/GuidHeap.cs
new file mode 100644
index 000000000..2cf01f33e
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Metadata/GuidHeap.cs
@@ -0,0 +1,59 @@
+//
+// GuidHeap.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using ScriptSharp.Importer.IL.PE;
+
+namespace ScriptSharp.Importer.IL.Metadata {
+
+	sealed class GuidHeap : Heap {
+
+		public GuidHeap (Section section, uint start, uint size)
+			: base (section, start, size)
+		{
+		}
+
+		public Guid Read (uint index)
+		{
+			if (index == 0)
+				return new Guid ();
+
+			const int guid_size = 16;
+
+			var buffer = new byte [guid_size];
+
+			index--;
+
+			Buffer.BlockCopy (Section.Data, (int) (Offset + index), buffer, 0, guid_size);
+
+			return new Guid (buffer);
+
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Metadata/Heap.cs b/src/Core/Compiler/Importer/IL/Metadata/Heap.cs
new file mode 100644
index 000000000..9f644bbec
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Metadata/Heap.cs
@@ -0,0 +1,48 @@
+//
+// Heap.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using ScriptSharp.Importer.IL.PE;
+
+namespace ScriptSharp.Importer.IL.Metadata {
+
+	abstract class Heap {
+
+		public int IndexSize;
+
+		public readonly Section Section;
+		public readonly uint Offset;
+		public readonly uint Size;
+
+		protected Heap (Section section, uint offset, uint size)
+		{
+			this.Section = section;
+			this.Offset = offset;
+			this.Size = size;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Metadata/MetadataToken.cs b/src/Core/Compiler/Importer/IL/Metadata/MetadataToken.cs
new file mode 100644
index 000000000..d5234aa15
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Metadata/MetadataToken.cs
@@ -0,0 +1,105 @@
+//
+// MetadataToken.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ struct MetadataToken {
+
+		readonly uint token;
+
+		public uint RID	{
+			get { return token & 0x00ffffff; }
+		}
+
+		public TokenType TokenType {
+			get { return (TokenType) (token & 0xff000000); }
+		}
+
+		public static readonly MetadataToken Zero = new MetadataToken ((uint) 0);
+
+		public MetadataToken (uint token)
+		{
+			this.token = token;
+		}
+
+		public MetadataToken (TokenType type)
+			: this (type, 0)
+		{
+		}
+
+		public MetadataToken (TokenType type, uint rid)
+		{
+			token = (uint) type | rid;
+		}
+
+		public MetadataToken (TokenType type, int rid)
+		{
+			token = (uint) type | (uint) rid;
+		}
+
+		public int ToInt32 ()
+		{
+			return (int) token;
+		}
+
+		public uint ToUInt32 ()
+		{
+			return token;
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int) token;
+		}
+
+		public override bool Equals (object obj)
+		{
+			if (obj is MetadataToken) {
+				var other = (MetadataToken) obj;
+				return other.token == token;
+			}
+
+			return false;
+		}
+
+		public static bool operator == (MetadataToken one, MetadataToken other)
+		{
+			return one.token == other.token;
+		}
+
+		public static bool operator != (MetadataToken one, MetadataToken other)
+		{
+			return one.token != other.token;
+		}
+
+		public override string ToString ()
+		{
+			return string.Format ("[{0}:0x{1}]", TokenType, RID.ToString ("x4"));
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Metadata/Row.cs b/src/Core/Compiler/Importer/IL/Metadata/Row.cs
new file mode 100644
index 000000000..84de481d1
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Metadata/Row.cs
@@ -0,0 +1,170 @@
+//
+// Row.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL.Metadata {
+
+	struct Row<T1, T2> {
+		internal T1 Col1;
+		internal T2 Col2;
+
+		public Row (T1 col1, T2 col2)
+		{
+			Col1 = col1;
+			Col2 = col2;
+		}
+	}
+
+	struct Row<T1, T2, T3> {
+		internal T1 Col1;
+		internal T2 Col2;
+		internal T3 Col3;
+
+		public Row (T1 col1, T2 col2, T3 col3)
+		{
+			Col1 = col1;
+			Col2 = col2;
+			Col3 = col3;
+		}
+	}
+
+	struct Row<T1, T2, T3, T4> {
+		internal T1 Col1;
+		internal T2 Col2;
+		internal T3 Col3;
+		internal T4 Col4;
+
+		public Row (T1 col1, T2 col2, T3 col3, T4 col4)
+		{
+			Col1 = col1;
+			Col2 = col2;
+			Col3 = col3;
+			Col4 = col4;
+		}
+	}
+
+	struct Row<T1, T2, T3, T4, T5> {
+		internal T1 Col1;
+		internal T2 Col2;
+		internal T3 Col3;
+		internal T4 Col4;
+		internal T5 Col5;
+
+		public Row (T1 col1, T2 col2, T3 col3, T4 col4, T5 col5)
+		{
+			Col1 = col1;
+			Col2 = col2;
+			Col3 = col3;
+			Col4 = col4;
+			Col5 = col5;
+		}
+	}
+
+	struct Row<T1, T2, T3, T4, T5, T6> {
+		internal T1 Col1;
+		internal T2 Col2;
+		internal T3 Col3;
+		internal T4 Col4;
+		internal T5 Col5;
+		internal T6 Col6;
+
+		public Row (T1 col1, T2 col2, T3 col3, T4 col4, T5 col5, T6 col6)
+		{
+			Col1 = col1;
+			Col2 = col2;
+			Col3 = col3;
+			Col4 = col4;
+			Col5 = col5;
+			Col6 = col6;
+		}
+	}
+
+	struct Row<T1, T2, T3, T4, T5, T6, T7, T8, T9> {
+		internal T1 Col1;
+		internal T2 Col2;
+		internal T3 Col3;
+		internal T4 Col4;
+		internal T5 Col5;
+		internal T6 Col6;
+		internal T7 Col7;
+		internal T8 Col8;
+		internal T9 Col9;
+
+		public Row (T1 col1, T2 col2, T3 col3, T4 col4, T5 col5, T6 col6, T7 col7, T8 col8, T9 col9)
+		{
+			Col1 = col1;
+			Col2 = col2;
+			Col3 = col3;
+			Col4 = col4;
+			Col5 = col5;
+			Col6 = col6;
+			Col7 = col7;
+			Col8 = col8;
+			Col9 = col9;
+		}
+	}
+
+	sealed class RowEqualityComparer : IEqualityComparer<Row<string, string>>, IEqualityComparer<Row<uint, uint>>, IEqualityComparer<Row<uint, uint, uint>> {
+
+		public bool Equals (Row<string, string> x, Row<string, string> y)
+		{
+			return x.Col1 == y.Col1
+				&& x.Col2 == y.Col2;
+		}
+
+		public int GetHashCode (Row<string, string> obj)
+		{
+			string x = obj.Col1, y = obj.Col2;
+			return (x != null ? x.GetHashCode () : 0) ^ (y != null ? y.GetHashCode () : 0);
+		}
+
+		public bool Equals (Row<uint, uint> x, Row<uint, uint> y)
+		{
+			return x.Col1 == y.Col1
+				&& x.Col2 == y.Col2;
+		}
+
+		public int GetHashCode (Row<uint, uint> obj)
+		{
+			return (int) (obj.Col1 ^ obj.Col2);
+		}
+
+		public bool Equals (Row<uint, uint, uint> x, Row<uint, uint, uint> y)
+		{
+			return x.Col1 == y.Col1
+				&& x.Col2 == y.Col2
+				&& x.Col3 == y.Col3;
+		}
+
+		public int GetHashCode (Row<uint, uint, uint> obj)
+		{
+			return (int) (obj.Col1 ^ obj.Col2 ^ obj.Col3);
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Metadata/StringHeap.cs b/src/Core/Compiler/Importer/IL/Metadata/StringHeap.cs
new file mode 100644
index 000000000..1bb68706c
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Metadata/StringHeap.cs
@@ -0,0 +1,81 @@
+//
+// StringHeap.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using ScriptSharp.Importer.IL.PE;
+
+namespace ScriptSharp.Importer.IL.Metadata {
+
+	class StringHeap : Heap {
+
+		readonly Dictionary<uint, string> strings = new Dictionary<uint, string> ();
+
+		public StringHeap (Section section, uint start, uint size)
+			: base (section, start, size)
+		{
+		}
+
+		public string Read (uint index)
+		{
+			if (index == 0)
+				return string.Empty;
+
+			string @string;
+			if (strings.TryGetValue (index, out @string))
+				return @string;
+
+			if (index > Size - 1)
+				return string.Empty;
+
+			@string = ReadStringAt (index);
+			if (@string.Length != 0)
+				strings.Add (index, @string);
+
+			return @string;
+		}
+
+		protected virtual string ReadStringAt (uint index)
+		{
+			int length = 0;
+			byte [] data = Section.Data;
+			int start = (int) (index + Offset);
+
+			for (int i = start; ; i++) {
+				if (data [i] == 0)
+					break;
+
+				length++;
+			}
+
+			return Encoding.UTF8.GetString (data, start, length);
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Metadata/TableHeap.cs b/src/Core/Compiler/Importer/IL/Metadata/TableHeap.cs
new file mode 100644
index 000000000..e8f3f4853
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Metadata/TableHeap.cs
@@ -0,0 +1,153 @@
+//
+// TableHeap.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using ScriptSharp.Importer.IL.PE;
+
+namespace ScriptSharp.Importer.IL.Metadata {
+
+	enum Table : byte {
+		Module = 0x00,
+		TypeRef = 0x01,
+		TypeDef = 0x02,
+		FieldPtr = 0x03,
+		Field = 0x04,
+		MethodPtr = 0x05,
+		Method = 0x06,
+		ParamPtr = 0x07,
+		Param = 0x08,
+		InterfaceImpl = 0x09,
+		MemberRef = 0x0a,
+		Constant = 0x0b,
+		CustomAttribute = 0x0c,
+		FieldMarshal = 0x0d,
+		DeclSecurity = 0x0e,
+		ClassLayout = 0x0f,
+		FieldLayout = 0x10,
+		StandAloneSig = 0x11,
+		EventMap = 0x12,
+		EventPtr = 0x13,
+		Event = 0x14,
+		PropertyMap = 0x15,
+		PropertyPtr = 0x16,
+		Property = 0x17,
+		MethodSemantics = 0x18,
+		MethodImpl = 0x19,
+		ModuleRef = 0x1a,
+		TypeSpec = 0x1b,
+		ImplMap = 0x1c,
+		FieldRVA = 0x1d,
+		Assembly = 0x20,
+		AssemblyProcessor = 0x21,
+		AssemblyOS = 0x22,
+		AssemblyRef = 0x23,
+		AssemblyRefProcessor = 0x24,
+		AssemblyRefOS = 0x25,
+		File = 0x26,
+		ExportedType = 0x27,
+		ManifestResource = 0x28,
+		NestedClass = 0x29,
+		GenericParam = 0x2a,
+		MethodSpec = 0x2b,
+		GenericParamConstraint = 0x2c,
+	}
+
+	struct TableInformation {
+		public uint Offset;
+		public uint Length;
+		public uint RowSize;
+	}
+
+	sealed class TableHeap : Heap {
+
+		public long Valid;
+		public long Sorted;
+
+		public static readonly Table [] TableIdentifiers = new [] {
+			Table.Module,
+			Table.TypeRef,
+			Table.TypeDef,
+			Table.FieldPtr,
+			Table.Field,
+			Table.MethodPtr,
+			Table.Method,
+			Table.ParamPtr,
+			Table.Param,
+			Table.InterfaceImpl,
+			Table.MemberRef,
+			Table.Constant,
+			Table.CustomAttribute,
+			Table.FieldMarshal,
+			Table.DeclSecurity,
+			Table.ClassLayout,
+			Table.FieldLayout,
+			Table.StandAloneSig,
+			Table.EventMap,
+			Table.EventPtr,
+			Table.Event,
+			Table.PropertyMap,
+			Table.PropertyPtr,
+			Table.Property,
+			Table.MethodSemantics,
+			Table.MethodImpl,
+			Table.ModuleRef,
+			Table.TypeSpec,
+			Table.ImplMap,
+			Table.FieldRVA,
+			Table.Assembly,
+			Table.AssemblyProcessor,
+			Table.AssemblyOS,
+			Table.AssemblyRef,
+			Table.AssemblyRefProcessor,
+			Table.AssemblyRefOS,
+			Table.File,
+			Table.ExportedType,
+			Table.ManifestResource,
+			Table.NestedClass,
+			Table.GenericParam,
+			Table.MethodSpec,
+			Table.GenericParamConstraint,
+		};
+
+		public readonly TableInformation [] Tables = new TableInformation [45];
+
+		public TableInformation this [Table table] {
+			get { return Tables [(int) table]; }
+		}
+
+		public TableHeap (Section section, uint start, uint size)
+			: base (section, start, size)
+		{
+		}
+
+		public bool HasTable (Table table)
+		{
+			return (Valid & (1L << (int) table)) != 0;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Metadata/TokenType.cs b/src/Core/Compiler/Importer/IL/Metadata/TokenType.cs
new file mode 100644
index 000000000..40fb00b07
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Metadata/TokenType.cs
@@ -0,0 +1,56 @@
+//
+// TokenType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ enum TokenType : uint {
+		Module = 0x00000000,
+		TypeRef = 0x01000000,
+		TypeDef = 0x02000000,
+		Field = 0x04000000,
+		Method = 0x06000000,
+		Param = 0x08000000,
+		InterfaceImpl = 0x09000000,
+		MemberRef = 0x0a000000,
+		CustomAttribute = 0x0c000000,
+		Permission = 0x0e000000,
+		Signature = 0x11000000,
+		Event = 0x14000000,
+		Property = 0x17000000,
+		ModuleRef = 0x1a000000,
+		TypeSpec = 0x1b000000,
+		Assembly = 0x20000000,
+		AssemblyRef = 0x23000000,
+		File = 0x26000000,
+		ExportedType = 0x27000000,
+		ManifestResource = 0x28000000,
+		GenericParam = 0x2a000000,
+		MethodSpec = 0x2b000000,
+		String = 0x70000000,
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Metadata/UserStringHeap.cs b/src/Core/Compiler/Importer/IL/Metadata/UserStringHeap.cs
new file mode 100644
index 000000000..c5453e5a0
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Metadata/UserStringHeap.cs
@@ -0,0 +1,59 @@
+//
+// UserStringHeap.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using ScriptSharp.Importer.IL.PE;
+
+namespace ScriptSharp.Importer.IL.Metadata {
+
+	sealed class UserStringHeap : StringHeap {
+
+		public UserStringHeap (Section section, uint start, uint size)
+			: base (section, start, size)
+		{
+		}
+
+		protected override string ReadStringAt (uint index)
+		{
+			byte [] data = Section.Data;
+			int start = (int) (index + Offset);
+
+			uint length = (uint) (data.ReadCompressedUInt32 (ref start) & ~1);
+			if (length < 1)
+				return string.Empty;
+
+			var chars = new char [length / 2];
+
+			for (int i = start, j = 0; i < start + length; i += 2)
+				chars [j++] = (char) (data [i] | (data [i + 1] << 8));
+
+			return new string (chars);
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Metadata/Utilities.cs b/src/Core/Compiler/Importer/IL/Metadata/Utilities.cs
new file mode 100644
index 000000000..916e6ffec
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Metadata/Utilities.cs
@@ -0,0 +1,529 @@
+//
+// Utilities.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+	static partial class Mixin {
+
+		public static uint ReadCompressedUInt32 (this byte [] data, ref int position)
+		{
+			uint integer;
+			if ((data [position] & 0x80) == 0) {
+				integer = data [position];
+				position++;
+			} else if ((data [position] & 0x40) == 0) {
+				integer = (uint) (data [position] & ~0x80) << 8;
+				integer |= data [position + 1];
+				position += 2;
+			} else {
+				integer = (uint) (data [position] & ~0xc0) << 24;
+				integer |= (uint) data [position + 1] << 16;
+				integer |= (uint) data [position + 2] << 8;
+				integer |= (uint) data [position + 3];
+				position += 4;
+			}
+			return integer;
+		}
+
+		public static MetadataToken GetMetadataToken (this CodedIndex self, uint data)
+		{
+			uint rid;
+			TokenType token_type;
+			switch (self) {
+			case CodedIndex.TypeDefOrRef:
+				rid = data >> 2;
+				switch (data & 3) {
+				case 0:
+					token_type = TokenType.TypeDef; goto ret;
+				case 1:
+					token_type = TokenType.TypeRef; goto ret;
+				case 2:
+					token_type = TokenType.TypeSpec; goto ret;
+				default:
+					goto exit;
+				}
+			case CodedIndex.HasConstant:
+				rid = data >> 2;
+				switch (data & 3) {
+				case 0:
+					token_type = TokenType.Field; goto ret;
+				case 1:
+					token_type = TokenType.Param; goto ret;
+				case 2:
+					token_type = TokenType.Property; goto ret;
+				default:
+					goto exit;
+				}
+			case CodedIndex.HasCustomAttribute:
+				rid = data >> 5;
+				switch (data & 31) {
+				case 0:
+					token_type = TokenType.Method; goto ret;
+				case 1:
+					token_type = TokenType.Field; goto ret;
+				case 2:
+					token_type = TokenType.TypeRef; goto ret;
+				case 3:
+					token_type = TokenType.TypeDef; goto ret;
+				case 4:
+					token_type = TokenType.Param; goto ret;
+				case 5:
+					token_type = TokenType.InterfaceImpl; goto ret;
+				case 6:
+					token_type = TokenType.MemberRef; goto ret;
+				case 7:
+					token_type = TokenType.Module; goto ret;
+				case 8:
+					token_type = TokenType.Permission; goto ret;
+				case 9:
+					token_type = TokenType.Property; goto ret;
+				case 10:
+					token_type = TokenType.Event; goto ret;
+				case 11:
+					token_type = TokenType.Signature; goto ret;
+				case 12:
+					token_type = TokenType.ModuleRef; goto ret;
+				case 13:
+					token_type = TokenType.TypeSpec; goto ret;
+				case 14:
+					token_type = TokenType.Assembly; goto ret;
+				case 15:
+					token_type = TokenType.AssemblyRef; goto ret;
+				case 16:
+					token_type = TokenType.File; goto ret;
+				case 17:
+					token_type = TokenType.ExportedType; goto ret;
+				case 18:
+					token_type = TokenType.ManifestResource; goto ret;
+				case 19:
+					token_type = TokenType.GenericParam; goto ret;
+				default:
+					goto exit;
+				}
+			case CodedIndex.HasFieldMarshal:
+				rid = data >> 1;
+				switch (data & 1) {
+				case 0:
+					token_type = TokenType.Field; goto ret;
+				case 1:
+					token_type = TokenType.Param; goto ret;
+				default:
+					goto exit;
+				}
+			case CodedIndex.HasDeclSecurity:
+				rid = data >> 2;
+				switch (data & 3) {
+				case 0:
+					token_type = TokenType.TypeDef; goto ret;
+				case 1:
+					token_type = TokenType.Method; goto ret;
+				case 2:
+					token_type = TokenType.Assembly; goto ret;
+				default:
+					goto exit;
+				}
+			case CodedIndex.MemberRefParent:
+				rid = data >> 3;
+				switch (data & 7) {
+				case 0:
+					token_type = TokenType.TypeDef; goto ret;
+				case 1:
+					token_type = TokenType.TypeRef; goto ret;
+				case 2:
+					token_type = TokenType.ModuleRef; goto ret;
+				case 3:
+					token_type = TokenType.Method; goto ret;
+				case 4:
+					token_type = TokenType.TypeSpec; goto ret;
+				default:
+					goto exit;
+				}
+			case CodedIndex.HasSemantics:
+				rid = data >> 1;
+				switch (data & 1) {
+				case 0:
+					token_type = TokenType.Event; goto ret;
+				case 1:
+					token_type = TokenType.Property; goto ret;
+				default:
+					goto exit;
+				}
+			case CodedIndex.MethodDefOrRef:
+				rid = data >> 1;
+				switch (data & 1) {
+				case 0:
+					token_type = TokenType.Method; goto ret;
+				case 1:
+					token_type = TokenType.MemberRef; goto ret;
+				default:
+					goto exit;
+				}
+			case CodedIndex.MemberForwarded:
+				rid = data >> 1;
+				switch (data & 1) {
+				case 0:
+					token_type = TokenType.Field; goto ret;
+				case 1:
+					token_type = TokenType.Method; goto ret;
+				default:
+					goto exit;
+				}
+			case CodedIndex.Implementation:
+				rid = data >> 2;
+				switch (data & 3) {
+				case 0:
+					token_type = TokenType.File; goto ret;
+				case 1:
+					token_type = TokenType.AssemblyRef; goto ret;
+				case 2:
+					token_type = TokenType.ExportedType; goto ret;
+				default:
+					goto exit;
+				}
+			case CodedIndex.CustomAttributeType:
+				rid = data >> 3;
+				switch (data & 7) {
+				case 2:
+					token_type = TokenType.Method; goto ret;
+				case 3:
+					token_type = TokenType.MemberRef; goto ret;
+				default:
+					goto exit;
+				}
+			case CodedIndex.ResolutionScope:
+				rid = data >> 2;
+				switch (data & 3) {
+				case 0:
+					token_type = TokenType.Module; goto ret;
+				case 1:
+					token_type = TokenType.ModuleRef; goto ret;
+				case 2:
+					token_type = TokenType.AssemblyRef; goto ret;
+				case 3:
+					token_type = TokenType.TypeRef; goto ret;
+				default:
+					goto exit;
+				}
+			case CodedIndex.TypeOrMethodDef:
+				rid = data >> 1;
+				switch (data & 1) {
+				case 0:
+					token_type = TokenType.TypeDef; goto ret;
+				case 1:
+					token_type = TokenType.Method; goto ret;
+				default: goto exit;
+				}
+			default:
+				goto exit;
+			}
+		ret:
+			return new MetadataToken (token_type, rid);
+		exit:
+			return MetadataToken.Zero;
+		}
+
+#if !IL_READ_ONLY
+        public static uint CompressMetadataToken (this CodedIndex self, MetadataToken token)
+		{
+			uint ret = 0;
+			if (token.RID == 0)
+				return ret;
+			switch (self) {
+			case CodedIndex.TypeDefOrRef:
+				ret = token.RID << 2;
+				switch (token.TokenType) {
+				case TokenType.TypeDef:
+					return ret | 0;
+				case TokenType.TypeRef:
+					return ret | 1;
+				case TokenType.TypeSpec:
+					return ret | 2;
+				default:
+					goto exit;
+				}
+			case CodedIndex.HasConstant:
+				ret = token.RID << 2;
+				switch (token.TokenType) {
+				case TokenType.Field:
+					return ret | 0;
+				case TokenType.Param:
+					return ret | 1;
+				case TokenType.Property:
+					return ret | 2;
+				default:
+					goto exit;
+				}
+			case CodedIndex.HasCustomAttribute:
+				ret = token.RID << 5;
+				switch (token.TokenType) {
+				case TokenType.Method:
+					return ret | 0;
+				case TokenType.Field:
+					return ret | 1;
+				case TokenType.TypeRef:
+					return ret | 2;
+				case TokenType.TypeDef:
+					return ret | 3;
+				case TokenType.Param:
+					return ret | 4;
+				case TokenType.InterfaceImpl:
+					return ret | 5;
+				case TokenType.MemberRef:
+					return ret | 6;
+				case TokenType.Module:
+					return ret | 7;
+				case TokenType.Permission:
+					return ret | 8;
+				case TokenType.Property:
+					return ret | 9;
+				case TokenType.Event:
+					return ret | 10;
+				case TokenType.Signature:
+					return ret | 11;
+				case TokenType.ModuleRef:
+					return ret | 12;
+				case TokenType.TypeSpec:
+					return ret | 13;
+				case TokenType.Assembly:
+					return ret | 14;
+				case TokenType.AssemblyRef:
+					return ret | 15;
+				case TokenType.File:
+					return ret | 16;
+				case TokenType.ExportedType:
+					return ret | 17;
+				case TokenType.ManifestResource:
+					return ret | 18;
+				case TokenType.GenericParam:
+					return ret | 19;
+				default:
+					goto exit;
+				}
+			case CodedIndex.HasFieldMarshal:
+				ret = token.RID << 1;
+				switch (token.TokenType) {
+				case TokenType.Field:
+					return ret | 0;
+				case TokenType.Param:
+					return ret | 1;
+				default:
+					goto exit;
+				}
+			case CodedIndex.HasDeclSecurity:
+				ret = token.RID << 2;
+				switch (token.TokenType) {
+				case TokenType.TypeDef:
+					return ret | 0;
+				case TokenType.Method:
+					return ret | 1;
+				case TokenType.Assembly:
+					return ret | 2;
+				default:
+					goto exit;
+				}
+			case CodedIndex.MemberRefParent:
+				ret = token.RID << 3;
+				switch (token.TokenType) {
+				case TokenType.TypeDef:
+					return ret | 0;
+				case TokenType.TypeRef:
+					return ret | 1;
+				case TokenType.ModuleRef:
+					return ret | 2;
+				case TokenType.Method:
+					return ret | 3;
+				case TokenType.TypeSpec:
+					return ret | 4;
+				default:
+					goto exit;
+				}
+			case CodedIndex.HasSemantics:
+				ret = token.RID << 1;
+				switch (token.TokenType) {
+				case TokenType.Event:
+					return ret | 0;
+				case TokenType.Property:
+					return ret | 1;
+				default:
+					goto exit;
+				}
+			case CodedIndex.MethodDefOrRef:
+				ret = token.RID << 1;
+				switch (token.TokenType) {
+				case TokenType.Method:
+					return ret | 0;
+				case TokenType.MemberRef:
+					return ret | 1;
+				default:
+					goto exit;
+				}
+			case CodedIndex.MemberForwarded:
+				ret = token.RID << 1;
+				switch (token.TokenType) {
+				case TokenType.Field:
+					return ret | 0;
+				case TokenType.Method:
+					return ret | 1;
+				default:
+					goto exit;
+				}
+			case CodedIndex.Implementation:
+				ret = token.RID << 2;
+				switch (token.TokenType) {
+				case TokenType.File:
+					return ret | 0;
+				case TokenType.AssemblyRef:
+					return ret | 1;
+				case TokenType.ExportedType:
+					return ret | 2;
+				default:
+					goto exit;
+				}
+			case CodedIndex.CustomAttributeType:
+				ret = token.RID << 3;
+				switch (token.TokenType) {
+				case TokenType.Method:
+					return ret | 2;
+				case TokenType.MemberRef:
+					return ret | 3;
+				default:
+					goto exit;
+				}
+			case CodedIndex.ResolutionScope:
+				ret = token.RID << 2;
+				switch (token.TokenType) {
+				case TokenType.Module:
+					return ret | 0;
+				case TokenType.ModuleRef:
+					return ret | 1;
+				case TokenType.AssemblyRef:
+					return ret | 2;
+				case TokenType.TypeRef:
+					return ret | 3;
+				default:
+					goto exit;
+				}
+			case CodedIndex.TypeOrMethodDef:
+				ret = token.RID << 1;
+				switch (token.TokenType) {
+				case TokenType.TypeDef:
+					return ret | 0;
+				case TokenType.Method:
+					return ret | 1;
+				default:
+					goto exit;
+				}
+			default:
+				goto exit;
+			}
+		exit:
+			throw new ArgumentException ();
+		}
+#endif
+
+		public static int GetSize (this CodedIndex self, Func<Table, int> counter)
+		{
+			int bits;
+			Table [] tables;
+
+			switch (self) {
+			case CodedIndex.TypeDefOrRef:
+				bits = 2;
+				tables = new [] { Table.TypeDef, Table.TypeRef, Table.TypeSpec };
+				break;
+			case CodedIndex.HasConstant:
+				bits = 2;
+				tables = new [] { Table.Field, Table.Param, Table.Property };
+				break;
+			case CodedIndex.HasCustomAttribute:
+				bits = 5;
+				tables = new [] {
+					Table.Method, Table.Field, Table.TypeRef, Table.TypeDef, Table.Param, Table.InterfaceImpl, Table.MemberRef,
+					Table.Module, Table.DeclSecurity, Table.Property, Table.Event, Table.StandAloneSig, Table.ModuleRef,
+					Table.TypeSpec, Table.Assembly, Table.AssemblyRef, Table.File, Table.ExportedType,
+					Table.ManifestResource, Table.GenericParam
+				};
+				break;
+			case CodedIndex.HasFieldMarshal:
+				bits = 1;
+				tables = new [] { Table.Field, Table.Param };
+				break;
+			case CodedIndex.HasDeclSecurity:
+				bits = 2;
+				tables = new [] { Table.TypeDef, Table.Method, Table.Assembly };
+				break;
+			case CodedIndex.MemberRefParent:
+				bits = 3;
+				tables = new [] { Table.TypeDef, Table.TypeRef, Table.ModuleRef, Table.Method, Table.TypeSpec };
+				break;
+			case CodedIndex.HasSemantics:
+				bits = 1;
+				tables = new [] { Table.Event, Table.Property };
+				break;
+			case CodedIndex.MethodDefOrRef:
+				bits = 1;
+				tables = new [] { Table.Method, Table.MemberRef };
+				break;
+			case CodedIndex.MemberForwarded:
+				bits = 1;
+				tables = new [] { Table.Field, Table.Method };
+				break;
+			case CodedIndex.Implementation:
+				bits = 2;
+				tables = new [] { Table.File, Table.AssemblyRef, Table.ExportedType };
+				break;
+			case CodedIndex.CustomAttributeType:
+				bits = 3;
+				tables = new [] { Table.Method, Table.MemberRef };
+				break;
+			case CodedIndex.ResolutionScope:
+				bits = 2;
+				tables = new [] { Table.Module, Table.ModuleRef, Table.AssemblyRef, Table.TypeRef };
+				break;
+			case CodedIndex.TypeOrMethodDef:
+				bits = 1;
+				tables = new [] { Table.TypeDef, Table.Method };
+				break;
+			default:
+				throw new ArgumentException ();
+			}
+
+			int max = 0;
+
+			for (int i = 0; i < tables.Length; i++) {
+				max = System.Math.Max (counter (tables [i]), max);
+			}
+
+			return max < (1 << (16 - bits)) ? 2 : 4;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/MetadataResolver.cs b/src/Core/Compiler/Importer/IL/MetadataResolver.cs
new file mode 100644
index 000000000..9a64135ba
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/MetadataResolver.cs
@@ -0,0 +1,318 @@
+//
+// MetadataResolver.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ interface IAssemblyResolver {
+		AssemblyDefinition Resolve (AssemblyNameReference name);
+		AssemblyDefinition Resolve (AssemblyNameReference name, ReaderParameters parameters);
+
+		AssemblyDefinition Resolve (string fullName);
+		AssemblyDefinition Resolve (string fullName, ReaderParameters parameters);
+	}
+
+    internal /* public */ class ResolutionException : Exception {
+
+		readonly MemberReference member;
+
+		public MemberReference Member {
+			get { return member; }
+		}
+
+		public ResolutionException (MemberReference member)
+			: base ("Failed to resolve " + member.FullName)
+		{
+			this.member = member;
+		}
+	}
+
+	static class MetadataResolver {
+
+		public static TypeDefinition Resolve (IAssemblyResolver resolver, TypeReference type)
+		{
+			type = type.GetElementType ();
+
+			var scope = type.Scope;
+			switch (scope.MetadataScopeType) {
+			case MetadataScopeType.AssemblyNameReference:
+				var assembly = resolver.Resolve ((AssemblyNameReference) scope);
+				if (assembly == null)
+					return null;
+
+				return GetType (resolver, assembly.MainModule, type);
+			case MetadataScopeType.ModuleDefinition:
+				return GetType (resolver, (ModuleDefinition) scope, type);
+			case MetadataScopeType.ModuleReference:
+				var modules = type.Module.Assembly.Modules;
+				var module_ref = (ModuleReference) scope;
+				for (int i = 0; i < modules.Count; i++) {
+					var netmodule = modules [i];
+					if (netmodule.Name == module_ref.Name)
+						return GetType (resolver, netmodule, type);
+				}
+				break;
+			}
+
+			throw new NotSupportedException ();
+		}
+
+		static TypeDefinition GetType (IAssemblyResolver resolver, ModuleDefinition module, TypeReference reference)
+		{
+			var type = GetType (module, reference);
+			if (type != null)
+				return type;
+
+			if (!module.HasExportedTypes)
+				return null;
+
+			var exported_types = module.ExportedTypes;
+
+			for (int i = 0; i < exported_types.Count; i++) {
+				var exported_type = exported_types [i];
+				if (exported_type.Name != reference.Name)
+					continue;
+
+				if (exported_type.Namespace != reference.Namespace)
+					continue;
+
+				return exported_type.Resolve ();
+			}
+
+			return null;
+		}
+
+		static TypeDefinition GetType (ModuleDefinition module, TypeReference type)
+		{
+			if (!type.IsNested)
+				return module.GetType (type.Namespace, type.Name);
+
+			var declaring_type = type.DeclaringType.Resolve ();
+			if (declaring_type == null)
+				return null;
+
+			return declaring_type.GetNestedType (type.Name);
+		}
+
+		public static FieldDefinition Resolve (IAssemblyResolver resolver, FieldReference field)
+		{
+			var type = Resolve (resolver, field.DeclaringType);
+			if (type == null)
+				return null;
+
+			if (!type.HasFields)
+				return null;
+
+			return GetField (resolver, type, field);
+		}
+
+		static FieldDefinition GetField (IAssemblyResolver resolver, TypeDefinition type, FieldReference reference)
+		{
+			while (type != null) {
+				var field = GetField (type.Fields, reference);
+				if (field != null)
+					return field;
+
+				if (type.BaseType == null)
+					return null;
+
+				type = Resolve (resolver, type.BaseType);
+			}
+
+			return null;
+		}
+
+		static FieldDefinition GetField (IList<FieldDefinition> fields, FieldReference reference)
+		{
+			for (int i = 0; i < fields.Count; i++) {
+				var field = fields [i];
+
+				if (field.Name != reference.Name)
+					continue;
+
+				if (!AreSame (field.FieldType, reference.FieldType))
+					continue;
+
+				return field;
+			}
+
+			return null;
+		}
+
+		public static MethodDefinition Resolve (IAssemblyResolver resolver, MethodReference method)
+		{
+			var type = Resolve (resolver, method.DeclaringType);
+			if (type == null)
+				return null;
+
+			method = method.GetElementMethod ();
+
+			if (!type.HasMethods)
+				return null;
+
+			return GetMethod (resolver, type, method);
+		}
+
+		static MethodDefinition GetMethod (IAssemblyResolver resolver, TypeDefinition type, MethodReference reference)
+		{
+			while (type != null) {
+				var method = GetMethod (type.Methods, reference);
+				if (method != null)
+					return method;
+
+				if (type.BaseType == null)
+					return null;
+
+				type = Resolve (resolver, type.BaseType);
+			}
+
+			return null;
+		}
+
+		public static MethodDefinition GetMethod (IList<MethodDefinition> methods, MethodReference reference)
+		{
+			for (int i = 0; i < methods.Count; i++) {
+				var method = methods [i];
+
+				if (method.Name != reference.Name)
+					continue;
+
+				if (!AreSame (method.ReturnType, reference.ReturnType))
+					continue;
+
+				if (method.HasParameters != reference.HasParameters)
+					continue;
+
+				if (!method.HasParameters && !reference.HasParameters)
+					return method;
+
+				if (!AreSame (method.Parameters, reference.Parameters))
+					continue;
+
+				return method;
+			}
+
+			return null;
+		}
+
+		static bool AreSame (Collection<ParameterDefinition> a, Collection<ParameterDefinition> b)
+		{
+			var count = a.Count;
+
+			if (count != b.Count)
+				return false;
+
+			if (count == 0)
+				return true;
+
+			for (int i = 0; i < count; i++)
+				if (!AreSame (a [i].ParameterType, b [i].ParameterType))
+					return false;
+
+			return true;
+		}
+
+		static bool AreSame (TypeSpecification a, TypeSpecification b)
+		{
+			if (!AreSame (a.ElementType, b.ElementType))
+				return false;
+
+			if (a.IsGenericInstance)
+				return AreSame ((GenericInstanceType) a, (GenericInstanceType) b);
+
+			if (a.IsRequiredModifier || a.IsOptionalModifier)
+				return AreSame ((IModifierType) a, (IModifierType) b);
+
+			if (a.IsArray)
+				return AreSame ((ArrayType) a, (ArrayType) b);
+
+			return true;
+		}
+
+		static bool AreSame (ArrayType a, ArrayType b)
+		{
+			if (a.Rank != b.Rank)
+				return false;
+
+			// TODO: dimensions
+
+			return true;
+		}
+
+		static bool AreSame (IModifierType a, IModifierType b)
+		{
+			return AreSame (a.ModifierType, b.ModifierType);
+		}
+
+		static bool AreSame (GenericInstanceType a, GenericInstanceType b)
+		{
+			if (a.GenericArguments.Count != b.GenericArguments.Count)
+				return false;
+
+			for (int i = 0; i < a.GenericArguments.Count; i++)
+				if (!AreSame (a.GenericArguments [i], b.GenericArguments [i]))
+					return false;
+
+			return true;
+		}
+
+		static bool AreSame (GenericParameter a, GenericParameter b)
+		{
+			return a.Position == b.Position;
+		}
+
+		static bool AreSame (TypeReference a, TypeReference b)
+		{
+			if (ReferenceEquals (a, b))
+				return true;
+
+			if (a == null || b == null)
+				return false;
+
+			if (a.etype != b.etype)
+				return false;
+
+			if (a.IsGenericParameter)
+				return AreSame ((GenericParameter) a, (GenericParameter) b);
+
+			if (a.IsTypeSpecification ())
+				return AreSame ((TypeSpecification) a, (TypeSpecification) b);
+
+			if (a.Name != b.Name || a.Namespace != b.Namespace)
+				return false;
+
+			//TODO: check scope
+
+			return AreSame (a.DeclaringType, b.DeclaringType);
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/MetadataSystem.cs b/src/Core/Compiler/Importer/IL/MetadataSystem.cs
new file mode 100644
index 000000000..d69c8aa1b
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/MetadataSystem.cs
@@ -0,0 +1,380 @@
+//
+// MetadataSystem.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+
+using ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+	struct Range {
+		public uint Start;
+		public uint Length;
+
+		public Range (uint index, uint length)
+		{
+			this.Start = index;
+			this.Length = length;
+		}
+	}
+
+	sealed class MetadataSystem {
+
+		internal AssemblyNameReference [] AssemblyReferences;
+		internal ModuleReference [] ModuleReferences;
+
+		internal TypeDefinition [] Types;
+		internal TypeReference [] TypeReferences;
+
+		internal FieldDefinition [] Fields;
+		internal MethodDefinition [] Methods;
+		internal MemberReference [] MemberReferences;
+
+		internal Dictionary<uint, uint []> NestedTypes;
+		internal Dictionary<uint, uint> ReverseNestedTypes;
+		internal Dictionary<uint, MetadataToken []> Interfaces;
+		internal Dictionary<uint, Row<ushort, uint>> ClassLayouts;
+		internal Dictionary<uint, uint> FieldLayouts;
+		internal Dictionary<uint, uint> FieldRVAs;
+		internal Dictionary<MetadataToken, uint> FieldMarshals;
+		internal Dictionary<MetadataToken, Row<ElementType, uint>> Constants;
+		internal Dictionary<uint, MetadataToken []> Overrides;
+		internal Dictionary<MetadataToken, Range> CustomAttributes;
+		internal Dictionary<MetadataToken, Range> SecurityDeclarations;
+		internal Dictionary<uint, Range> Events;
+		internal Dictionary<uint, Range> Properties;
+		internal Dictionary<uint, Row<MethodSemanticsAttributes, MetadataToken>> Semantics;
+		internal Dictionary<uint, Row<PInvokeAttributes, uint, uint>> PInvokes;
+		internal Dictionary<MetadataToken, Range> GenericParameters;
+		internal Dictionary<uint, MetadataToken []> GenericConstraints;
+
+		static Dictionary<string, Row<ElementType, bool>> primitive_value_types;
+
+		static void InitializePrimitives ()
+		{
+			primitive_value_types = new Dictionary<string, Row<ElementType, bool>> (18) {
+				{ "Void", new Row<ElementType, bool> (ElementType.Void, false) },
+				{ "Boolean", new Row<ElementType, bool> (ElementType.Boolean, true) },
+				{ "Char", new Row<ElementType, bool> (ElementType.Char, true) },
+				{ "SByte", new Row<ElementType, bool> (ElementType.I1, true) },
+				{ "Byte", new Row<ElementType, bool> (ElementType.U1, true) },
+				{ "Int16", new Row<ElementType, bool> (ElementType.I2, true) },
+				{ "UInt16", new Row<ElementType, bool> (ElementType.U2, true) },
+				{ "Int32", new Row<ElementType, bool> (ElementType.I4, true) },
+				{ "UInt32", new Row<ElementType, bool> (ElementType.U4, true) },
+				{ "Int64", new Row<ElementType, bool> (ElementType.I8, true) },
+				{ "UInt64", new Row<ElementType, bool> (ElementType.U8, true) },
+				{ "Single", new Row<ElementType, bool> (ElementType.R4, true) },
+				{ "Double", new Row<ElementType, bool> (ElementType.R8, true) },
+				{ "String", new Row<ElementType, bool> (ElementType.String, false) },
+				{ "TypedReference", new Row<ElementType, bool> (ElementType.TypedByRef, false) },
+				{ "IntPtr", new Row<ElementType, bool> (ElementType.I, true) },
+				{ "UIntPtr", new Row<ElementType, bool> (ElementType.U, true) },
+				{ "Object", new Row<ElementType, bool> (ElementType.Object, false) },
+			};
+		}
+
+		public static void TryProcessPrimitiveType (TypeReference type)
+		{
+			var scope = type.scope;
+			if (scope == null)
+				return;
+
+			if (scope.MetadataScopeType != MetadataScopeType.AssemblyNameReference)
+				return;
+
+			if (scope.Name != "mscorlib")
+				return;
+
+			if (type.Namespace != "System")
+				return;
+
+			if (primitive_value_types == null)
+				InitializePrimitives ();
+
+			Row<ElementType, bool> primitive_data;
+			if (!primitive_value_types.TryGetValue (type.Name, out primitive_data))
+				return;
+
+			type.etype = primitive_data.Col1;
+			type.IsValueType = primitive_data.Col2;
+		}
+
+		public void Clear ()
+		{
+			if (NestedTypes != null) NestedTypes.Clear ();
+			if (ReverseNestedTypes != null) ReverseNestedTypes.Clear ();
+			if (Interfaces != null) Interfaces.Clear ();
+			if (ClassLayouts != null) ClassLayouts.Clear ();
+			if (FieldLayouts != null) FieldLayouts.Clear ();
+			if (FieldRVAs != null) FieldRVAs.Clear ();
+			if (FieldMarshals != null) FieldMarshals.Clear ();
+			if (Constants != null) Constants.Clear ();
+			if (Overrides != null) Overrides.Clear ();
+			if (CustomAttributes != null) CustomAttributes.Clear ();
+			if (SecurityDeclarations != null) SecurityDeclarations.Clear ();
+			if (Events != null) Events.Clear ();
+			if (Properties != null) Properties.Clear ();
+			if (Semantics != null) Semantics.Clear ();
+			if (PInvokes != null) PInvokes.Clear ();
+			if (GenericParameters != null) GenericParameters.Clear ();
+			if (GenericConstraints != null) GenericConstraints.Clear ();
+		}
+
+		public TypeDefinition GetTypeDefinition (uint rid)
+		{
+			if (rid < 1 || rid > Types.Length)
+				return null;
+
+			return Types [rid - 1];
+		}
+
+		public void AddTypeDefinition (TypeDefinition type)
+		{
+			Types [type.token.RID - 1] = type;
+		}
+
+		public TypeReference GetTypeReference (uint rid)
+		{
+			if (rid < 1 || rid > TypeReferences.Length)
+				return null;
+
+			return TypeReferences [rid - 1];
+		}
+
+		public void AddTypeReference (TypeReference type)
+		{
+			TypeReferences [type.token.RID - 1] = type;
+		}
+
+		public FieldDefinition GetFieldDefinition (uint rid)
+		{
+			if (rid < 1 || rid > Fields.Length)
+				return null;
+
+			return Fields [rid - 1];
+		}
+
+		public void AddFieldDefinition (FieldDefinition field)
+		{
+			Fields [field.token.RID - 1] = field;
+		}
+
+		public MethodDefinition GetMethodDefinition (uint rid)
+		{
+			if (rid < 1 || rid > Methods.Length)
+				return null;
+
+			return Methods [rid - 1];
+		}
+
+		public void AddMethodDefinition (MethodDefinition method)
+		{
+			Methods [method.token.RID - 1] = method;
+		}
+
+		public MemberReference GetMemberReference (uint rid)
+		{
+			if (rid < 1 || rid > MemberReferences.Length)
+				return null;
+
+			return MemberReferences [rid - 1];
+		}
+
+		public void AddMemberReference (MemberReference member)
+		{
+			MemberReferences [member.token.RID - 1] = member;
+		}
+
+		public bool TryGetNestedTypeMapping (TypeDefinition type, out uint [] mapping)
+		{
+			return NestedTypes.TryGetValue (type.token.RID, out mapping);
+		}
+
+		public void SetNestedTypeMapping (uint type_rid, uint [] mapping)
+		{
+			NestedTypes [type_rid] = mapping;
+		}
+
+		public void RemoveNestedTypeMapping (TypeDefinition type)
+		{
+			NestedTypes.Remove (type.token.RID);
+		}
+
+		public bool TryGetReverseNestedTypeMapping (TypeDefinition type, out uint declaring)
+		{
+			return ReverseNestedTypes.TryGetValue (type.token.RID, out declaring);
+		}
+
+		public void SetReverseNestedTypeMapping (uint nested, uint declaring)
+		{
+			ReverseNestedTypes.Add (nested, declaring);
+		}
+
+		public void RemoveReverseNestedTypeMapping (TypeDefinition type)
+		{
+			ReverseNestedTypes.Remove (type.token.RID);
+		}
+
+		public bool TryGetInterfaceMapping (TypeDefinition type, out MetadataToken [] mapping)
+		{
+			return Interfaces.TryGetValue (type.token.RID, out mapping);
+		}
+
+		public void SetInterfaceMapping (uint type_rid, MetadataToken [] mapping)
+		{
+			Interfaces [type_rid] = mapping;
+		}
+
+		public void RemoveInterfaceMapping (TypeDefinition type)
+		{
+			Interfaces.Remove (type.token.RID);
+		}
+
+		public void AddPropertiesRange (uint type_rid, Range range)
+		{
+			Properties.Add (type_rid, range);
+		}
+
+		public bool TryGetPropertiesRange (TypeDefinition type, out Range range)
+		{
+			return Properties.TryGetValue (type.token.RID, out range);
+		}
+
+		public void RemovePropertiesRange (TypeDefinition type)
+		{
+			Properties.Remove (type.token.RID);
+		}
+
+		public void AddEventsRange (uint type_rid, Range range)
+		{
+			Events.Add (type_rid, range);
+		}
+
+		public bool TryGetEventsRange (TypeDefinition type, out Range range)
+		{
+			return Events.TryGetValue (type.token.RID, out range);
+		}
+
+		public void RemoveEventsRange (TypeDefinition type)
+		{
+			Events.Remove (type.token.RID);
+		}
+
+		public bool TryGetGenericParameterRange (IGenericParameterProvider owner, out Range range)
+		{
+			return GenericParameters.TryGetValue (owner.MetadataToken, out range);
+		}
+
+		public void RemoveGenericParameterRange (IGenericParameterProvider owner)
+		{
+			GenericParameters.Remove (owner.MetadataToken);
+		}
+
+		public bool TryGetCustomAttributeRange (ICustomAttributeProvider owner, out Range range)
+		{
+			return CustomAttributes.TryGetValue (owner.MetadataToken, out range);
+		}
+
+		public void RemoveCustomAttributeRange (ICustomAttributeProvider owner)
+		{
+			CustomAttributes.Remove (owner.MetadataToken);
+		}
+
+		public bool TryGetSecurityDeclarationRange (ISecurityDeclarationProvider owner, out Range range)
+		{
+			return SecurityDeclarations.TryGetValue (owner.MetadataToken, out range);
+		}
+
+		public void RemoveSecurityDeclarationRange (ISecurityDeclarationProvider owner)
+		{
+			SecurityDeclarations.Remove (owner.MetadataToken);
+		}
+
+		public bool TryGetGenericConstraintMapping (GenericParameter generic_parameter, out MetadataToken [] mapping)
+		{
+			return GenericConstraints.TryGetValue (generic_parameter.token.RID, out mapping);
+		}
+
+		public void SetGenericConstraintMapping (uint gp_rid, MetadataToken [] mapping)
+		{
+			GenericConstraints [gp_rid] = mapping;
+		}
+
+		public void RemoveGenericConstraintMapping (GenericParameter generic_parameter)
+		{
+			GenericConstraints.Remove (generic_parameter.token.RID);
+		}
+
+		public bool TryGetOverrideMapping (MethodDefinition method, out MetadataToken [] mapping)
+		{
+			return Overrides.TryGetValue (method.token.RID, out mapping);
+		}
+
+		public void SetOverrideMapping (uint rid, MetadataToken [] mapping)
+		{
+			Overrides [rid] = mapping;
+		}
+
+		public void RemoveOverrideMapping (MethodDefinition method)
+		{
+			Overrides.Remove (method.token.RID);
+		}
+
+		public TypeDefinition GetFieldDeclaringType (uint field_rid)
+		{
+			return BinaryRangeSearch (Types, field_rid, true);
+		}
+
+		public TypeDefinition GetMethodDeclaringType (uint method_rid)
+		{
+			return BinaryRangeSearch (Types, method_rid, false);
+		}
+
+		static TypeDefinition BinaryRangeSearch (TypeDefinition [] types, uint rid, bool field)
+		{
+			int min = 0;
+			int max = types.Length - 1;
+			while (min <= max) {
+				int mid = min + ((max - min) / 2);
+				var type = types [mid];
+				var range = field ? type.fields_range : type.methods_range;
+
+				if (rid < range.Start)
+					max = mid - 1;
+				else if (rid >= range.Start + range.Length)
+					min = mid + 1;
+				else
+					return type;
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/MethodAttributes.cs b/src/Core/Compiler/Importer/IL/MethodAttributes.cs
new file mode 100644
index 000000000..718382a3a
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/MethodAttributes.cs
@@ -0,0 +1,66 @@
+//
+// MethodAttributes.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+	[Flags]
+    internal /* public */ enum MethodAttributes : ushort {
+		MemberAccessMask	= 0x0007,
+		CompilerControlled	= 0x0000,	// Member not referenceable
+		Private				= 0x0001,	// Accessible only by the parent type
+		FamANDAssem			= 0x0002,	// Accessible by sub-types only in this Assembly
+		Assembly				= 0x0003,	// Accessibly by anyone in the Assembly
+		Family				= 0x0004,	// Accessible only by type and sub-types
+		FamORAssem			= 0x0005,	// Accessibly by sub-types anywhere, plus anyone in assembly
+		Public				= 0x0006,	// Accessibly by anyone who has visibility to this scope
+
+		Static				= 0x0010,	// Defined on type, else per instance
+		Final				= 0x0020,	// Method may not be overridden
+		Virtual				= 0x0040,	// Method is virtual
+		HideBySig			= 0x0080,	// Method hides by name+sig, else just by name
+
+		VtableLayoutMask	= 0x0100,	// Use this mask to retrieve vtable attributes
+		ReuseSlot			= 0x0000,	// Method reuses existing slot in vtable
+		NewSlot				= 0x0100,	// Method always gets a new slot in the vtable
+
+		CheckAccessOnOverride = 0x0200,   // Method can only be overriden if also accessible
+		Abstract			= 0x0400,	// Method does not provide an implementation
+		SpecialName			= 0x0800,	// Method is special
+
+		// Interop Attributes
+		PInvokeImpl			= 0x2000,	// Implementation is forwarded through PInvoke
+		UnmanagedExport		= 0x0008,	// Reserved: shall be zero for conforming implementations
+
+		// Additional flags
+		RTSpecialName		= 0x1000,	// CLI provides 'special' behavior, depending upon the name of the method
+		HasSecurity			= 0x4000,	// Method has security associate with it
+		RequireSecObject	= 0x8000	 // Method calls another method containing security code
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/MethodCallingConvention.cs b/src/Core/Compiler/Importer/IL/MethodCallingConvention.cs
new file mode 100644
index 000000000..5e6b66bed
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/MethodCallingConvention.cs
@@ -0,0 +1,40 @@
+//
+// MethodCallingConvention.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ enum MethodCallingConvention : byte {
+		Default		= 0x0,
+		C			= 0x1,
+		StdCall		= 0x2,
+		ThisCall	= 0x3,
+		FastCall	= 0x4,
+		VarArg		= 0x5,
+		Generic		= 0x10,
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/MethodDefinition.cs b/src/Core/Compiler/Importer/IL/MethodDefinition.cs
new file mode 100644
index 000000000..bc96d779f
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/MethodDefinition.cs
@@ -0,0 +1,487 @@
+//
+// MethodDefinition.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using ScriptSharp.Importer.IL.Cil;
+using ScriptSharp.Collections.Generic;
+
+using RVA = System.UInt32;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class MethodDefinition : MethodReference, IMemberDefinition, ISecurityDeclarationProvider {
+
+		ushort attributes;
+		ushort impl_attributes;
+		internal MethodSemanticsAttributes? sem_attrs;
+		Collection<CustomAttribute> custom_attributes;
+		Collection<SecurityDeclaration> security_declarations;
+
+		internal RVA rva;
+		internal PInvokeInfo pinvoke;
+		Collection<MethodReference> overrides;
+
+		internal MethodBody body;
+
+		public MethodAttributes Attributes {
+			get { return (MethodAttributes) attributes; }
+			set { attributes = (ushort) value; }
+		}
+
+		public MethodImplAttributes ImplAttributes {
+			get { return (MethodImplAttributes) impl_attributes; }
+			set { impl_attributes = (ushort) value; }
+		}
+
+		public MethodSemanticsAttributes SemanticsAttributes {
+			get {
+				if (sem_attrs.HasValue)
+					return sem_attrs.Value;
+
+				if (HasImage) {
+					ReadSemantics ();
+					return sem_attrs.Value;
+				}
+
+				sem_attrs = MethodSemanticsAttributes.None;
+				return sem_attrs.Value;
+			}
+			set { sem_attrs = value; }
+		}
+
+		internal void ReadSemantics ()
+		{
+			if (sem_attrs.HasValue)
+				return;
+
+			var module = this.Module;
+			if (module == null)
+				return;
+
+			if (!module.HasImage)
+				return;
+
+			module.Read (this, (method, reader) => reader.ReadAllSemantics (method));
+		}
+
+		public bool HasSecurityDeclarations {
+			get {
+				if (security_declarations != null)
+					return security_declarations.Count > 0;
+
+				return this.GetHasSecurityDeclarations (Module);
+			}
+		}
+
+		public Collection<SecurityDeclaration> SecurityDeclarations {
+			get { return security_declarations ?? (security_declarations = this.GetSecurityDeclarations (Module)); }
+		}
+
+		public bool HasCustomAttributes {
+			get {
+				if (custom_attributes != null)
+					return custom_attributes.Count > 0;
+
+				return this.GetHasCustomAttributes (Module);
+			}
+		}
+
+		public Collection<CustomAttribute> CustomAttributes {
+			get { return custom_attributes ?? (custom_attributes = this.GetCustomAttributes (Module)); }
+		}
+
+		public int RVA {
+			get { return (int) rva; }
+		}
+
+		public bool HasBody {
+			get {
+				return (attributes & (ushort) MethodAttributes.Abstract) == 0 &&
+					(attributes & (ushort) MethodAttributes.PInvokeImpl) == 0 &&
+					(impl_attributes & (ushort) MethodImplAttributes.InternalCall) == 0 &&
+					(impl_attributes & (ushort) MethodImplAttributes.Native) == 0 &&
+					(impl_attributes & (ushort) MethodImplAttributes.Unmanaged) == 0 &&
+					(impl_attributes & (ushort) MethodImplAttributes.Runtime) == 0;
+			}
+		}
+
+		public MethodBody Body {
+			get {
+				if (body != null)
+					return body;
+
+				if (!HasBody)
+					return null;
+
+				if (HasImage && rva != 0)
+					return body = Module.Read (this, (method, reader) => reader.ReadMethodBody (method));
+
+				return body = new MethodBody (this);
+			}
+			set { body = value; }
+		}
+
+		public bool HasPInvokeInfo {
+			get {
+				if (pinvoke != null)
+					return true;
+
+				return IsPInvokeImpl;
+			}
+		}
+
+		public PInvokeInfo PInvokeInfo {
+			get {
+				if (pinvoke != null)
+					return pinvoke;
+
+				if (HasImage && IsPInvokeImpl)
+					return pinvoke = Module.Read (this, (method, reader) => reader.ReadPInvokeInfo (method));
+
+				return null;
+			}
+			set {
+				IsPInvokeImpl = true;
+				pinvoke = value;
+			}
+		}
+
+		public bool HasOverrides {
+			get {
+				if (overrides != null)
+					return overrides.Count > 0;
+
+				if (HasImage)
+					return Module.Read (this, (method, reader) => reader.HasOverrides (method));
+
+				return false;
+			}
+		}
+
+		public Collection<MethodReference> Overrides {
+			get {
+				if (overrides != null)
+					return overrides;
+
+				if (HasImage)
+					return overrides = Module.Read (this, (method, reader) => reader.ReadOverrides (method));
+
+				return overrides = new Collection<MethodReference> ();
+			}
+		}
+
+		public override bool HasGenericParameters {
+			get {
+				if (generic_parameters != null)
+					return generic_parameters.Count > 0;
+
+				return this.GetHasGenericParameters (Module);
+			}
+		}
+
+		public override Collection<GenericParameter> GenericParameters {
+			get { return generic_parameters ?? (generic_parameters = this.GetGenericParameters (Module)); }
+		}
+
+		#region MethodAttributes
+
+		public bool IsCompilerControlled {
+			get { return attributes.GetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.CompilerControlled); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.CompilerControlled, value); }
+		}
+
+		public bool IsPrivate {
+			get { return attributes.GetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.Private); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.Private, value); }
+		}
+
+		public bool IsFamilyAndAssembly {
+			get { return attributes.GetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.FamANDAssem); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.FamANDAssem, value); }
+		}
+
+		public bool IsAssembly {
+			get { return attributes.GetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.Assembly); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.Assembly, value); }
+		}
+
+		public bool IsFamily {
+			get { return attributes.GetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.Family); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.Family, value); }
+		}
+
+		public bool IsFamilyOrAssembly {
+			get { return attributes.GetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.FamORAssem); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.FamORAssem, value); }
+		}
+
+		public bool IsPublic {
+			get { return attributes.GetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.Public); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) MethodAttributes.MemberAccessMask, (ushort) MethodAttributes.Public, value); }
+		}
+
+		public bool IsStatic {
+			get { return attributes.GetAttributes ((ushort) MethodAttributes.Static); }
+			set { attributes = attributes.SetAttributes ((ushort) MethodAttributes.Static, value); }
+		}
+
+		public bool IsFinal {
+			get { return attributes.GetAttributes ((ushort) MethodAttributes.Final); }
+			set { attributes = attributes.SetAttributes ((ushort) MethodAttributes.Final, value); }
+		}
+
+		public bool IsVirtual {
+			get { return attributes.GetAttributes ((ushort) MethodAttributes.Virtual); }
+			set { attributes = attributes.SetAttributes ((ushort) MethodAttributes.Virtual, value); }
+		}
+
+		public bool IsHideBySig {
+			get { return attributes.GetAttributes ((ushort) MethodAttributes.HideBySig); }
+			set { attributes = attributes.SetAttributes ((ushort) MethodAttributes.HideBySig, value); }
+		}
+
+		public bool IsReuseSlot {
+			get { return attributes.GetMaskedAttributes ((ushort) MethodAttributes.VtableLayoutMask, (ushort) MethodAttributes.ReuseSlot); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) MethodAttributes.VtableLayoutMask, (ushort) MethodAttributes.ReuseSlot, value); }
+		}
+
+		public bool IsNewSlot {
+			get { return attributes.GetMaskedAttributes ((ushort) MethodAttributes.VtableLayoutMask, (ushort) MethodAttributes.NewSlot); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) MethodAttributes.VtableLayoutMask, (ushort) MethodAttributes.NewSlot, value); }
+		}
+
+		public bool IsCheckAccessOnOverride {
+			get { return attributes.GetAttributes ((ushort) MethodAttributes.CheckAccessOnOverride); }
+			set { attributes = attributes.SetAttributes ((ushort) MethodAttributes.CheckAccessOnOverride, value); }
+		}
+
+		public bool IsAbstract {
+			get { return attributes.GetAttributes ((ushort) MethodAttributes.Abstract); }
+			set { attributes = attributes.SetAttributes ((ushort) MethodAttributes.Abstract, value); }
+		}
+
+		public bool IsSpecialName {
+			get { return attributes.GetAttributes ((ushort) MethodAttributes.SpecialName); }
+			set { attributes = attributes.SetAttributes ((ushort) MethodAttributes.SpecialName, value); }
+		}
+
+		public bool IsPInvokeImpl {
+			get { return attributes.GetAttributes ((ushort) MethodAttributes.PInvokeImpl); }
+			set { attributes = attributes.SetAttributes ((ushort) MethodAttributes.PInvokeImpl, value); }
+		}
+
+		public bool IsUnmanagedExport {
+			get { return attributes.GetAttributes ((ushort) MethodAttributes.UnmanagedExport); }
+			set { attributes = attributes.SetAttributes ((ushort) MethodAttributes.UnmanagedExport, value); }
+		}
+
+		public bool IsRuntimeSpecialName {
+			get { return attributes.GetAttributes ((ushort) MethodAttributes.RTSpecialName); }
+			set { attributes = attributes.SetAttributes ((ushort) MethodAttributes.RTSpecialName, value); }
+		}
+
+		public bool HasSecurity {
+			get { return attributes.GetAttributes ((ushort) MethodAttributes.HasSecurity); }
+			set { attributes = attributes.SetAttributes ((ushort) MethodAttributes.HasSecurity, value); }
+		}
+
+		#endregion
+
+		#region MethodImplAttributes
+
+		public bool IsIL {
+			get { return impl_attributes.GetMaskedAttributes ((ushort) MethodImplAttributes.CodeTypeMask, (ushort) MethodImplAttributes.IL); }
+			set { impl_attributes = impl_attributes.SetMaskedAttributes ((ushort) MethodImplAttributes.CodeTypeMask, (ushort) MethodImplAttributes.IL, value); }
+		}
+
+		public bool IsNative {
+			get { return impl_attributes.GetMaskedAttributes ((ushort) MethodImplAttributes.CodeTypeMask, (ushort) MethodImplAttributes.Native); }
+			set { impl_attributes = impl_attributes.SetMaskedAttributes ((ushort) MethodImplAttributes.CodeTypeMask, (ushort) MethodImplAttributes.Native, value); }
+		}
+
+		public bool IsRuntime {
+			get { return impl_attributes.GetMaskedAttributes ((ushort) MethodImplAttributes.CodeTypeMask, (ushort) MethodImplAttributes.Runtime); }
+			set { impl_attributes = impl_attributes.SetMaskedAttributes ((ushort) MethodImplAttributes.CodeTypeMask, (ushort) MethodImplAttributes.Runtime, value); }
+		}
+
+		public bool IsUnmanaged {
+			get { return impl_attributes.GetMaskedAttributes ((ushort) MethodImplAttributes.ManagedMask, (ushort) MethodImplAttributes.Unmanaged); }
+			set { impl_attributes = impl_attributes.SetMaskedAttributes ((ushort) MethodImplAttributes.ManagedMask, (ushort) MethodImplAttributes.Unmanaged, value); }
+		}
+
+		public bool IsManaged {
+			get { return impl_attributes.GetMaskedAttributes ((ushort) MethodImplAttributes.ManagedMask, (ushort) MethodImplAttributes.Managed); }
+			set { impl_attributes = impl_attributes.SetMaskedAttributes ((ushort) MethodImplAttributes.ManagedMask, (ushort) MethodImplAttributes.Managed, value); }
+		}
+
+		public bool IsForwardRef {
+			get { return impl_attributes.GetAttributes ((ushort) MethodImplAttributes.ForwardRef); }
+			set { impl_attributes = impl_attributes.SetAttributes ((ushort) MethodImplAttributes.ForwardRef, value); }
+		}
+
+		public bool IsPreserveSig {
+			get { return impl_attributes.GetAttributes ((ushort) MethodImplAttributes.PreserveSig); }
+			set { impl_attributes = impl_attributes.SetAttributes ((ushort) MethodImplAttributes.PreserveSig, value); }
+		}
+
+		public bool IsInternalCall {
+			get { return impl_attributes.GetAttributes ((ushort) MethodImplAttributes.InternalCall); }
+			set { impl_attributes = impl_attributes.SetAttributes ((ushort) MethodImplAttributes.InternalCall, value); }
+		}
+
+		public bool IsSynchronized {
+			get { return impl_attributes.GetAttributes ((ushort) MethodImplAttributes.Synchronized); }
+			set { impl_attributes = impl_attributes.SetAttributes ((ushort) MethodImplAttributes.Synchronized, value); }
+		}
+
+		public bool NoInlining {
+			get { return impl_attributes.GetAttributes ((ushort) MethodImplAttributes.NoInlining); }
+			set { impl_attributes = impl_attributes.SetAttributes ((ushort) MethodImplAttributes.NoInlining, value); }
+		}
+
+		public bool NoOptimization {
+			get { return impl_attributes.GetAttributes ((ushort) MethodImplAttributes.NoOptimization); }
+			set { impl_attributes = impl_attributes.SetAttributes ((ushort) MethodImplAttributes.NoOptimization, value); }
+		}
+
+		#endregion
+
+		#region MethodSemanticsAttributes
+
+		public bool IsSetter {
+			get { return this.GetSemantics (MethodSemanticsAttributes.Setter); }
+			set { this.SetSemantics (MethodSemanticsAttributes.Setter, value); }
+		}
+
+		public bool IsGetter {
+			get { return this.GetSemantics (MethodSemanticsAttributes.Getter); }
+			set { this.SetSemantics (MethodSemanticsAttributes.Getter, value); }
+		}
+
+		public bool IsOther {
+			get { return this.GetSemantics (MethodSemanticsAttributes.Other); }
+			set { this.SetSemantics (MethodSemanticsAttributes.Other, value); }
+		}
+
+		public bool IsAddOn {
+			get { return this.GetSemantics (MethodSemanticsAttributes.AddOn); }
+			set { this.SetSemantics (MethodSemanticsAttributes.AddOn, value); }
+		}
+
+		public bool IsRemoveOn {
+			get { return this.GetSemantics (MethodSemanticsAttributes.RemoveOn); }
+			set { this.SetSemantics (MethodSemanticsAttributes.RemoveOn, value); }
+		}
+
+		public bool IsFire {
+			get { return this.GetSemantics (MethodSemanticsAttributes.Fire); }
+			set { this.SetSemantics (MethodSemanticsAttributes.Fire, value); }
+		}
+
+		#endregion
+
+		public new TypeDefinition DeclaringType {
+			get { return (TypeDefinition) base.DeclaringType; }
+			set { base.DeclaringType = value; }
+		}
+
+		public bool IsConstructor {
+			get {
+				return this.IsRuntimeSpecialName
+					&& this.IsSpecialName
+					&& (this.Name == ".cctor" || this.Name == ".ctor");
+			}
+		}
+
+		public override bool IsDefinition {
+			get { return true; }
+		}
+
+		internal MethodDefinition ()
+		{
+			this.token = new MetadataToken (TokenType.Method);
+		}
+
+		public MethodDefinition (string name, MethodAttributes attributes, TypeReference returnType)
+			: base (name, returnType)
+		{
+			this.attributes = (ushort) attributes;
+			this.HasThis = !this.IsStatic;
+			this.token = new MetadataToken (TokenType.Method);
+		}
+
+		public override MethodDefinition Resolve ()
+		{
+			return this;
+		}
+	}
+
+	static partial class Mixin {
+
+		public static ParameterDefinition GetParameter (this MethodBody self, int index)
+		{
+			var method = self.method;
+
+			if (method.HasThis) {
+				if (index == 0)
+					return self.ThisParameter;
+
+				index--;
+			}
+
+			var parameters = method.Parameters;
+
+			if (index < 0 || index >= parameters.size)
+				return null;
+
+			return parameters [index];
+		}
+
+		public static VariableDefinition GetVariable (this MethodBody self, int index)
+		{
+			var variables = self.Variables;
+
+			if (index < 0 || index >= variables.size)
+				return null;
+
+			return variables [index];
+		}
+
+		public static bool GetSemantics (this MethodDefinition self, MethodSemanticsAttributes semantics)
+		{
+			return (self.SemanticsAttributes & semantics) != 0;
+		}
+
+		public static void SetSemantics (this MethodDefinition self, MethodSemanticsAttributes semantics, bool value)
+		{
+			if (value)
+				self.SemanticsAttributes |= semantics;
+			else
+				self.SemanticsAttributes &= ~semantics;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/MethodImplAttributes.cs b/src/Core/Compiler/Importer/IL/MethodImplAttributes.cs
new file mode 100644
index 000000000..0d0c42b98
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/MethodImplAttributes.cs
@@ -0,0 +1,54 @@
+//
+// MethodImplAttributes.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+	[Flags]
+    internal /* public */ enum MethodImplAttributes : ushort {
+		CodeTypeMask		= 0x0003,
+		IL					= 0x0000,	// Method impl is CIL
+		Native				= 0x0001,	// Method impl is native
+		OPTIL				= 0x0002,	// Reserved: shall be zero in conforming implementations
+		Runtime				= 0x0003,	// Method impl is provided by the runtime
+
+		ManagedMask			= 0x0004,	// Flags specifying whether the code is managed or unmanaged
+		Unmanaged			= 0x0004,	// Method impl is unmanaged, otherwise managed
+		Managed				= 0x0000,	// Method impl is managed
+
+		// Implementation info and interop
+		ForwardRef			= 0x0010,	// Indicates method is defined; used primarily in merge scenarios
+		PreserveSig			= 0x0080,	// Reserved: conforming implementations may ignore
+		InternalCall		= 0x1000,	// Reserved: shall be zero in conforming implementations
+		Synchronized		= 0x0020,	// Method is single threaded through the body
+		NoOptimization		= 0x0040,	// Method is not optimized by the JIT.
+		NoInlining			= 0x0008,	// Method may not be inlined
+		MaxMethodImplVal	= 0xffff	 // Range check value
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/MethodReference.cs b/src/Core/Compiler/Importer/IL/MethodReference.cs
new file mode 100644
index 000000000..be1d84c36
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/MethodReference.cs
@@ -0,0 +1,214 @@
+//
+// MethodReference.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Text;
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ class MethodReference : MemberReference, IMethodSignature, IGenericParameterProvider, IGenericContext {
+
+		internal ParameterDefinitionCollection parameters;
+		MethodReturnType return_type;
+
+		bool has_this;
+		bool explicit_this;
+		MethodCallingConvention calling_convention;
+		internal Collection<GenericParameter> generic_parameters;
+
+		public virtual bool HasThis {
+			get { return has_this; }
+			set { has_this = value; }
+		}
+
+		public virtual bool ExplicitThis {
+			get { return explicit_this; }
+			set { explicit_this = value; }
+		}
+
+		public virtual MethodCallingConvention CallingConvention {
+			get { return calling_convention; }
+			set { calling_convention = value; }
+		}
+
+		public virtual bool HasParameters {
+			get { return !parameters.IsNullOrEmpty (); }
+		}
+
+		public virtual Collection<ParameterDefinition> Parameters {
+			get {
+				if (parameters == null)
+					parameters = new ParameterDefinitionCollection (this);
+
+				return parameters;
+			}
+		}
+
+		IGenericParameterProvider IGenericContext.Type {
+			get {
+				var declaring_type = this.DeclaringType;
+				var instance = declaring_type as GenericInstanceType;
+				if (instance != null)
+					return instance.ElementType;
+
+				return declaring_type;
+			}
+		}
+
+		IGenericParameterProvider IGenericContext.Method {
+			get { return this; }
+		}
+
+		GenericParameterType IGenericParameterProvider.GenericParameterType {
+			get { return GenericParameterType.Method; }
+		}
+
+		public virtual bool HasGenericParameters {
+			get { return !generic_parameters.IsNullOrEmpty (); }
+		}
+
+		public virtual Collection<GenericParameter> GenericParameters {
+			get {
+				if (generic_parameters != null)
+					return generic_parameters;
+
+				return generic_parameters = new Collection<GenericParameter> ();
+			}
+		}
+
+		public TypeReference ReturnType {
+			get {
+				var return_type = MethodReturnType;
+				return return_type != null ? return_type.ReturnType : null;
+			}
+			set {
+				var return_type = MethodReturnType;
+				if (return_type != null)
+					return_type.ReturnType = value;
+			}
+		}
+
+		public virtual MethodReturnType MethodReturnType {
+			get { return return_type; }
+			set { return_type = value; }
+		}
+
+		public override string FullName {
+			get {
+				var builder = new StringBuilder ();
+				builder.Append (ReturnType.FullName)
+					.Append (" ")
+					.Append (MemberFullName ());
+				this.MethodSignatureFullName (builder);
+				return builder.ToString ();
+			}
+		}
+
+		public virtual bool IsGenericInstance {
+			get { return false; }
+		}
+
+		internal override bool ContainsGenericParameter {
+			get {
+				if (this.ReturnType.ContainsGenericParameter || base.ContainsGenericParameter)
+					return true;
+
+				var parameters = this.Parameters;
+
+				for (int i = 0; i < parameters.Count; i++)
+					if (parameters [i].ParameterType.ContainsGenericParameter)
+						return true;
+
+				return false;
+			}
+		}
+
+		internal MethodReference ()
+		{
+			this.return_type = new MethodReturnType (this);
+			this.token = new MetadataToken (TokenType.MemberRef);
+		}
+
+		public MethodReference (string name, TypeReference returnType)
+			: base (name)
+		{
+			if (returnType == null)
+				throw new ArgumentNullException ("returnType");
+
+			this.return_type = new MethodReturnType (this);
+			this.return_type.ReturnType = returnType;
+			this.token = new MetadataToken (TokenType.MemberRef);
+		}
+
+		public MethodReference (string name, TypeReference returnType, TypeReference declaringType)
+			: this (name, returnType)
+		{
+			if (declaringType == null)
+				throw new ArgumentNullException ("declaringType");
+
+			this.DeclaringType = declaringType;
+		}
+
+		public virtual MethodReference GetElementMethod ()
+		{
+			return this;
+		}
+
+		public virtual MethodDefinition Resolve ()
+		{
+			var module = this.Module;
+			if (module == null)
+				throw new NotSupportedException ();
+
+			return module.Resolve (this);
+		}
+	}
+
+	static partial class Mixin {
+
+		public static bool IsVarArg (this IMethodSignature self)
+		{
+			return (self.CallingConvention & MethodCallingConvention.VarArg) != 0;
+		}
+
+		public static int GetSentinelPosition (this IMethodSignature self)
+		{
+			if (!self.HasParameters)
+				return -1;
+
+			var parameters = self.Parameters;
+			for (int i = 0; i < parameters.Count; i++)
+				if (parameters [i].ParameterType.IsSentinel)
+					return i;
+
+			return -1;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/MethodReturnType.cs b/src/Core/Compiler/Importer/IL/MethodReturnType.cs
new file mode 100644
index 000000000..cd827cbcb
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/MethodReturnType.cs
@@ -0,0 +1,100 @@
+//
+// MethodReturnType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class MethodReturnType : IConstantProvider, ICustomAttributeProvider, IMarshalInfoProvider {
+
+		internal IMethodSignature method;
+		internal ParameterDefinition parameter;
+		TypeReference return_type;
+
+		public IMethodSignature Method {
+			get { return method; }
+		}
+
+		public TypeReference ReturnType {
+			get { return return_type; }
+			set { return_type = value; }
+		}
+
+		internal ParameterDefinition Parameter {
+			get { return parameter ?? (parameter = new ParameterDefinition (return_type)); }
+			set { parameter = value; }
+		}
+
+		public MetadataToken MetadataToken {
+			get { return Parameter.MetadataToken; }
+			set { Parameter.MetadataToken = value; }
+		}
+
+		public bool HasCustomAttributes {
+			get { return parameter != null && parameter.HasCustomAttributes; }
+		}
+
+		public Collection<CustomAttribute> CustomAttributes {
+			get { return Parameter.CustomAttributes; }
+		}
+
+		public bool HasDefault {
+			get { return parameter != null && parameter.HasDefault; }
+			set { Parameter.HasDefault = value; }
+		}
+
+		public bool HasConstant {
+			get { return parameter != null && parameter.HasConstant; }
+			set { Parameter.HasConstant = value; }
+		}
+
+		public object Constant {
+			get { return Parameter.Constant; }
+			set { Parameter.Constant = value; }
+		}
+
+		public bool HasFieldMarshal {
+			get { return parameter != null && parameter.HasFieldMarshal; }
+			set { Parameter.HasFieldMarshal = value; }
+		}
+
+		public bool HasMarshalInfo {
+			get { return parameter != null && parameter.HasMarshalInfo; }
+		}
+
+		public MarshalInfo MarshalInfo {
+			get { return Parameter.MarshalInfo; }
+			set { Parameter.MarshalInfo = value; }
+		}
+
+		public MethodReturnType (IMethodSignature method)
+		{
+			this.method = method;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/MethodSemanticsAttributes.cs b/src/Core/Compiler/Importer/IL/MethodSemanticsAttributes.cs
new file mode 100644
index 000000000..f8223e9e5
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/MethodSemanticsAttributes.cs
@@ -0,0 +1,43 @@
+//
+// MethodSemanticsattributes.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+	[Flags]
+    internal /* public */ enum MethodSemanticsAttributes : ushort {
+		None		= 0x0000,
+		Setter		= 0x0001,	// Setter for property
+		Getter		= 0x0002,	// Getter for property
+		Other		= 0x0004,	// Other method for property or event
+		AddOn		= 0x0008,	// AddOn method for event
+		RemoveOn	= 0x0010,	// RemoveOn method for event
+		Fire		= 0x0020	 // Fire method for event
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/MethodSpecification.cs b/src/Core/Compiler/Importer/IL/MethodSpecification.cs
new file mode 100644
index 000000000..6f14daab3
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/MethodSpecification.cs
@@ -0,0 +1,102 @@
+//
+// MethodSpecification.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ abstract class MethodSpecification : MethodReference {
+
+		readonly MethodReference method;
+
+		public MethodReference ElementMethod {
+			get { return method; }
+		}
+
+		public override string Name {
+			get { return method.Name; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override MethodCallingConvention CallingConvention {
+			get { return method.CallingConvention; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override bool HasThis {
+			get { return method.HasThis; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override bool ExplicitThis {
+			get { return method.ExplicitThis; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override MethodReturnType MethodReturnType {
+			get { return method.MethodReturnType; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override TypeReference DeclaringType {
+			get { return method.DeclaringType; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override ModuleDefinition Module {
+			get { return method.Module; }
+		}
+
+		public override bool HasParameters {
+			get { return method.HasParameters; }
+		}
+
+		public override Collection<ParameterDefinition> Parameters {
+			get { return method.Parameters; }
+		}
+
+		internal override bool ContainsGenericParameter {
+			get { return method.ContainsGenericParameter; }
+		}
+
+		internal MethodSpecification (MethodReference method)
+		{
+			if (method == null)
+				throw new ArgumentNullException ("method");
+
+			this.method = method;
+			this.token = new MetadataToken (TokenType.MethodSpec);
+		}
+
+		public sealed override MethodReference GetElementMethod ()
+		{
+			return method.GetElementMethod ();
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Modifiers.cs b/src/Core/Compiler/Importer/IL/Modifiers.cs
new file mode 100644
index 000000000..c36e49f5d
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Modifiers.cs
@@ -0,0 +1,137 @@
+//
+// Modifiers.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using MD = ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ interface IModifierType {
+		TypeReference ModifierType { get; }
+		TypeReference ElementType { get; }
+	}
+
+    internal /* public */ sealed class OptionalModifierType : TypeSpecification, IModifierType {
+
+		TypeReference modifier_type;
+
+		public TypeReference ModifierType {
+			get { return modifier_type; }
+			set { modifier_type = value; }
+		}
+
+		public override string Name {
+			get { return base.Name + Suffix; }
+		}
+
+		public override string FullName {
+			get { return base.FullName + Suffix; }
+		}
+
+		string Suffix {
+			get { return " modopt(" + modifier_type + ")"; }
+		}
+
+		public override bool IsValueType {
+			get { return false; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override bool IsOptionalModifier {
+			get { return true; }
+		}
+
+		internal override bool ContainsGenericParameter {
+			get { return modifier_type.ContainsGenericParameter || base.ContainsGenericParameter; }
+		}
+
+		public OptionalModifierType (TypeReference modifierType, TypeReference type)
+			: base (type)
+		{
+			Mixin.CheckModifier (modifierType, type);
+			this.modifier_type = modifierType;
+			this.etype = MD.ElementType.CModOpt;
+		}
+	}
+
+    internal /* public */ sealed class RequiredModifierType : TypeSpecification, IModifierType {
+
+		TypeReference modifier_type;
+
+		public TypeReference ModifierType {
+			get { return modifier_type; }
+			set { modifier_type = value; }
+		}
+
+		public override string Name {
+			get { return base.Name + Suffix; }
+		}
+
+		public override string FullName {
+			get { return base.FullName + Suffix; }
+		}
+
+		string Suffix {
+			get { return " modreq(" + modifier_type + ")"; }
+		}
+
+		public override bool IsValueType {
+			get { return false; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override bool IsRequiredModifier {
+			get { return true; }
+		}
+
+		internal override bool ContainsGenericParameter {
+			get { return modifier_type.ContainsGenericParameter || base.ContainsGenericParameter; }
+		}
+
+		public RequiredModifierType (TypeReference modifierType, TypeReference type)
+			: base (type)
+		{
+			Mixin.CheckModifier (modifierType, type);
+			this.modifier_type = modifierType;
+			this.etype = MD.ElementType.CModReqD;
+		}
+
+	}
+
+	static partial class Mixin {
+
+		public static void CheckModifier (TypeReference modifierType, TypeReference type)
+		{
+			if (modifierType == null)
+				throw new ArgumentNullException ("modifierType");
+			if (type == null)
+				throw new ArgumentNullException ("type");
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/ModuleDefinition.cs b/src/Core/Compiler/Importer/IL/ModuleDefinition.cs
new file mode 100644
index 000000000..f8941ae8d
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/ModuleDefinition.cs
@@ -0,0 +1,970 @@
+//
+// ModuleDefinition.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using SR = System.Reflection;
+
+using ScriptSharp.Importer.IL.Cil;
+using ScriptSharp.Importer.IL.Metadata;
+using ScriptSharp.Importer.IL.PE;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ enum ReadingMode {
+		Immediate = 1,
+		Deferred = 2,
+	}
+
+    internal /* public */ sealed class ReaderParameters {
+
+		ReadingMode reading_mode;
+		IAssemblyResolver assembly_resolver;
+		Stream symbol_stream;
+		ISymbolReaderProvider symbol_reader_provider;
+		bool read_symbols;
+
+		public ReadingMode ReadingMode {
+			get { return reading_mode; }
+			set { reading_mode = value; }
+		}
+
+		public IAssemblyResolver AssemblyResolver {
+			get { return assembly_resolver; }
+			set { assembly_resolver = value; }
+		}
+
+		public Stream SymbolStream {
+			get { return symbol_stream; }
+			set { symbol_stream = value; }
+		}
+
+		public ISymbolReaderProvider SymbolReaderProvider {
+			get { return symbol_reader_provider; }
+			set { symbol_reader_provider = value; }
+		}
+
+		public bool ReadSymbols {
+			get { return read_symbols; }
+			set { read_symbols = value; }
+		}
+
+		public ReaderParameters ()
+			: this (ReadingMode.Deferred)
+		{
+		}
+
+		public ReaderParameters (ReadingMode readingMode)
+		{
+			this.reading_mode = readingMode;
+		}
+	}
+
+#if !IL_READ_ONLY
+
+    internal /* public */ sealed class ModuleParameters {
+
+		ModuleKind kind;
+		TargetRuntime runtime;
+		TargetArchitecture architecture;
+		IAssemblyResolver assembly_resolver;
+
+		public ModuleKind Kind {
+			get { return kind; }
+			set { kind = value; }
+		}
+
+		public TargetRuntime Runtime {
+			get { return runtime; }
+			set { runtime = value; }
+		}
+
+		public TargetArchitecture Architecture {
+			get { return architecture; }
+			set { architecture = value; }
+		}
+
+		public IAssemblyResolver AssemblyResolver {
+			get { return assembly_resolver; }
+			set { assembly_resolver = value; }
+		}
+
+		public ModuleParameters ()
+		{
+			this.kind = ModuleKind.Dll;
+			this.runtime = GetCurrentRuntime ();
+			this.architecture = TargetArchitecture.I386;
+		}
+
+		static TargetRuntime GetCurrentRuntime ()
+		{
+#if !CF
+			return typeof (object).Assembly.ImageRuntimeVersion.ParseRuntime ();
+#else
+			var corlib_version = typeof (object).Assembly.GetName ().Version;
+			switch (corlib_version.Major) {
+			case 1:
+				return corlib_version.Minor == 0
+					? TargetRuntime.Net_1_0
+					: TargetRuntime.Net_1_1;
+			case 2:
+				return TargetRuntime.Net_2_0;
+			case 4:
+				return TargetRuntime.Net_4_0;
+			default:
+				throw new NotSupportedException ();
+			}
+#endif
+		}
+	}
+
+    internal /* public */ sealed class WriterParameters {
+
+		Stream symbol_stream;
+		ISymbolWriterProvider symbol_writer_provider;
+		bool write_symbols;
+#if !SILVERLIGHT && !CF
+		SR.StrongNameKeyPair key_pair;
+#endif
+		public Stream SymbolStream {
+			get { return symbol_stream; }
+			set { symbol_stream = value; }
+		}
+
+		public ISymbolWriterProvider SymbolWriterProvider {
+			get { return symbol_writer_provider; }
+			set { symbol_writer_provider = value; }
+		}
+
+		public bool WriteSymbols {
+			get { return write_symbols; }
+			set { write_symbols = value; }
+		}
+#if !SILVERLIGHT && !CF
+		public SR.StrongNameKeyPair StrongNameKeyPair {
+			get { return key_pair; }
+			set { key_pair = value; }
+		}
+#endif
+	}
+
+#endif
+
+    internal /* public */ sealed class ModuleDefinition : ModuleReference, ICustomAttributeProvider {
+
+		internal Image Image;
+		internal MetadataSystem MetadataSystem;
+		internal ReadingMode ReadingMode;
+		internal ISymbolReaderProvider SymbolReaderProvider;
+		internal ISymbolReader SymbolReader;
+
+		internal IAssemblyResolver assembly_resolver;
+		internal TypeSystem type_system;
+
+		readonly MetadataReader reader;
+		readonly string fq_name;
+
+		internal ModuleKind kind;
+		TargetRuntime runtime;
+		TargetArchitecture architecture;
+		ModuleAttributes attributes;
+		Guid mvid;
+
+		internal AssemblyDefinition assembly;
+		MethodDefinition entry_point;
+
+#if !IL_READ_ONLY
+        MetadataImporter importer;
+#endif
+		Collection<CustomAttribute> custom_attributes;
+		Collection<AssemblyNameReference> references;
+		Collection<ModuleReference> modules;
+		Collection<Resource> resources;
+		Collection<ExportedType> exported_types;
+		TypeDefinitionCollection types;
+
+		public bool IsMain {
+			get { return kind != ModuleKind.NetModule; }
+		}
+
+		public ModuleKind Kind {
+			get { return kind; }
+			set { kind = value; }
+		}
+
+		public TargetRuntime Runtime {
+			get { return runtime; }
+			set { runtime = value; }
+		}
+
+		public TargetArchitecture Architecture {
+			get { return architecture; }
+			set { architecture = value; }
+		}
+
+		public ModuleAttributes Attributes {
+			get { return attributes; }
+			set { attributes = value; }
+		}
+
+		public string FullyQualifiedName {
+			get { return fq_name; }
+		}
+
+		public Guid Mvid {
+			get { return mvid; }
+			set { mvid = value; }
+		}
+
+		internal bool HasImage {
+			get { return Image != null; }
+		}
+
+		public bool HasSymbols {
+			get { return SymbolReader != null; }
+		}
+
+		public override MetadataScopeType MetadataScopeType {
+			get { return MetadataScopeType.ModuleDefinition; }
+		}
+
+		public AssemblyDefinition Assembly {
+			get { return assembly; }
+		}
+
+#if !IL_READ_ONLY
+        internal MetadataImporter MetadataImporter {
+			get { return importer ?? (importer = new MetadataImporter (this)); }
+		}
+#endif
+
+		public IAssemblyResolver AssemblyResolver {
+			get { return assembly_resolver; }
+		}
+
+		public TypeSystem TypeSystem {
+			get { return type_system ?? (type_system = TypeSystem.CreateTypeSystem (this)); }
+		}
+
+		public bool HasAssemblyReferences {
+			get {
+				if (references != null)
+					return references.Count > 0;
+
+				return HasImage && Image.HasTable (Table.AssemblyRef);
+			}
+		}
+
+		public Collection<AssemblyNameReference> AssemblyReferences {
+			get {
+				if (references != null)
+					return references;
+
+				if (HasImage)
+					return references = Read (this, (_, reader) => reader.ReadAssemblyReferences ());
+
+				return references = new Collection<AssemblyNameReference> ();
+			}
+		}
+
+		public bool HasModuleReferences {
+			get {
+				if (modules != null)
+					return modules.Count > 0;
+
+				return HasImage && Image.HasTable (Table.ModuleRef);
+			}
+		}
+
+		public Collection<ModuleReference> ModuleReferences {
+			get {
+				if (modules != null)
+					return modules;
+
+				if (HasImage)
+					return modules = Read (this, (_, reader) => reader.ReadModuleReferences ());
+
+				return modules = new Collection<ModuleReference> ();
+			}
+		}
+
+		public bool HasResources {
+			get {
+				if (resources != null)
+					return resources.Count > 0;
+
+				if (HasImage)
+					return Image.HasTable (Table.ManifestResource) || Read (this, (_, reader) => reader.HasFileResource ());
+
+				return false;
+			}
+		}
+
+		public Collection<Resource> Resources {
+			get {
+				if (resources != null)
+					return resources;
+
+				if (HasImage)
+					return resources = Read (this, (_, reader) => reader.ReadResources ());
+
+				return resources = new Collection<Resource> ();
+			}
+		}
+
+		public bool HasCustomAttributes {
+			get {
+				if (custom_attributes != null)
+					return custom_attributes.Count > 0;
+
+				return this.GetHasCustomAttributes (this);
+			}
+		}
+
+		public Collection<CustomAttribute> CustomAttributes {
+			get { return custom_attributes ?? (custom_attributes = this.GetCustomAttributes (this)); }
+		}
+
+		public bool HasTypes {
+			get {
+				if (types != null)
+					return types.Count > 0;
+
+				return HasImage && Image.HasTable (Table.TypeDef);
+			}
+		}
+
+		public Collection<TypeDefinition> Types {
+			get {
+				if (types != null)
+					return types;
+
+				if (HasImage)
+					return types = Read (this, (_, reader) => reader.ReadTypes ());
+
+				return types = new TypeDefinitionCollection (this);
+			}
+		}
+
+		public bool HasExportedTypes {
+			get {
+				if (exported_types != null)
+					return exported_types.Count > 0;
+
+				return HasImage && Image.HasTable (Table.ExportedType);
+			}
+		}
+
+		public Collection<ExportedType> ExportedTypes {
+			get {
+				if (exported_types != null)
+					return exported_types;
+
+				if (HasImage)
+					return exported_types = Read (this, (_, reader) => reader.ReadExportedTypes ());
+
+				return exported_types = new Collection<ExportedType> ();
+			}
+		}
+
+		public MethodDefinition EntryPoint {
+			get {
+				if (entry_point != null)
+					return entry_point;
+
+				if (HasImage)
+					return entry_point = Read (this, (_, reader) => reader.ReadEntryPoint ());
+
+				return entry_point = null;
+			}
+			set { entry_point = value; }
+		}
+
+		internal ModuleDefinition ()
+		{
+			this.MetadataSystem = new MetadataSystem ();
+			this.token = new MetadataToken (TokenType.Module, 1);
+			this.assembly_resolver = GlobalAssemblyResolver.Instance;
+		}
+
+		internal ModuleDefinition (Image image)
+			: this ()
+		{
+			this.Image = image;
+			this.kind = image.Kind;
+			this.runtime = image.Runtime;
+			this.architecture = image.Architecture;
+			this.attributes = image.Attributes;
+			this.fq_name = image.FileName;
+
+			this.reader = new MetadataReader (this);
+		}
+
+		public bool HasTypeReference (string fullName)
+		{
+			return HasTypeReference (string.Empty, fullName);
+		}
+
+		public bool HasTypeReference (string scope, string fullName)
+		{
+			CheckFullName (fullName);
+
+			if (!HasImage)
+				return false;
+
+			return GetTypeReference (scope, fullName) != null;
+		}
+
+		public bool TryGetTypeReference (string fullName, out TypeReference type)
+		{
+			return TryGetTypeReference (string.Empty, fullName, out type);
+		}
+
+		public bool TryGetTypeReference (string scope, string fullName, out TypeReference type)
+		{
+			CheckFullName (fullName);
+
+			if (!HasImage) {
+				type = null;
+				return false;
+			}
+
+			return (type = GetTypeReference (scope, fullName)) != null;
+		}
+
+		TypeReference GetTypeReference (string scope, string fullname)
+		{
+			return Read (new Row<string, string> (scope, fullname), (row, reader) => reader.GetTypeReference (row.Col1, row.Col2));
+		}
+
+		public IEnumerable<TypeReference> GetTypeReferences ()
+		{
+			if (!HasImage)
+				return Empty<TypeReference>.Array;
+
+			return Read (this, (_, reader) => reader.GetTypeReferences ());
+		}
+
+		public IEnumerable<MemberReference> GetMemberReferences ()
+		{
+			if (!HasImage)
+				return Empty<MemberReference>.Array;
+
+			return Read (this, (_, reader) => reader.GetMemberReferences ());
+		}
+
+		public TypeDefinition GetType (string fullName)
+		{
+			CheckFullName (fullName);
+
+			var position = fullName.IndexOf ('/');
+			if (position > 0)
+				return GetNestedType (fullName);
+
+			return ((TypeDefinitionCollection) this.Types).GetType (fullName);
+		}
+
+		public TypeDefinition GetType (string @namespace, string name)
+		{
+			Mixin.CheckName (name);
+
+			return ((TypeDefinitionCollection) this.Types).GetType (@namespace ?? string.Empty, name);
+		}
+
+		static void CheckFullName (string fullName)
+		{
+			if (fullName == null)
+				throw new ArgumentNullException ("fullName");
+			if (fullName.Length == 0)
+				throw new ArgumentException ();
+		}
+
+		TypeDefinition GetNestedType (string fullname)
+		{
+			var names = fullname.Split ('/');
+			var type = GetType (names [0]);
+
+			if (type == null)
+				return null;
+
+			for (int i = 1; i < names.Length; i++) {
+				var nested_type = type.GetNestedType (names [i]);
+				if (nested_type == null)
+					return null;
+
+				type = nested_type;
+			}
+
+			return type;
+		}
+
+		internal FieldDefinition Resolve (FieldReference field)
+		{
+			return MetadataResolver.Resolve (AssemblyResolver, field);
+		}
+
+		internal MethodDefinition Resolve (MethodReference method)
+		{
+			return MetadataResolver.Resolve (AssemblyResolver, method);
+		}
+
+		internal TypeDefinition Resolve (TypeReference type)
+		{
+			return MetadataResolver.Resolve (AssemblyResolver, type);
+		}
+
+#if !IL_READ_ONLY
+
+        static void CheckType (object type)
+		{
+			if (type == null)
+				throw new ArgumentNullException ("type");
+		}
+
+		static void CheckField (object field)
+		{
+			if (field == null)
+				throw new ArgumentNullException ("field");
+		}
+
+		static void CheckMethod (object method)
+		{
+			if (method == null)
+				throw new ArgumentNullException ("method");
+		}
+
+		static void CheckContext (IGenericParameterProvider context, ModuleDefinition module)
+		{
+			if (context == null)
+				return;
+
+			if (context.Module != module)
+				throw new ArgumentException ();
+		}
+
+#if !CF
+		public TypeReference Import (Type type)
+		{
+			CheckType (type);
+
+			return MetadataImporter.ImportType (type, null, ImportGenericKind.Definition);
+		}
+
+		public TypeReference Import (Type type, TypeReference context)
+		{
+			return Import (type, (IGenericParameterProvider) context);
+		}
+
+		public TypeReference Import (Type type, MethodReference context)
+		{
+			return Import (type, (IGenericParameterProvider) context);
+		}
+
+		TypeReference Import (Type type, IGenericParameterProvider context)
+		{
+			CheckType (type);
+			CheckContext (context, this);
+
+			return MetadataImporter.ImportType (
+				type,
+				(IGenericContext) context,
+				context != null
+					? ImportGenericKind.Open
+					: ImportGenericKind.Definition);
+		}
+
+		public FieldReference Import (SR.FieldInfo field)
+		{
+			CheckField (field);
+
+			return MetadataImporter.ImportField (field, null);
+		}
+
+		public FieldReference Import (SR.FieldInfo field, TypeReference context)
+		{
+			return Import (field, (IGenericParameterProvider) context);
+		}
+
+		public FieldReference Import (SR.FieldInfo field, MethodReference context)
+		{
+			return Import (field, (IGenericParameterProvider) context);
+		}
+
+		FieldReference Import (SR.FieldInfo field, IGenericParameterProvider context)
+		{
+			CheckField (field);
+			CheckContext (context, this);
+
+			return MetadataImporter.ImportField (field, (IGenericContext) context);
+		}
+
+		public MethodReference Import (SR.MethodBase method)
+		{
+			CheckMethod (method);
+
+			return MetadataImporter.ImportMethod (method, null, ImportGenericKind.Definition);
+		}
+
+		public MethodReference Import (SR.MethodBase method, TypeReference context)
+		{
+			return Import (method, (IGenericParameterProvider) context);
+		}
+
+		public MethodReference Import (SR.MethodBase method, MethodReference context)
+		{
+			return Import (method, (IGenericParameterProvider) context);
+		}
+
+		MethodReference Import (SR.MethodBase method, IGenericParameterProvider context)
+		{
+			CheckMethod (method);
+			CheckContext (context, this);
+
+			return MetadataImporter.ImportMethod (method,
+				(IGenericContext) context,
+				context != null
+					? ImportGenericKind.Open
+					: ImportGenericKind.Definition);
+		}
+#endif
+
+		public TypeReference Import (TypeReference type)
+		{
+			CheckType (type);
+
+			if (type.Module == this)
+				return type;
+
+			return MetadataImporter.ImportType (type, null);
+		}
+
+		public TypeReference Import (TypeReference type, TypeReference context)
+		{
+			return Import (type, (IGenericParameterProvider) context);
+		}
+
+		public TypeReference Import (TypeReference type, MethodReference context)
+		{
+			return Import (type, (IGenericParameterProvider) context);
+		}
+
+		TypeReference Import (TypeReference type, IGenericParameterProvider context)
+		{
+			CheckType (type);
+
+			if (type.Module == this)
+				return type;
+
+			CheckContext (context, this);
+
+			return MetadataImporter.ImportType (type, (IGenericContext) context);
+		}
+
+		public FieldReference Import (FieldReference field)
+		{
+			CheckField (field);
+
+			if (field.Module == this)
+				return field;
+
+			return MetadataImporter.ImportField (field, null);
+		}
+
+		public FieldReference Import (FieldReference field, TypeReference context)
+		{
+			return Import (field, (IGenericParameterProvider) context);
+		}
+
+		public FieldReference Import (FieldReference field, MethodReference context)
+		{
+			return Import (field, (IGenericParameterProvider) context);
+		}
+
+		FieldReference Import (FieldReference field, IGenericParameterProvider context)
+		{
+			CheckField (field);
+
+			if (field.Module == this)
+				return field;
+
+			CheckContext (context, this);
+
+			return MetadataImporter.ImportField (field, (IGenericContext) context);
+		}
+
+		public MethodReference Import (MethodReference method)
+		{
+			CheckMethod (method);
+
+			if (method.Module == this)
+				return method;
+
+			return MetadataImporter.ImportMethod (method, null);
+		}
+
+		public MethodReference Import (MethodReference method, TypeReference context)
+		{
+			return Import (method, (IGenericParameterProvider) context);
+		}
+
+		public MethodReference Import (MethodReference method, MethodReference context)
+		{
+			return Import (method, (IGenericParameterProvider) context);
+		}
+
+		MethodReference Import (MethodReference method, IGenericParameterProvider context)
+		{
+			CheckMethod (method);
+
+			if (method.Module == this)
+				return method;
+
+			CheckContext (context, this);
+
+			return MetadataImporter.ImportMethod (method, (IGenericContext) context);
+		}
+
+#endif
+
+		public IMetadataTokenProvider LookupToken (int token)
+		{
+			return LookupToken (new MetadataToken ((uint) token));
+		}
+
+		public IMetadataTokenProvider LookupToken (MetadataToken token)
+		{
+			return Read (token, (t, reader) => reader.LookupToken (t));
+		}
+
+		internal TRet Read<TItem, TRet> (TItem item, Func<TItem, MetadataReader, TRet> read)
+		{
+			var position = reader.position;
+			var context = reader.context;
+
+			var ret = read (item, reader);
+
+			reader.position = position;
+			reader.context = context;
+
+			return ret;
+		}
+
+		void ProcessDebugHeader ()
+		{
+			if (Image == null || Image.Debug.IsZero)
+				return;
+
+			byte [] header;
+			var directory = Image.GetDebugHeader (out header);
+
+			if (!SymbolReader.ProcessDebugHeader (directory, header))
+				throw new InvalidOperationException ();
+		}
+
+#if !IL_READ_ONLY
+
+        public static ModuleDefinition CreateModule (string name, ModuleKind kind)
+		{
+			return CreateModule (name, new ModuleParameters { Kind = kind });
+		}
+
+		public static ModuleDefinition CreateModule (string name, ModuleParameters parameters)
+		{
+			Mixin.CheckName (name);
+			Mixin.CheckParameters (parameters);
+
+			var module = new ModuleDefinition {
+				Name = name,
+				kind = parameters.Kind,
+				runtime = parameters.Runtime,
+				architecture = parameters.Architecture,
+				mvid = Guid.NewGuid (),
+				Attributes = ModuleAttributes.ILOnly,
+			};
+
+			if (parameters.AssemblyResolver != null)
+				module.assembly_resolver = parameters.AssemblyResolver;
+
+			if (parameters.Kind != ModuleKind.NetModule) {
+				var assembly = new AssemblyDefinition ();
+				module.assembly = assembly;
+				module.assembly.Name = new AssemblyNameDefinition (name, new Version (0, 0));
+				assembly.main_module = module;
+			}
+
+			module.Types.Add (new TypeDefinition (string.Empty, "<Module>", TypeAttributes.NotPublic));
+
+			return module;
+		}
+
+#endif
+
+		public void ReadSymbols ()
+		{
+			if (string.IsNullOrEmpty (fq_name))
+				throw new InvalidOperationException ();
+
+			var provider = SymbolProvider.GetPlatformReaderProvider ();
+
+			SymbolReader = provider.GetSymbolReader (this, fq_name);
+
+			ProcessDebugHeader ();
+		}
+
+		public void ReadSymbols (ISymbolReader reader)
+		{
+			if (reader == null)
+				throw new ArgumentNullException ("reader");
+
+			SymbolReader = reader;
+
+			ProcessDebugHeader ();
+		}
+
+		public static ModuleDefinition ReadModule (string fileName)
+		{
+			return ReadModule (fileName, new ReaderParameters (ReadingMode.Deferred));
+		}
+
+		public static ModuleDefinition ReadModule (Stream stream)
+		{
+			return ReadModule (stream, new ReaderParameters (ReadingMode.Deferred));
+		}
+
+		public static ModuleDefinition ReadModule (string fileName, ReaderParameters parameters)
+		{
+			using (var stream = GetFileStream (fileName, FileMode.Open, FileAccess.Read, FileShare.Read)) {
+				return ReadModule (stream, parameters);
+			}
+		}
+
+		static void CheckStream (object stream)
+		{
+			if (stream == null)
+				throw new ArgumentNullException ("stream");
+		}
+
+		public static ModuleDefinition ReadModule (Stream stream, ReaderParameters parameters)
+		{
+			CheckStream (stream);
+			if (!stream.CanRead || !stream.CanSeek)
+				throw new ArgumentException ();
+			Mixin.CheckParameters (parameters);
+
+			return ModuleReader.CreateModuleFrom (
+				ImageReader.ReadImageFrom (stream),
+				parameters);
+		}
+
+		static Stream GetFileStream (string fileName, FileMode mode, FileAccess access, FileShare share)
+		{
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName");
+			if (fileName.Length == 0)
+				throw new ArgumentException ();
+
+			return new FileStream (fileName, mode, access, share);
+		}
+
+#if !IL_READ_ONLY
+
+        public void Write (string fileName)
+		{
+			Write (fileName, new WriterParameters ());
+		}
+
+		public void Write (Stream stream)
+		{
+			Write (stream, new WriterParameters ());
+		}
+
+		public void Write (string fileName, WriterParameters parameters)
+		{
+			using (var stream = GetFileStream (fileName, FileMode.Create, FileAccess.ReadWrite, FileShare.None)) {
+				Write (stream, parameters);
+			}
+		}
+
+		public void Write (Stream stream, WriterParameters parameters)
+		{
+			CheckStream (stream);
+			if (!stream.CanWrite || !stream.CanSeek)
+				throw new ArgumentException ();
+			Mixin.CheckParameters (parameters);
+
+			ModuleWriter.WriteModuleTo (this, stream, parameters);
+		}
+
+#endif
+
+	}
+
+	static partial class Mixin {
+
+		public static void CheckParameters (object parameters)
+		{
+			if (parameters == null)
+				throw new ArgumentNullException ("parameters");
+		}
+
+		public static bool HasImage (this ModuleDefinition self)
+		{
+			return self != null && self.HasImage;
+		}
+
+		public static string GetFullyQualifiedName (this Stream self)
+		{
+#if !SILVERLIGHT
+			var file_stream = self as FileStream;
+			if (file_stream == null)
+				return string.Empty;
+
+			return Path.GetFullPath (file_stream.Name);
+#else
+			return string.Empty;
+#endif
+		}
+
+		public static TargetRuntime ParseRuntime (this string self)
+		{
+			switch (self [1]) {
+			case '1':
+				return self [3] == '0'
+					? TargetRuntime.Net_1_0
+					: TargetRuntime.Net_1_1;
+			case '2':
+				return TargetRuntime.Net_2_0;
+			case '4':
+			default:
+				return TargetRuntime.Net_4_0;
+			}
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/ModuleKind.cs b/src/Core/Compiler/Importer/IL/ModuleKind.cs
new file mode 100644
index 000000000..833c6cbff
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/ModuleKind.cs
@@ -0,0 +1,52 @@
+//
+// ModuleKind.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ enum ModuleKind {
+		Dll,
+		Console,
+		Windows,
+		NetModule,
+	}
+
+    internal /* public */ enum TargetArchitecture {
+		I386,
+		AMD64,
+		IA64,
+	}
+
+	[Flags]
+    internal /* public */ enum ModuleAttributes {
+		ILOnly = 1,
+		Required32Bit = 2,
+		StrongNameSigned = 8,
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/ModuleReference.cs b/src/Core/Compiler/Importer/IL/ModuleReference.cs
new file mode 100644
index 000000000..c1c5be357
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/ModuleReference.cs
@@ -0,0 +1,67 @@
+//
+// ModuleReference.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ class ModuleReference : IMetadataScope {
+
+		string name;
+
+		internal MetadataToken token;
+
+		public string Name {
+			get { return name; }
+			set { name = value; }
+		}
+
+		public virtual MetadataScopeType MetadataScopeType {
+			get { return MetadataScopeType.ModuleReference; }
+		}
+
+		public MetadataToken MetadataToken {
+			get { return token; }
+			set { token = value; }
+		}
+
+		internal ModuleReference ()
+		{
+			this.token = new MetadataToken (TokenType.ModuleRef);
+		}
+
+		public ModuleReference (string name)
+			: this ()
+		{
+			this.name = name;
+		}
+
+		public override string ToString ()
+		{
+			return name;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/NativeType.cs b/src/Core/Compiler/Importer/IL/NativeType.cs
new file mode 100644
index 000000000..257a518bb
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/NativeType.cs
@@ -0,0 +1,73 @@
+//
+// NativeType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ enum NativeType {
+		None = 0x66,
+
+		Boolean = 0x02,
+		I1 = 0x03,
+		U1 = 0x04,
+		I2 = 0x05,
+		U2 = 0x06,
+		I4 = 0x07,
+		U4 = 0x08,
+		I8 = 0x09,
+		U8 = 0x0a,
+		R4 = 0x0b,
+		R8 = 0x0c,
+		LPStr = 0x14,
+		Int = 0x1f,
+		UInt = 0x20,
+		Func = 0x26,
+		Array = 0x2a,
+
+		// Msft specific
+		Currency = 0x0f,
+		BStr = 0x13,
+		LPWStr = 0x15,
+		LPTStr = 0x16,
+		FixedSysString = 0x17,
+		IUnknown = 0x19,
+		IDispatch = 0x1a,
+		Struct = 0x1b,
+		IntF = 0x1c,
+		SafeArray = 0x1d,
+		FixedArray = 0x1e,
+		ByValStr = 0x22,
+		ANSIBStr = 0x23,
+		TBStr = 0x24,
+		VariantBool = 0x25,
+		ASAny = 0x28,
+		LPStruct = 0x2b,
+		CustomMarshaler = 0x2c,
+		Error = 0x2d,
+		Max = 0x50
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PE/BinaryStreamReader.cs b/src/Core/Compiler/Importer/IL/PE/BinaryStreamReader.cs
new file mode 100644
index 000000000..6705d82fc
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PE/BinaryStreamReader.cs
@@ -0,0 +1,51 @@
+//
+// BinaryStreamReader.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+
+namespace ScriptSharp.Importer.IL.PE {
+
+	class BinaryStreamReader : BinaryReader {
+
+		public BinaryStreamReader (Stream stream)
+			: base (stream)
+		{
+		}
+
+		protected void Advance (int bytes)
+		{
+			BaseStream.Seek (bytes, SeekOrigin.Current);
+		}
+
+		protected DataDirectory ReadDataDirectory ()
+		{
+			return new DataDirectory (ReadUInt32 (), ReadUInt32 ());
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PE/BinaryStreamWriter.cs b/src/Core/Compiler/Importer/IL/PE/BinaryStreamWriter.cs
new file mode 100644
index 000000000..1280db51c
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PE/BinaryStreamWriter.cs
@@ -0,0 +1,96 @@
+//
+// BinaryStreamWriter.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+
+#if !IL_READ_ONLY
+
+namespace ScriptSharp.Importer.IL.PE {
+
+	class BinaryStreamWriter : BinaryWriter {
+
+		public BinaryStreamWriter (Stream stream)
+			: base (stream)
+		{
+		}
+
+		public void WriteByte (byte value)
+		{
+			Write (value);
+		}
+
+		public void WriteUInt16 (ushort value)
+		{
+			Write (value);
+		}
+
+		public void WriteInt16 (short value)
+		{
+			Write (value);
+		}
+
+		public void WriteUInt32 (uint value)
+		{
+			Write (value);
+		}
+
+		public void WriteInt32 (int value)
+		{
+			Write (value);
+		}
+
+		public void WriteUInt64 (ulong value)
+		{
+			Write (value);
+		}
+
+		public void WriteBytes (byte [] bytes)
+		{
+			Write (bytes);
+		}
+
+		public void WriteDataDirectory (DataDirectory directory)
+		{
+			Write (directory.VirtualAddress);
+			Write (directory.Size);
+		}
+
+		public void WriteBuffer (ByteBuffer buffer)
+		{
+			Write (buffer.buffer, 0, buffer.length);
+		}
+
+		protected void Advance (int bytes)
+		{
+			BaseStream.Seek (bytes, SeekOrigin.Current);
+		}
+	}
+}
+
+#endif
diff --git a/src/Core/Compiler/Importer/IL/PE/ByteBuffer.cs b/src/Core/Compiler/Importer/IL/PE/ByteBuffer.cs
new file mode 100644
index 000000000..5a375fcdd
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PE/ByteBuffer.cs
@@ -0,0 +1,342 @@
+//
+// ByteBuffer.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL.PE {
+
+	class ByteBuffer {
+
+		internal byte [] buffer;
+		internal int length;
+		internal int position;
+
+		public ByteBuffer ()
+		{
+			this.buffer = Empty<byte>.Array;
+		}
+
+		public ByteBuffer (int length)
+		{
+			this.buffer = new byte [length];
+		}
+
+		public ByteBuffer (byte [] buffer)
+		{
+			this.buffer = buffer ?? Empty<byte>.Array;
+			this.length = this.buffer.Length;
+		}
+
+		public void Reset (byte [] buffer)
+		{
+			this.buffer = buffer ?? Empty<byte>.Array;
+			this.length = this.buffer.Length;
+		}
+
+		public void Advance (int length)
+		{
+			position += length;
+		}
+
+		public byte ReadByte ()
+		{
+			return buffer [position++];
+		}
+
+		public sbyte ReadSByte ()
+		{
+			return (sbyte) ReadByte ();
+		}
+
+		public byte [] ReadBytes (int length)
+		{
+			var bytes = new byte [length];
+			Buffer.BlockCopy (buffer, position, bytes, 0, length);
+			position += length;
+			return bytes;
+		}
+
+		public ushort ReadUInt16 ()
+		{
+			ushort value = (ushort) (buffer [position]
+				| (buffer [position + 1] << 8));
+			position += 2;
+			return value;
+		}
+
+		public short ReadInt16 ()
+		{
+			return (short) ReadUInt16 ();
+		}
+
+		public uint ReadUInt32 ()
+		{
+			uint value = (uint) (buffer [position]
+				| (buffer [position + 1] << 8)
+				| (buffer [position + 2] << 16)
+				| (buffer [position + 3] << 24));
+			position += 4;
+			return value;
+		}
+
+		public int ReadInt32 ()
+		{
+			return (int) ReadUInt32 ();
+		}
+
+		public ulong ReadUInt64 ()
+		{
+			uint low = ReadUInt32 ();
+			uint high = ReadUInt32 ();
+
+			return (((ulong) high) << 32) | low;
+		}
+
+		public long ReadInt64 ()
+		{
+			return (long) ReadUInt64 ();
+		}
+
+		public uint ReadCompressedUInt32 ()
+		{
+			byte first = ReadByte ();
+			if ((first & 0x80) == 0)
+				return first;
+
+			if ((first & 0x40) == 0)
+				return ((uint) (first & ~0x80) << 8)
+					| ReadByte ();
+
+			return ((uint) (first & ~0xc0) << 24)
+				| (uint) ReadByte () << 16
+				| (uint) ReadByte () << 8
+				| ReadByte ();
+		}
+
+		public int ReadCompressedInt32 ()
+		{
+			var value = (int) ReadCompressedUInt32 ();
+
+			return (value & 1) != 0
+				? -(value >> 1)
+				: value >> 1;
+		}
+
+		public float ReadSingle ()
+		{
+			if (!BitConverter.IsLittleEndian) {
+				var bytes = ReadBytes (4);
+				Array.Reverse (bytes);
+				return BitConverter.ToSingle (bytes, 0);
+			}
+
+			float value = BitConverter.ToSingle (buffer, position);
+			position += 4;
+			return value;
+		}
+
+		public double ReadDouble ()
+		{
+			if (!BitConverter.IsLittleEndian) {
+				var bytes = ReadBytes (8);
+				Array.Reverse (bytes);
+				return BitConverter.ToDouble (bytes, 0);
+			}
+
+			double value = BitConverter.ToDouble (buffer, position);
+			position += 8;
+			return value;
+		}
+
+#if !IL_READ_ONLY
+
+        public void WriteByte (byte value)
+		{
+			if (position == buffer.Length)
+				Grow (1);
+
+			buffer [position++] = value;
+
+			if (position > length)
+				length = position;
+		}
+
+		public void WriteSByte (sbyte value)
+		{
+			WriteByte ((byte) value);
+		}
+
+		public void WriteUInt16 (ushort value)
+		{
+			if (position + 2 > buffer.Length)
+				Grow (2);
+
+			buffer [position++] = (byte) value;
+			buffer [position++] = (byte) (value >> 8);
+
+			if (position > length)
+				length = position;
+		}
+
+		public void WriteInt16 (short value)
+		{
+			WriteUInt16 ((ushort) value);
+		}
+
+		public void WriteUInt32 (uint value)
+		{
+			if (position + 4 > buffer.Length)
+				Grow (4);
+
+			buffer [position++] = (byte) value;
+			buffer [position++] = (byte) (value >> 8);
+			buffer [position++] = (byte) (value >> 16);
+			buffer [position++] = (byte) (value >> 24);
+
+			if (position > length)
+				length = position;
+		}
+
+		public void WriteInt32 (int value)
+		{
+			WriteUInt32 ((uint) value);
+		}
+
+		public void WriteUInt64 (ulong value)
+		{
+			if (position + 8 > buffer.Length)
+				Grow (8);
+
+			buffer [position++] = (byte) value;
+			buffer [position++] = (byte) (value >> 8);
+			buffer [position++] = (byte) (value >> 16);
+			buffer [position++] = (byte) (value >> 24);
+			buffer [position++] = (byte) (value >> 32);
+			buffer [position++] = (byte) (value >> 40);
+			buffer [position++] = (byte) (value >> 48);
+			buffer [position++] = (byte) (value >> 56);
+
+			if (position > length)
+				length = position;
+		}
+
+		public void WriteInt64 (long value)
+		{
+			WriteUInt64 ((ulong) value);
+		}
+
+		public void WriteCompressedUInt32 (uint value)
+		{
+			if (value < 0x80)
+				WriteByte ((byte) value);
+			else if (value < 0x4000) {
+				WriteByte ((byte) (0x80 | (value >> 8)));
+				WriteByte ((byte) (value & 0xff));
+			} else {
+				WriteByte ((byte) ((value >> 24) | 0xc0));
+				WriteByte ((byte) ((value >> 16) & 0xff));
+				WriteByte ((byte) ((value >> 8) & 0xff));
+				WriteByte ((byte) (value & 0xff));
+			}
+		}
+
+		public void WriteCompressedInt32 (int value)
+		{
+			WriteCompressedUInt32 ((uint) ((value < 0) ? ((-value) << 1) | 1 : value << 1));
+		}
+
+		public void WriteBytes (byte [] bytes)
+		{
+			var length = bytes.Length;
+			if (position + length > buffer.Length)
+				Grow (length);
+
+			Buffer.BlockCopy (bytes, 0, buffer, position, length);
+			position += length;
+
+			if (position > this.length)
+				this.length = position;
+		}
+
+		public void WriteBytes (int length)
+		{
+			if (position + length > buffer.Length)
+				Grow (length);
+
+			position += length;
+
+			if (position > this.length)
+				this.length = position;
+		}
+
+		public void WriteBytes (ByteBuffer buffer)
+		{
+			if (position + buffer.length > this.buffer.Length)
+				Grow (buffer.length);
+
+			Buffer.BlockCopy (buffer.buffer, 0, this.buffer, position, buffer.length);
+			position += buffer.length;
+
+			if (position > this.length)
+				this.length = position;
+		}
+
+		public void WriteSingle (float value)
+		{
+			var bytes = BitConverter.GetBytes (value);
+
+			if (!BitConverter.IsLittleEndian)
+				Array.Reverse (bytes);
+
+			WriteBytes (bytes);
+		}
+
+		public void WriteDouble (double value)
+		{
+			var bytes = BitConverter.GetBytes (value);
+
+			if (!BitConverter.IsLittleEndian)
+				Array.Reverse (bytes);
+
+			WriteBytes (bytes);
+		}
+
+		void Grow (int desired)
+		{
+			var current = this.buffer;
+			var current_length = current.Length;
+
+			var buffer = new byte [System.Math.Max (current_length + desired, current_length * 2)];
+			Buffer.BlockCopy (current, 0, buffer, 0, current_length);
+			this.buffer = buffer;
+		}
+
+#endif
+
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PE/ByteBufferEqualityComparer.cs b/src/Core/Compiler/Importer/IL/PE/ByteBufferEqualityComparer.cs
new file mode 100644
index 000000000..7ab62859f
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PE/ByteBufferEqualityComparer.cs
@@ -0,0 +1,78 @@
+//
+// ByteBufferEqualityComparer.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL.PE {
+
+	sealed class ByteBufferEqualityComparer : IEqualityComparer<ByteBuffer> {
+
+		public bool Equals (ByteBuffer x, ByteBuffer y)
+		{
+			if (x.length != y.length)
+				return false;
+
+			var x_buffer = x.buffer;
+			var y_buffer = y.buffer;
+
+			for (int i = 0; i < x.length; i++)
+				if (x_buffer [i] != y_buffer [i])
+					return false;
+
+			return true;
+		}
+
+		public int GetHashCode (ByteBuffer buffer)
+		{
+#if !BYTE_BUFFER_WELL_DISTRIBUTED_HASH
+			var hash = 0;
+			var bytes = buffer.buffer;
+			for (int i = 0; i < buffer.length; i++)
+				hash = (hash * 37) ^ bytes [i];
+
+			return hash;
+#else
+			const uint p = 16777619;
+			uint hash = 2166136261;
+
+			var bytes = buffer.buffer;
+			for (int i = 0; i < buffer.length; i++)
+			    hash = (hash ^ bytes [i]) * p;
+
+			hash += hash << 13;
+			hash ^= hash >> 7;
+			hash += hash << 3;
+			hash ^= hash >> 17;
+			hash += hash << 5;
+
+			return (int) hash;
+#endif
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PE/DataDirectory.cs b/src/Core/Compiler/Importer/IL/PE/DataDirectory.cs
new file mode 100644
index 000000000..374d13121
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PE/DataDirectory.cs
@@ -0,0 +1,50 @@
+//
+// DataDirectory.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using RVA = System.UInt32;
+
+namespace ScriptSharp.Importer.IL.PE {
+
+	struct DataDirectory {
+
+		public readonly RVA VirtualAddress;
+		public readonly uint Size;
+
+		public bool IsZero {
+			get { return VirtualAddress == 0 && Size == 0; }
+		}
+
+		public DataDirectory (RVA rva, uint size)
+		{
+			this.VirtualAddress = rva;
+			this.Size = size;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PE/Image.cs b/src/Core/Compiler/Importer/IL/PE/Image.cs
new file mode 100644
index 000000000..b6ae4ce22
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PE/Image.cs
@@ -0,0 +1,159 @@
+//
+// Image.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using ScriptSharp;
+using ScriptSharp.Importer.IL.Cil;
+using ScriptSharp.Importer.IL.Metadata;
+
+using RVA = System.UInt32;
+
+namespace ScriptSharp.Importer.IL.PE {
+
+	sealed class Image {
+
+		public ModuleKind Kind;
+		public TargetRuntime Runtime;
+		public TargetArchitecture Architecture;
+		public string FileName;
+
+		public Section [] Sections;
+
+		public Section MetadataSection;
+
+		public uint EntryPointToken;
+		public ModuleAttributes Attributes;
+
+		public DataDirectory Debug;
+		public DataDirectory Resources;
+
+		public StringHeap StringHeap;
+		public BlobHeap BlobHeap;
+		public UserStringHeap UserStringHeap;
+		public GuidHeap GuidHeap;
+		public TableHeap TableHeap;
+
+		readonly int [] coded_index_sizes = new int [13];
+
+		readonly Func<Table, int> counter;
+
+		public Image ()
+		{
+			counter = GetTableLength;
+		}
+
+		public bool HasTable (Table table)
+		{
+			return GetTableLength (table) > 0;
+		}
+
+		public int GetTableLength (Table table)
+		{
+			return (int) TableHeap [table].Length;
+		}
+
+		public int GetTableIndexSize (Table table)
+		{
+			return GetTableLength (table) < 65536 ? 2 : 4;
+		}
+
+		public int GetCodedIndexSize (CodedIndex coded_index)
+		{
+			var index = (int) coded_index;
+			var size = coded_index_sizes [index];
+			if (size != 0)
+				return size;
+
+			return coded_index_sizes [index] = coded_index.GetSize (counter);
+		}
+
+		public uint ResolveVirtualAddress (RVA rva)
+		{
+			var section = GetSectionAtVirtualAddress (rva);
+			if (section == null)
+				throw new ArgumentOutOfRangeException ();
+
+			return ResolveVirtualAddressInSection (rva, section);
+		}
+
+		public uint ResolveVirtualAddressInSection (RVA rva, Section section)
+		{
+			return rva + section.PointerToRawData - section.VirtualAddress;
+		}
+
+		public Section GetSection (string name)
+		{
+			var sections = this.Sections;
+			for (int i = 0; i < sections.Length; i++) {
+				var section = sections [i];
+				if (section.Name == name)
+					return section;
+			}
+
+			return null;
+		}
+
+		public Section GetSectionAtVirtualAddress (RVA rva)
+		{
+			var sections = this.Sections;
+			for (int i = 0; i < sections.Length; i++) {
+				var section = sections [i];
+				if (rva >= section.VirtualAddress && rva < section.VirtualAddress + section.SizeOfRawData)
+					return section;
+			}
+
+			return null;
+		}
+
+		public ImageDebugDirectory GetDebugHeader (out byte [] header)
+		{
+			var section = GetSectionAtVirtualAddress (Debug.VirtualAddress);
+			var buffer = new ByteBuffer (section.Data);
+			buffer.position = (int) (Debug.VirtualAddress - section.VirtualAddress);
+
+			var directory = new ImageDebugDirectory {
+				Characteristics = buffer.ReadInt32 (),
+				TimeDateStamp = buffer.ReadInt32 (),
+				MajorVersion = buffer.ReadInt16 (),
+				MinorVersion = buffer.ReadInt16 (),
+				Type = buffer.ReadInt32 (),
+				SizeOfData = buffer.ReadInt32 (),
+				AddressOfRawData = buffer.ReadInt32 (),
+				PointerToRawData = buffer.ReadInt32 (),
+			};
+
+			buffer.position = (int) (directory.PointerToRawData - section.PointerToRawData);
+
+			header = new byte [directory.SizeOfData];
+			Buffer.BlockCopy (buffer.buffer, buffer.position, header, 0, header.Length);
+
+			return directory;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PE/ImageReader.cs b/src/Core/Compiler/Importer/IL/PE/ImageReader.cs
new file mode 100644
index 000000000..c6fe4f1c1
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PE/ImageReader.cs
@@ -0,0 +1,678 @@
+//
+// ImageReader.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+
+using ScriptSharp.Importer.IL.Metadata;
+
+using RVA = System.UInt32;
+
+namespace ScriptSharp.Importer.IL.PE {
+
+	sealed class ImageReader : BinaryStreamReader {
+
+		readonly Image image;
+
+		DataDirectory cli;
+		DataDirectory metadata;
+
+		public ImageReader (Stream stream)
+			: base (stream)
+		{
+			image = new Image ();
+
+			image.FileName = stream.GetFullyQualifiedName ();
+		}
+
+		void MoveTo (DataDirectory directory)
+		{
+			BaseStream.Position = image.ResolveVirtualAddress (directory.VirtualAddress);
+		}
+
+		void MoveTo (uint position)
+		{
+			BaseStream.Position = position;
+		}
+
+		void ReadImage ()
+		{
+			if (BaseStream.Length < 128)
+				throw new BadImageFormatException ();
+
+			// - DOSHeader
+
+			// PE					2
+			// Start				58
+			// Lfanew				4
+			// End					64
+
+			if (ReadUInt16 () != 0x5a4d)
+				throw new BadImageFormatException ();
+
+			Advance (58);
+
+			MoveTo (ReadUInt32 ());
+
+			if (ReadUInt32 () != 0x00004550)
+				throw new BadImageFormatException ();
+
+			// - PEFileHeader
+
+			// Machine				2
+			image.Architecture = ReadArchitecture ();
+
+			// NumberOfSections		2
+			ushort sections = ReadUInt16 ();
+
+			// TimeDateStamp		4
+			// PointerToSymbolTable	4
+			// NumberOfSymbols		4
+			// OptionalHeaderSize	2
+			Advance (14);
+
+			// Characteristics		2
+			ushort characteristics = ReadUInt16 ();
+
+			ushort subsystem;
+			ReadOptionalHeaders (out subsystem);
+			ReadSections (sections);
+			ReadCLIHeader ();
+			ReadMetadata ();
+
+			image.Kind = GetModuleKind (characteristics, subsystem);
+		}
+
+		TargetArchitecture ReadArchitecture ()
+		{
+			var machine = ReadUInt16 ();
+			switch (machine) {
+			case 0x014c:
+				return TargetArchitecture.I386;
+			case 0x8664:
+				return TargetArchitecture.AMD64;
+			case 0x0200:
+				return TargetArchitecture.IA64;
+			}
+
+			throw new NotSupportedException ();
+		}
+
+		static ModuleKind GetModuleKind (ushort characteristics, ushort subsystem)
+		{
+			if ((characteristics & 0x2000) != 0) // ImageCharacteristics.Dll
+				return ModuleKind.Dll;
+
+			if (subsystem == 0x2 || subsystem == 0x9) // SubSystem.WindowsGui || SubSystem.WindowsCeGui
+				return ModuleKind.Windows;
+
+			return ModuleKind.Console;
+		}
+
+		void ReadOptionalHeaders (out ushort subsystem)
+		{
+			// - PEOptionalHeader
+			//   - StandardFieldsHeader
+
+			// Magic				2
+			bool pe64 = ReadUInt16 () == 0x20b;
+
+			//						pe32 || pe64
+
+			// LMajor				1
+			// LMinor				1
+			// CodeSize				4
+			// InitializedDataSize	4
+			// UninitializedDataSize4
+			// EntryPointRVA		4
+			// BaseOfCode			4
+			// BaseOfData			4 || 0
+
+			//   - NTSpecificFieldsHeader
+
+			// ImageBase			4 || 8
+			// SectionAlignment		4
+			// FileAlignement		4
+			// OSMajor				2
+			// OSMinor				2
+			// UserMajor			2
+			// UserMinor			2
+			// SubSysMajor			2
+			// SubSysMinor			2
+			// Reserved				4
+			// ImageSize			4
+			// HeaderSize			4
+			// FileChecksum			4
+			Advance (66);
+
+			// SubSystem			2
+			subsystem = ReadUInt16 ();
+
+			// DLLFlags				2
+			// StackReserveSize		4 || 8
+			// StackCommitSize		4 || 8
+			// HeapReserveSize		4 || 8
+			// HeapCommitSize		4 || 8
+			// LoaderFlags			4
+			// NumberOfDataDir		4
+
+			//   - DataDirectoriesHeader
+
+			// ExportTable			8
+			// ImportTable			8
+			// ResourceTable		8
+			// ExceptionTable		8
+			// CertificateTable		8
+			// BaseRelocationTable	8
+
+			Advance (pe64 ? 90 : 74);
+
+			// Debug				8
+			image.Debug = ReadDataDirectory ();
+
+			// Copyright			8
+			// GlobalPtr			8
+			// TLSTable				8
+			// LoadConfigTable		8
+			// BoundImport			8
+			// IAT					8
+			// DelayImportDescriptor8
+			Advance (56);
+
+			// CLIHeader			8
+			cli = ReadDataDirectory ();
+
+			if (cli.IsZero)
+				throw new BadImageFormatException ();
+
+			// Reserved				8
+			Advance (8);
+		}
+
+		string ReadAlignedString (int length)
+		{
+			int read = 0;
+			var buffer = new char [length];
+			while (read < length) {
+				var current = ReadByte ();
+				if (current == 0)
+					break;
+
+				buffer [read++] = (char) current;
+			}
+
+			Advance (-1 + ((read + 4) & ~3) - read);
+
+			return new string (buffer, 0, read);
+		}
+
+		string ReadZeroTerminatedString (int length)
+		{
+			int read = 0;
+			var buffer = new char [length];
+			var bytes = ReadBytes (length);
+			while (read < length) {
+				var current = bytes [read];
+				if (current == 0)
+					break;
+
+				buffer [read++] = (char) current;
+			}
+
+			return new string (buffer, 0, read);
+		}
+
+		void ReadSections (ushort count)
+		{
+			var sections = new Section [count];
+
+			for (int i = 0; i < count; i++) {
+				var section = new Section ();
+
+				// Name
+				section.Name = ReadZeroTerminatedString (8);
+
+				// VirtualSize		4
+				Advance (4);
+
+				// VirtualAddress	4
+				section.VirtualAddress = ReadUInt32 ();
+				// SizeOfRawData	4
+				section.SizeOfRawData = ReadUInt32 ();
+				// PointerToRawData	4
+				section.PointerToRawData = ReadUInt32 ();
+
+				// PointerToRelocations		4
+				// PointerToLineNumbers		4
+				// NumberOfRelocations		2
+				// NumberOfLineNumbers		2
+				// Characteristics			4
+				Advance (16);
+
+				sections [i] = section;
+
+				if (section.Name == ".reloc")
+					continue;
+
+				ReadSectionData (section);
+			}
+
+			image.Sections = sections;
+		}
+
+		void ReadSectionData (Section section)
+		{
+			var position = BaseStream.Position;
+
+			MoveTo (section.PointerToRawData);
+
+			var length = (int) section.SizeOfRawData;
+			var data = new byte [length];
+			int offset = 0, read;
+
+			while ((read = Read (data, offset, length - offset)) > 0)
+				offset += read;
+
+			section.Data = data;
+
+			BaseStream.Position = position;
+		}
+
+		void ReadCLIHeader ()
+		{
+			MoveTo (cli);
+
+			// - CLIHeader
+
+			// Cb						4
+			// MajorRuntimeVersion		2
+			// MinorRuntimeVersion		2
+			Advance (8);
+
+			// Metadata					8
+			metadata = ReadDataDirectory ();
+			// Flags					4
+			image.Attributes = (ModuleAttributes) ReadUInt32 ();
+			// EntryPointToken			4
+			image.EntryPointToken = ReadUInt32 ();
+			// Resources				8
+			image.Resources = ReadDataDirectory ();
+			// StrongNameSignature		8
+			// CodeManagerTable			8
+			// VTableFixups				8
+			// ExportAddressTableJumps	8
+			// ManagedNativeHeader		8
+		}
+
+		void ReadMetadata ()
+		{
+			MoveTo (metadata);
+
+			if (ReadUInt32 () != 0x424a5342)
+				throw new BadImageFormatException ();
+
+			// MajorVersion			2
+			// MinorVersion			2
+			// Reserved				4
+			Advance (8);
+
+			var version = ReadZeroTerminatedString (ReadInt32 ());
+			image.Runtime = version.ParseRuntime ();
+
+			// Flags		2
+			Advance (2);
+
+			var streams = ReadUInt16 ();
+
+			var section = image.GetSectionAtVirtualAddress (metadata.VirtualAddress);
+			if (section == null)
+				throw new BadImageFormatException ();
+
+			image.MetadataSection = section;
+
+			for (int i = 0; i < streams; i++)
+				ReadMetadataStream (section);
+
+			if (image.TableHeap != null)
+				ReadTableHeap ();
+		}
+
+		void ReadMetadataStream (Section section)
+		{
+			// Offset		4
+			uint start = metadata.VirtualAddress - section.VirtualAddress + ReadUInt32 (); // relative to the section start
+
+			// Size			4
+			uint size = ReadUInt32 ();
+
+			var name = ReadAlignedString (16);
+			switch (name) {
+			case "#~":
+			case "#-":
+				image.TableHeap = new TableHeap (section, start, size);
+				break;
+			case "#Strings":
+				image.StringHeap = new StringHeap (section, start, size);
+				break;
+			case "#Blob":
+				image.BlobHeap = new BlobHeap (section, start, size);
+				break;
+			case "#GUID":
+				image.GuidHeap = new GuidHeap (section, start, size);
+				break;
+			case "#US":
+				image.UserStringHeap = new UserStringHeap (section, start, size);
+				break;
+			}
+		}
+
+		void ReadTableHeap ()
+		{
+			var heap = image.TableHeap;
+
+			uint start = heap.Section.PointerToRawData;
+
+			MoveTo (heap.Offset + start);
+
+			// Reserved			4
+			// MajorVersion		1
+			// MinorVersion		1
+			Advance (6);
+
+			// HeapSizes		1
+			var sizes = ReadByte ();
+
+			// Reserved2		1
+			Advance (1);
+
+			// Valid			8
+			heap.Valid = ReadInt64 ();
+
+			// Sorted			8
+			heap.Sorted = ReadInt64 ();
+
+			for (int i = 0; i < TableHeap.TableIdentifiers.Length; i++) {
+				var table = TableHeap.TableIdentifiers [i];
+				if (!heap.HasTable (table))
+					continue;
+
+				heap.Tables [(int) table].Length = ReadUInt32 ();
+			}
+
+			SetIndexSize (image.StringHeap, sizes, 0x1);
+			SetIndexSize (image.GuidHeap, sizes, 0x2);
+			SetIndexSize (image.BlobHeap, sizes, 0x4);
+
+			ComputeTableInformations ();
+		}
+
+		static void SetIndexSize (Heap heap, uint sizes, byte flag)
+		{
+			if (heap == null)
+				return;
+
+			heap.IndexSize = (sizes & flag) > 0 ? 4 : 2;
+		}
+
+		int GetTableIndexSize (Table table)
+		{
+			return image.GetTableIndexSize (table);
+		}
+
+		int GetCodedIndexSize (CodedIndex index)
+		{
+			return image.GetCodedIndexSize (index);
+		}
+
+		void ComputeTableInformations ()
+		{
+			uint offset = (uint) BaseStream.Position - image.MetadataSection.PointerToRawData; // header
+
+			int stridx_size = image.StringHeap.IndexSize;
+			int blobidx_size = image.BlobHeap != null ? image.BlobHeap.IndexSize : 2;
+
+			var heap = image.TableHeap;
+			var tables = heap.Tables;
+
+			for (int i = 0; i < TableHeap.TableIdentifiers.Length; i++) {
+				var table = TableHeap.TableIdentifiers [i];
+				if (!heap.HasTable (table))
+					continue;
+
+				int size;
+				switch (table) {
+				case Table.Module:
+					size = 2	// Generation
+						+ stridx_size	// Name
+						+ (image.GuidHeap.IndexSize * 3);	// Mvid, EncId, EncBaseId
+					break;
+				case Table.TypeRef:
+					size = GetCodedIndexSize (CodedIndex.ResolutionScope)	// ResolutionScope
+						+ (stridx_size * 2);	// Name, Namespace
+					break;
+				case Table.TypeDef:
+					size = 4	// Flags
+						+ (stridx_size * 2)	// Name, Namespace
+						+ GetCodedIndexSize (CodedIndex.TypeDefOrRef)	// BaseType
+						+ GetTableIndexSize (Table.Field)	// FieldList
+						+ GetTableIndexSize (Table.Method);	// MethodList
+					break;
+				case Table.FieldPtr:
+					size = GetTableIndexSize (Table.Field);	// Field
+					break;
+				case Table.Field:
+					size = 2	// Flags
+						+ stridx_size	// Name
+						+ blobidx_size;	// Signature
+					break;
+				case Table.MethodPtr:
+					size = GetTableIndexSize (Table.Method);	// Method
+					break;
+				case Table.Method:
+					size = 8	// Rva 4, ImplFlags 2, Flags 2
+						+ stridx_size	// Name
+						+ blobidx_size	// Signature
+						+ GetTableIndexSize (Table.Param); // ParamList
+					break;
+				case Table.ParamPtr:
+					size = GetTableIndexSize (Table.Param); // Param
+					break;
+				case Table.Param:
+					size = 4	// Flags 2, Sequence 2
+						+ stridx_size;	// Name
+					break;
+				case Table.InterfaceImpl:
+					size = GetTableIndexSize (Table.TypeDef)	// Class
+						+ GetCodedIndexSize (CodedIndex.TypeDefOrRef);	// Interface
+					break;
+				case Table.MemberRef:
+					size = GetCodedIndexSize (CodedIndex.MemberRefParent)	// Class
+						+ stridx_size	// Name
+						+ blobidx_size;	// Signature
+					break;
+				case Table.Constant:
+					size = 2	// Type
+						+ GetCodedIndexSize (CodedIndex.HasConstant)	// Parent
+						+ blobidx_size;	// Value
+					break;
+				case Table.CustomAttribute:
+					size = GetCodedIndexSize (CodedIndex.HasCustomAttribute)	// Parent
+						+ GetCodedIndexSize (CodedIndex.CustomAttributeType)	// Type
+						+ blobidx_size;	// Value
+					break;
+				case Table.FieldMarshal:
+					size = GetCodedIndexSize (CodedIndex.HasFieldMarshal)	// Parent
+						+ blobidx_size;	// NativeType
+					break;
+				case Table.DeclSecurity:
+					size = 2	// Action
+						+ GetCodedIndexSize (CodedIndex.HasDeclSecurity)	// Parent
+						+ blobidx_size;	// PermissionSet
+					break;
+				case Table.ClassLayout:
+					size = 6	// PackingSize 2, ClassSize 4
+						+ GetTableIndexSize (Table.TypeDef);	// Parent
+					break;
+				case Table.FieldLayout:
+					size = 4	// Offset
+						+ GetTableIndexSize (Table.Field);	// Field
+					break;
+				case Table.StandAloneSig:
+					size = blobidx_size;	// Signature
+					break;
+				case Table.EventMap:
+					size = GetTableIndexSize (Table.TypeDef)	// Parent
+						+ GetTableIndexSize (Table.Event);	// EventList
+					break;
+				case Table.EventPtr:
+					size = GetTableIndexSize (Table.Event);	// Event
+					break;
+				case Table.Event:
+					size = 2	// Flags
+						+ stridx_size // Name
+						+ GetCodedIndexSize (CodedIndex.TypeDefOrRef);	// EventType
+					break;
+				case Table.PropertyMap:
+					size = GetTableIndexSize (Table.TypeDef)	// Parent
+						+ GetTableIndexSize (Table.Property);	// PropertyList
+					break;
+				case Table.PropertyPtr:
+					size = GetTableIndexSize (Table.Property);	// Property
+					break;
+				case Table.Property:
+					size = 2	// Flags
+						+ stridx_size	// Name
+						+ blobidx_size;	// Type
+					break;
+				case Table.MethodSemantics:
+					size = 2	// Semantics
+						+ GetTableIndexSize (Table.Method)	// Method
+						+ GetCodedIndexSize (CodedIndex.HasSemantics);	// Association
+					break;
+				case Table.MethodImpl:
+					size = GetTableIndexSize (Table.TypeDef)	// Class
+						+ GetCodedIndexSize (CodedIndex.MethodDefOrRef)	// MethodBody
+						+ GetCodedIndexSize (CodedIndex.MethodDefOrRef);	// MethodDeclaration
+					break;
+				case Table.ModuleRef:
+					size = stridx_size;	// Name
+					break;
+				case Table.TypeSpec:
+					size = blobidx_size;	// Signature
+					break;
+				case Table.ImplMap:
+					size = 2	// MappingFlags
+						+ GetCodedIndexSize (CodedIndex.MemberForwarded)	// MemberForwarded
+						+ stridx_size	// ImportName
+						+ GetTableIndexSize (Table.ModuleRef);	// ImportScope
+					break;
+				case Table.FieldRVA:
+					size = 4	// RVA
+						+ GetTableIndexSize (Table.Field);	// Field
+					break;
+				case Table.Assembly:
+					size = 16 // HashAlgId 4, Version 4 * 2, Flags 4
+						+ blobidx_size	// PublicKey
+						+ (stridx_size * 2);	// Name, Culture
+					break;
+				case Table.AssemblyProcessor:
+					size = 4;	// Processor
+					break;
+				case Table.AssemblyOS:
+					size = 12;	// Platform 4, Version 2 * 4
+					break;
+				case Table.AssemblyRef:
+					size = 12	// Version 2 * 4 + Flags 4
+						+ (blobidx_size * 2)	// PublicKeyOrToken, HashValue
+						+ (stridx_size * 2);	// Name, Culture
+					break;
+				case Table.AssemblyRefProcessor:
+					size = 4	// Processor
+						+ GetTableIndexSize (Table.AssemblyRef);	// AssemblyRef
+					break;
+				case Table.AssemblyRefOS:
+					size = 12	// Platform 4, Version 2 * 4
+						+ GetTableIndexSize (Table.AssemblyRef);	// AssemblyRef
+					break;
+				case Table.File:
+					size = 4	// Flags
+						+ stridx_size	// Name
+						+ blobidx_size;	// HashValue
+					break;
+				case Table.ExportedType:
+					size = 8	// Flags 4, TypeDefId 4
+						+ (stridx_size * 2)	// Name, Namespace
+						+ GetCodedIndexSize (CodedIndex.Implementation);	// Implementation
+					break;
+				case Table.ManifestResource:
+					size = 8	// Offset, Flags
+						+ stridx_size	// Name
+						+ GetCodedIndexSize (CodedIndex.Implementation);	// Implementation
+					break;
+				case Table.NestedClass:
+					size = GetTableIndexSize (Table.TypeDef)	// NestedClass
+						+ GetTableIndexSize (Table.TypeDef);	// EnclosingClass
+					break;
+				case Table.GenericParam:
+					size = 4	// Number, Flags
+						+ GetCodedIndexSize (CodedIndex.TypeOrMethodDef)	// Owner
+						+ stridx_size;	// Name
+					break;
+				case Table.MethodSpec:
+					size = GetCodedIndexSize (CodedIndex.MethodDefOrRef)	// Method
+						+ blobidx_size;	// Instantiation
+					break;
+				case Table.GenericParamConstraint:
+					size = GetTableIndexSize (Table.GenericParam)	// Owner
+						+ GetCodedIndexSize (CodedIndex.TypeDefOrRef);	// Constraint
+					break;
+				default:
+					throw new NotSupportedException ();
+				}
+
+				int index = (int) table;
+
+				tables [index].RowSize = (uint) size;
+				tables [index].Offset = offset;
+
+				offset += (uint) size * tables [index].Length;
+			}
+		}
+
+		public static Image ReadImageFrom (Stream stream)
+		{
+			try {
+				var reader = new ImageReader (stream);
+				reader.ReadImage ();
+				return reader.image;
+			} catch (EndOfStreamException e) {
+				throw new BadImageFormatException (stream.GetFullyQualifiedName (), e);
+			}
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PE/ImageWriter.cs b/src/Core/Compiler/Importer/IL/PE/ImageWriter.cs
new file mode 100644
index 000000000..4e3d965b0
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PE/ImageWriter.cs
@@ -0,0 +1,820 @@
+//
+// ImageWriter.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+
+#if !IL_READ_ONLY
+
+using ScriptSharp.Importer.IL.Cil;
+using ScriptSharp.Importer.IL.Metadata;
+
+using RVA = System.UInt32;
+
+namespace ScriptSharp.Importer.IL.PE {
+
+	sealed class ImageWriter : BinaryStreamWriter {
+
+		readonly ModuleDefinition module;
+		readonly MetadataBuilder metadata;
+		readonly TextMap text_map;
+
+		ImageDebugDirectory debug_directory;
+		byte [] debug_data;
+
+		ByteBuffer win32_resources;
+
+		const uint pe_header_size = 0x178u;
+		const uint section_header_size = 0x28u;
+		const uint file_alignment = 0x200;
+		const uint section_alignment = 0x2000;
+		const ulong image_base = 0x00400000;
+
+		internal const RVA text_rva = 0x2000;
+
+		readonly bool pe64;
+		readonly uint time_stamp;
+
+		internal Section text;
+		internal Section rsrc;
+		internal Section reloc;
+
+		ushort sections;
+
+		ImageWriter (ModuleDefinition module, MetadataBuilder metadata, Stream stream)
+			: base (stream)
+		{
+			this.module = module;
+			this.metadata = metadata;
+			this.GetDebugHeader ();
+			this.GetWin32Resources ();
+			this.text_map = BuildTextMap ();
+			this.sections = 2; // text + reloc
+			this.pe64 = module.Architecture != TargetArchitecture.I386;
+			this.time_stamp = (uint) DateTime.UtcNow.Subtract (new DateTime (1970, 1, 1)).TotalSeconds;
+		}
+
+		void GetDebugHeader ()
+		{
+			var symbol_writer = metadata.symbol_writer;
+			if (symbol_writer == null)
+				return;
+
+			if (!symbol_writer.GetDebugHeader (out debug_directory, out debug_data))
+				debug_data = Empty<byte>.Array;
+		}
+
+		void GetWin32Resources ()
+		{
+			var rsrc = GetImageResourceSection ();
+			if (rsrc == null)
+				return;
+
+			var raw_resources = new byte [rsrc.Data.Length];
+			Buffer.BlockCopy (rsrc.Data, 0, raw_resources, 0, rsrc.Data.Length);
+			win32_resources = new ByteBuffer (raw_resources);
+		}
+
+		Section GetImageResourceSection ()
+		{
+			if (!module.HasImage)
+				return null;
+
+			const string rsrc_section = ".rsrc";
+
+			return module.Image.GetSection (rsrc_section);
+		}
+
+		public static ImageWriter CreateWriter (ModuleDefinition module, MetadataBuilder metadata, Stream stream)
+		{
+			var writer = new ImageWriter (module, metadata, stream);
+			writer.BuildSections ();
+			return writer;
+		}
+
+		void BuildSections ()
+		{
+			var has_win32_resources = win32_resources != null;
+			if (has_win32_resources)
+				sections++;
+
+			text = CreateSection (".text", text_map.GetLength (), null);
+			var previous = text;
+
+			if (has_win32_resources) {
+				rsrc = CreateSection (".rsrc", (uint) win32_resources.length, previous);
+
+				PatchWin32Resources (win32_resources);
+				previous = rsrc;
+			}
+
+			reloc = CreateSection (".reloc", 12u, previous);
+		}
+
+		Section CreateSection (string name, uint size, Section previous)
+		{
+			return new Section {
+				Name = name,
+				VirtualAddress = previous != null
+					? previous.VirtualAddress + Align (previous.VirtualSize, section_alignment)
+					: text_rva,
+				VirtualSize = size,
+				PointerToRawData = previous != null
+					? previous.PointerToRawData + previous.SizeOfRawData
+					: Align (GetHeaderSize (), file_alignment),
+				SizeOfRawData = Align (size, file_alignment)
+			};
+		}
+
+		static uint Align (uint value, uint align)
+		{
+			align--;
+			return (value + align) & ~align;
+		}
+
+		void WriteDOSHeader ()
+		{
+			Write (new byte [] {
+				// dos header start
+				0x4d, 0x5a, 0x90, 0x00, 0x03, 0x00, 0x00,
+				0x00, 0x04, 0x00, 0x00, 0x00, 0xff, 0xff,
+				0x00, 0x00, 0xb8, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00, 0x00, 0x00, 0x00,
+				// lfanew
+				0x80, 0x00, 0x00, 0x00,
+				// dos header end
+				0x0e, 0x1f, 0xba, 0x0e, 0x00, 0xb4, 0x09,
+				0xcd, 0x21, 0xb8, 0x01, 0x4c, 0xcd, 0x21,
+				0x54, 0x68, 0x69, 0x73, 0x20, 0x70, 0x72,
+				0x6f, 0x67, 0x72, 0x61, 0x6d, 0x20, 0x63,
+				0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x20, 0x62,
+				0x65, 0x20, 0x72, 0x75, 0x6e, 0x20, 0x69,
+				0x6e, 0x20, 0x44, 0x4f, 0x53, 0x20, 0x6d,
+				0x6f, 0x64, 0x65, 0x2e, 0x0d, 0x0d, 0x0a,
+				0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+				0x00
+			});
+		}
+
+		void WritePEFileHeader ()
+		{
+			WriteUInt32 (0x00004550);		// Magic
+			WriteUInt16 (GetMachine ());	// Machine
+			WriteUInt16 (sections);			// NumberOfSections
+			WriteUInt32 (time_stamp);
+			WriteUInt32 (0);	// PointerToSymbolTable
+			WriteUInt32 (0);	// NumberOfSymbols
+			WriteUInt16 ((ushort) (!pe64 ? 0xe0 : 0xf0));	// SizeOfOptionalHeader
+
+			// ExecutableImage | (pe64 ? 32BitsMachine : LargeAddressAware)
+			var characteristics = (ushort) (0x0002 | (!pe64 ? 0x0100 : 0x0020));
+			if (module.Kind == ModuleKind.Dll || module.Kind == ModuleKind.NetModule)
+				characteristics |= 0x2000;
+			WriteUInt16 (characteristics);	// Characteristics
+		}
+
+		ushort GetMachine ()
+		{
+			switch (module.Architecture) {
+			case TargetArchitecture.I386:
+				return 0x014c;
+			case TargetArchitecture.AMD64:
+				return 0x8664;
+			case TargetArchitecture.IA64:
+				return 0x0200;
+			}
+
+			throw new NotSupportedException ();
+		}
+
+		void WriteOptionalHeaders ()
+		{
+			WriteUInt16 ((ushort) (!pe64 ? 0x10b : 0x20b));	// Magic
+			WriteByte (8);	// LMajor
+			WriteByte (0);	// LMinor
+			WriteUInt32 (text.SizeOfRawData);	// CodeSize
+			WriteUInt32 (reloc.SizeOfRawData
+				+ (rsrc != null ? rsrc.SizeOfRawData : 0));	// InitializedDataSize
+			WriteUInt32 (0);	// UninitializedDataSize
+
+			var entry_point_rva = text_map.GetRVA (TextSegment.StartupStub);
+			if (module.Architecture == TargetArchitecture.IA64)
+				entry_point_rva += 0x20;
+			WriteUInt32 (entry_point_rva); // EntryPointRVA
+			WriteUInt32 (text_rva);	// BaseOfCode
+
+			if (!pe64) {
+				WriteUInt32 (0);	// BaseOfData
+				WriteUInt32 ((uint) image_base);	// ImageBase
+			} else {
+				WriteUInt64 (image_base);	// ImageBase
+			}
+
+			WriteUInt32 (section_alignment);	// SectionAlignment
+			WriteUInt32 (file_alignment);		// FileAlignment
+
+			WriteUInt16 (4);	// OSMajor
+			WriteUInt16 (0);	// OSMinor
+			WriteUInt16 (0);	// UserMajor
+			WriteUInt16 (0);	// UserMinor
+			WriteUInt16 (4);	// SubSysMajor
+			WriteUInt16 (0);	// SubSysMinor
+			WriteUInt32 (0);	// Reserved
+
+			WriteUInt32 (reloc.VirtualAddress + Align (reloc.VirtualSize, section_alignment));	// ImageSize
+			WriteUInt32 (text.PointerToRawData);	// HeaderSize
+
+			WriteUInt32 (0);	// Checksum
+			WriteUInt16 (GetSubSystem ());	// SubSystem
+			WriteUInt16 (0x8540);	// DLLFlags
+
+			const ulong stack_reserve = 0x100000;
+			const ulong stack_commit = 0x1000;
+			const ulong heap_reserve = 0x100000;
+			const ulong heap_commit = 0x1000;
+
+			if (!pe64) {
+				WriteUInt32 ((uint) stack_reserve);
+				WriteUInt32 ((uint) stack_commit);
+				WriteUInt32 ((uint) heap_reserve);
+				WriteUInt32 ((uint) heap_commit);
+			} else {
+				WriteUInt64 (stack_reserve);
+				WriteUInt64 (stack_commit);
+				WriteUInt64 (heap_reserve);
+				WriteUInt64 (heap_commit);
+			}
+
+			WriteUInt32 (0);	// LoaderFlags
+			WriteUInt32 (16);	// NumberOfDataDir
+
+			WriteZeroDataDirectory ();	// ExportTable
+			WriteDataDirectory (text_map.GetDataDirectory (TextSegment.ImportDirectory));	// ImportTable
+			if (rsrc != null) {							// ResourceTable
+				WriteUInt32 (rsrc.VirtualAddress);
+				WriteUInt32 (rsrc.VirtualSize);
+			} else
+				WriteZeroDataDirectory ();
+
+			WriteZeroDataDirectory ();	// ExceptionTable
+			WriteZeroDataDirectory ();	// CertificateTable
+			WriteUInt32 (reloc.VirtualAddress);			// BaseRelocationTable
+			WriteUInt32 (reloc.VirtualSize);
+
+			if (text_map.GetLength (TextSegment.DebugDirectory) > 0) {
+				WriteUInt32 (text_map.GetRVA (TextSegment.DebugDirectory));
+				WriteUInt32 (28u);
+			} else
+				WriteZeroDataDirectory ();
+
+			WriteZeroDataDirectory ();	// Copyright
+			WriteZeroDataDirectory ();	// GlobalPtr
+			WriteZeroDataDirectory ();	// TLSTable
+			WriteZeroDataDirectory ();	// LoadConfigTable
+			WriteZeroDataDirectory ();	// BoundImport
+			WriteDataDirectory (text_map.GetDataDirectory (TextSegment.ImportAddressTable));	// IAT
+			WriteZeroDataDirectory ();	// DelayImportDesc
+			WriteDataDirectory (text_map.GetDataDirectory (TextSegment.CLIHeader));	// CLIHeader
+			WriteZeroDataDirectory ();	// Reserved
+		}
+
+		void WriteZeroDataDirectory ()
+		{
+			WriteUInt32 (0);
+			WriteUInt32 (0);
+		}
+
+		ushort GetSubSystem ()
+		{
+			switch (module.Kind) {
+			case ModuleKind.Console:
+			case ModuleKind.Dll:
+			case ModuleKind.NetModule:
+				return 0x3;
+			case ModuleKind.Windows:
+				return 0x2;
+			default:
+				throw new ArgumentOutOfRangeException ();
+			}
+		}
+
+		void WriteSectionHeaders ()
+		{
+			WriteSection (text, 0x60000020);
+
+			if (rsrc != null)
+				WriteSection (rsrc, 0x40000040);
+
+			WriteSection (reloc, 0x42000040);
+		}
+
+		void WriteSection (Section section, uint characteristics)
+		{
+			var name = new byte [8];
+			var sect_name = section.Name;
+			for (int i = 0; i < sect_name.Length; i++)
+				name [i] = (byte) sect_name [i];
+
+			WriteBytes (name);
+			WriteUInt32 (section.VirtualSize);
+			WriteUInt32 (section.VirtualAddress);
+			WriteUInt32 (section.SizeOfRawData);
+			WriteUInt32 (section.PointerToRawData);
+			WriteUInt32 (0);	// PointerToRelocations
+			WriteUInt32 (0);	// PointerToLineNumbers
+			WriteUInt16 (0);	// NumberOfRelocations
+			WriteUInt16 (0);	// NumberOfLineNumbers
+			WriteUInt32 (characteristics);
+		}
+
+		void MoveTo (uint pointer)
+		{
+			BaseStream.Seek (pointer, SeekOrigin.Begin);
+		}
+
+		void MoveToRVA (Section section, RVA rva)
+		{
+			BaseStream.Seek (section.PointerToRawData + rva - section.VirtualAddress, SeekOrigin.Begin);
+		}
+
+		void MoveToRVA (TextSegment segment)
+		{
+			MoveToRVA (text, text_map.GetRVA (segment));
+		}
+
+		void WriteRVA (RVA rva)
+		{
+			if (!pe64)
+				WriteUInt32 (rva);
+			else
+				WriteUInt64 (rva);
+		}
+
+		void WriteText ()
+		{
+			MoveTo (text.PointerToRawData);
+
+			// ImportAddressTable
+
+			WriteRVA (text_map.GetRVA (TextSegment.ImportHintNameTable));
+			WriteRVA (0);
+
+			// CLIHeader
+
+			WriteUInt32 (0x48);
+			WriteUInt16 (2);
+			WriteUInt16 ((ushort) ((module.Runtime <= TargetRuntime.Net_1_1) ? 0 : 5));
+
+			WriteUInt32 (text_map.GetRVA (TextSegment.MetadataHeader));
+			WriteUInt32 (GetMetadataLength ());
+			WriteUInt32 ((uint) module.Attributes);
+			WriteUInt32 (metadata.entry_point.ToUInt32 ());
+			WriteDataDirectory (text_map.GetDataDirectory (TextSegment.Resources));
+			WriteDataDirectory (text_map.GetDataDirectory (TextSegment.StrongNameSignature));
+			WriteZeroDataDirectory ();	// CodeManagerTable
+			WriteZeroDataDirectory ();	// VTableFixups
+			WriteZeroDataDirectory ();	// ExportAddressTableJumps
+			WriteZeroDataDirectory ();	// ManagedNativeHeader
+
+			// Code
+
+			MoveToRVA (TextSegment.Code);
+			WriteBuffer (metadata.code);
+
+			// Resources
+
+			MoveToRVA (TextSegment.Resources);
+			WriteBuffer (metadata.resources);
+
+			// Data
+
+			if (metadata.data.length > 0) {
+				MoveToRVA (TextSegment.Data);
+				WriteBuffer (metadata.data);
+			}
+
+			// StrongNameSignature
+			// stays blank
+
+			// MetadataHeader
+
+			MoveToRVA (TextSegment.MetadataHeader);
+			WriteMetadataHeader ();
+
+			WriteMetadata ();
+
+			// DebugDirectory
+			if (text_map.GetLength (TextSegment.DebugDirectory) > 0) {
+				MoveToRVA (TextSegment.DebugDirectory);
+				WriteDebugDirectory ();
+			}
+
+			// ImportDirectory
+			MoveToRVA (TextSegment.ImportDirectory);
+			WriteImportDirectory ();
+
+			// StartupStub
+			MoveToRVA (TextSegment.StartupStub);
+			WriteStartupStub ();
+		}
+
+		uint GetMetadataLength ()
+		{
+			return text_map.GetRVA (TextSegment.DebugDirectory) - text_map.GetRVA (TextSegment.MetadataHeader);
+		}
+
+		void WriteMetadataHeader ()
+		{
+			WriteUInt32 (0x424a5342);	// Signature
+			WriteUInt16 (1);	// MajorVersion
+			WriteUInt16 (1);	// MinorVersion
+			WriteUInt32 (0);	// Reserved
+
+			var version = GetZeroTerminatedString (GetVersion ());
+			WriteUInt32 ((uint) version.Length);
+			WriteBytes (version);
+			WriteUInt16 (0);	// Flags
+			WriteUInt16 (GetStreamCount ());
+
+			uint offset = text_map.GetRVA (TextSegment.TableHeap) - text_map.GetRVA (TextSegment.MetadataHeader);
+
+			WriteStreamHeader (ref offset, TextSegment.TableHeap, "#~");
+			WriteStreamHeader (ref offset, TextSegment.StringHeap, "#Strings");
+			WriteStreamHeader (ref offset, TextSegment.UserStringHeap, "#US");
+			WriteStreamHeader (ref offset, TextSegment.GuidHeap, "#GUID");
+			WriteStreamHeader (ref offset, TextSegment.BlobHeap, "#Blob");
+		}
+
+		string GetVersion ()
+		{
+			switch (module.Runtime) {
+			case TargetRuntime.Net_1_0:
+				return "v1.0.3705";
+			case TargetRuntime.Net_1_1:
+				return "v1.1.4322";
+			case TargetRuntime.Net_2_0:
+				return "v2.0.50727";
+			case TargetRuntime.Net_4_0:
+			default:
+				return "v4.0.30319";
+			}
+		}
+
+		ushort GetStreamCount ()
+		{
+			return (ushort) (
+				1	// #~
+				+ 1	// #Strings
+				+ (metadata.user_string_heap.IsEmpty ? 0 : 1)	// #US
+				+ 1	// GUID
+				+ (metadata.blob_heap.IsEmpty ? 0 : 1));	// #Blob
+		}
+
+		void WriteStreamHeader (ref uint offset, TextSegment heap, string name)
+		{
+			var length = (uint) text_map.GetLength (heap);
+			if (length == 0)
+				return;
+
+			WriteUInt32 (offset);
+			WriteUInt32 (length);
+			WriteBytes (GetZeroTerminatedString (name));
+			offset += length;
+		}
+
+		static byte [] GetZeroTerminatedString (string @string)
+		{
+			return GetString (@string, (@string.Length + 1 + 3) & ~3);
+		}
+
+		static byte [] GetSimpleString (string @string)
+		{
+			return GetString (@string, @string.Length);
+		}
+
+		static byte [] GetString (string @string, int length)
+		{
+			var bytes = new byte [length];
+			for (int i = 0; i < @string.Length; i++)
+				bytes [i] = (byte) @string [i];
+
+			return bytes;
+		}
+
+		void WriteMetadata ()
+		{
+			WriteHeap (TextSegment.TableHeap, metadata.table_heap);
+			WriteHeap (TextSegment.StringHeap, metadata.string_heap);
+			WriteHeap (TextSegment.UserStringHeap, metadata.user_string_heap);
+			WriteGuidHeap ();
+			WriteHeap (TextSegment.BlobHeap, metadata.blob_heap);
+		}
+
+		void WriteHeap (TextSegment heap, HeapBuffer buffer)
+		{
+			if (buffer.IsEmpty)
+				return;
+
+			MoveToRVA (heap);
+			WriteBuffer (buffer);
+		}
+
+		void WriteGuidHeap ()
+		{
+			MoveToRVA (TextSegment.GuidHeap);
+			WriteBytes (module.Mvid.ToByteArray ());
+		}
+
+		void WriteDebugDirectory ()
+		{
+			WriteInt32 (debug_directory.Characteristics);
+			WriteUInt32 (time_stamp);
+			WriteInt16 (debug_directory.MajorVersion);
+			WriteInt16 (debug_directory.MinorVersion);
+			WriteInt32 (debug_directory.Type);
+			WriteInt32 (debug_directory.SizeOfData);
+			WriteInt32 (debug_directory.AddressOfRawData);
+			WriteInt32 ((int) BaseStream.Position + 4);
+
+			WriteBytes (debug_data);
+		}
+
+		void WriteImportDirectory ()
+		{
+			WriteUInt32 (text_map.GetRVA (TextSegment.ImportDirectory) + 40);	// ImportLookupTable
+			WriteUInt32 (0);	// DateTimeStamp
+			WriteUInt32 (0);	// ForwarderChain
+			WriteUInt32 (text_map.GetRVA (TextSegment.ImportHintNameTable) + 14);
+			WriteUInt32 (text_map.GetRVA (TextSegment.ImportAddressTable));
+			Advance (20);
+
+			// ImportLookupTable
+			WriteUInt32 (text_map.GetRVA (TextSegment.ImportHintNameTable));
+
+			// ImportHintNameTable
+			MoveToRVA (TextSegment.ImportHintNameTable);
+
+			WriteUInt16 (0);	// Hint
+			WriteBytes (GetRuntimeMain ());
+			WriteByte (0);
+			WriteBytes (GetSimpleString ("mscoree.dll"));
+			WriteUInt16 (0);
+		}
+
+		byte [] GetRuntimeMain ()
+		{
+			return module.Kind == ModuleKind.Dll || module.Kind == ModuleKind.NetModule
+				? GetSimpleString ("_CorDllMain")
+				: GetSimpleString ("_CorExeMain");
+		}
+
+		void WriteStartupStub ()
+		{
+			switch (module.Architecture) {
+			case TargetArchitecture.I386:
+				WriteUInt16 (0x25ff);
+				WriteUInt32 ((uint) image_base + text_map.GetRVA (TextSegment.ImportAddressTable));
+				return;
+			case TargetArchitecture.AMD64:
+				WriteUInt16 (0xa148);
+				WriteUInt32 ((uint) image_base + text_map.GetRVA (TextSegment.ImportAddressTable));
+				WriteUInt16 (0xe0ff);
+				return;
+			case TargetArchitecture.IA64:
+				WriteBytes (new byte [] {
+					0x0b, 0x48, 0x00, 0x02, 0x18, 0x10, 0xa0, 0x40, 0x24, 0x30, 0x28, 0x00, 0x00, 0x00, 0x04, 0x00,
+					0x10, 0x08, 0x00, 0x12, 0x18, 0x10, 0x60, 0x50, 0x04, 0x80, 0x03, 0x00, 0x60, 0x00, 0x80, 0x00
+				});
+				WriteUInt32 ((uint) image_base + text_map.GetRVA (TextSegment.StartupStub));
+				WriteUInt32 ((uint) image_base + text_rva);
+				return;
+			}
+		}
+
+		void WriteRsrc ()
+		{
+			MoveTo (rsrc.PointerToRawData);
+			WriteBuffer (win32_resources);
+		}
+
+		void WriteReloc ()
+		{
+			MoveTo (reloc.PointerToRawData);
+
+			var reloc_rva = text_map.GetRVA (TextSegment.StartupStub);
+			reloc_rva += module.Architecture == TargetArchitecture.IA64 ? 0x20u : 2;
+			var page_rva = reloc_rva & ~0xfffu;
+
+			WriteUInt32 (page_rva);	// PageRVA
+			WriteUInt32 (0x000c);	// Block Size
+
+			switch (module.Architecture) {
+			case TargetArchitecture.I386:
+				WriteUInt32 (0x3000 + reloc_rva - page_rva);
+				break;
+			case TargetArchitecture.AMD64:
+				WriteUInt32 (0xa000 + reloc_rva - page_rva);
+				break;
+			case TargetArchitecture.IA64:
+				WriteUInt16 ((ushort) (0xa000 + reloc_rva - page_rva));
+				WriteUInt16 ((ushort) (0xa000 + reloc_rva - page_rva + 8));
+				break;
+			}
+
+			WriteBytes (new byte [file_alignment - reloc.VirtualSize]);
+		}
+
+		public void WriteImage ()
+		{
+			WriteDOSHeader ();
+			WritePEFileHeader ();
+			WriteOptionalHeaders ();
+			WriteSectionHeaders ();
+			WriteText ();
+			if (rsrc != null)
+				WriteRsrc ();
+			WriteReloc ();
+		}
+
+		TextMap BuildTextMap ()
+		{
+			var map = metadata.text_map;
+
+			map.AddMap (TextSegment.Code, metadata.code.length, !pe64 ? 4 : 16);
+			map.AddMap (TextSegment.Resources, metadata.resources.length, 8);
+			map.AddMap (TextSegment.Data, metadata.data.length, 4);
+			if (metadata.data.length > 0)
+				metadata.table_heap.FixupData (map.GetRVA (TextSegment.Data));
+			map.AddMap (TextSegment.StrongNameSignature, GetStrongNameLength (), 4);
+
+			map.AddMap (TextSegment.MetadataHeader, GetMetadataHeaderLength ());
+			map.AddMap (TextSegment.TableHeap, metadata.table_heap.length, 4);
+			map.AddMap (TextSegment.StringHeap, metadata.string_heap.length, 4);
+			map.AddMap (TextSegment.UserStringHeap, metadata.user_string_heap.IsEmpty ? 0 : metadata.user_string_heap.length, 4);
+			map.AddMap (TextSegment.GuidHeap, 16);
+			map.AddMap (TextSegment.BlobHeap, metadata.blob_heap.IsEmpty ? 0 : metadata.blob_heap.length, 4);
+
+			int debug_dir_len = 0;
+			if (!debug_data.IsNullOrEmpty ()) {
+				const int debug_dir_header_len = 28;
+
+				debug_directory.AddressOfRawData = (int) map.GetNextRVA (TextSegment.BlobHeap) + debug_dir_header_len;
+				debug_dir_len = debug_data.Length + debug_dir_header_len;
+			}
+
+			map.AddMap (TextSegment.DebugDirectory, debug_dir_len, 4);
+
+			RVA import_dir_rva = map.GetNextRVA (TextSegment.DebugDirectory);
+			RVA import_hnt_rva = import_dir_rva + (!pe64 ? 48u : 52u);
+			import_hnt_rva = (import_hnt_rva + 15u) & ~15u;
+			uint import_dir_len = (import_hnt_rva - import_dir_rva) + 27u;
+
+			RVA startup_stub_rva = import_dir_rva + import_dir_len;
+			startup_stub_rva = module.Architecture == TargetArchitecture.IA64
+				? (startup_stub_rva + 15u) & ~15u
+				: 2 + ((startup_stub_rva + 3u) & ~3u);
+
+			map.AddMap (TextSegment.ImportDirectory, new Range (import_dir_rva, import_dir_len));
+			map.AddMap (TextSegment.ImportHintNameTable, new Range (import_hnt_rva, 0));
+			map.AddMap (TextSegment.StartupStub, new Range (startup_stub_rva, GetStartupStubLength ()));
+
+			return map;
+		}
+
+		uint GetStartupStubLength ()
+		{
+			switch (module.Architecture) {
+			case TargetArchitecture.I386:
+				return 6;
+			case TargetArchitecture.AMD64:
+				return 12;
+			case TargetArchitecture.IA64:
+				return 48;
+			default:
+				throw new InvalidOperationException ();
+			}
+		}
+
+		int GetMetadataHeaderLength ()
+		{
+			return
+				// MetadataHeader
+				40
+				// #~ header
+				+ 12
+				// #Strings header
+				+ 20
+				// #US header
+				+ (metadata.user_string_heap.IsEmpty ? 0 : 12)
+				// #GUID header
+				+ 16
+				// #Blob header
+				+ (metadata.blob_heap.IsEmpty ? 0 : 16);
+		}
+
+		int GetStrongNameLength ()
+		{
+			if ((module.Attributes & ModuleAttributes.StrongNameSigned) == 0)
+				return 0;
+
+			if (module.Assembly == null)
+				throw new InvalidOperationException ();
+
+			var public_key = module.Assembly.Name.PublicKey;
+
+			if (public_key != null) {
+				// in fx 2.0 the key may be from 384 to 16384 bits
+				// so we must calculate the signature size based on
+				// the size of the public key (minus the 32 byte header)
+				int size = public_key.Length;
+				if (size > 32)
+					return size - 32;
+				// note: size == 16 for the ECMA "key" which is replaced
+				// by the runtime with a 1024 bits key (128 bytes)
+			}
+
+			return 128; // default strongname signature size
+		}
+
+		public DataDirectory GetStrongNameSignatureDirectory ()
+		{
+			return text_map.GetDataDirectory (TextSegment.StrongNameSignature);
+		}
+
+		public uint GetHeaderSize ()
+		{
+			return pe_header_size + (sections * section_header_size);
+		}
+
+		void PatchWin32Resources (ByteBuffer resources)
+		{
+			PatchResourceDirectoryTable (resources);
+		}
+
+		void PatchResourceDirectoryTable (ByteBuffer resources)
+		{
+			resources.Advance (12);
+
+			var entries = resources.ReadUInt16 () + resources.ReadUInt16 ();
+
+			for (int i = 0; i < entries; i++)
+				PatchResourceDirectoryEntry (resources);
+		}
+
+		void PatchResourceDirectoryEntry (ByteBuffer resources)
+		{
+			resources.Advance (4);
+			var child = resources.ReadUInt32 ();
+
+			var position = resources.position;
+			resources.position = (int) child & 0x7fffffff;
+
+			if ((child & 0x80000000) != 0)
+				PatchResourceDirectoryTable (resources);
+			else
+				PatchResourceDataEntry (resources);
+
+			resources.position = position;
+		}
+
+		void PatchResourceDataEntry (ByteBuffer resources)
+		{
+			var old_rsrc = GetImageResourceSection ();
+			var rva = resources.ReadUInt32 ();
+			resources.position -= 4;
+			resources.WriteUInt32 (rva - old_rsrc.VirtualAddress + rsrc.VirtualAddress);
+		}
+	}
+}
+
+#endif
diff --git a/src/Core/Compiler/Importer/IL/PE/Section.cs b/src/Core/Compiler/Importer/IL/PE/Section.cs
new file mode 100644
index 000000000..c002b1534
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PE/Section.cs
@@ -0,0 +1,45 @@
+//
+// Section.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using RVA = System.UInt32;
+
+namespace ScriptSharp.Importer.IL.PE {
+
+	sealed class Section {
+		public string Name;
+		public RVA VirtualAddress;
+#if !IL_READ_ONLY
+		public uint VirtualSize;
+#endif
+		public uint SizeOfRawData;
+		public uint PointerToRawData;
+		public byte [] Data;
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PE/TextMap.cs b/src/Core/Compiler/Importer/IL/PE/TextMap.cs
new file mode 100644
index 000000000..0dcaf842d
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PE/TextMap.cs
@@ -0,0 +1,129 @@
+//
+// TextMap.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+#if !IL_READ_ONLY
+
+using RVA = System.UInt32;
+
+namespace ScriptSharp.Importer.IL.PE {
+
+	enum TextSegment {
+		ImportAddressTable,
+		CLIHeader,
+		Code,
+		Resources,
+		Data,
+		StrongNameSignature,
+
+		// Metadata
+		MetadataHeader,
+		TableHeap,
+		StringHeap,
+		UserStringHeap,
+		GuidHeap,
+		BlobHeap,
+		// End Metadata
+
+		DebugDirectory,
+		ImportDirectory,
+		ImportHintNameTable,
+		StartupStub,
+	}
+
+	sealed class TextMap {
+
+		readonly Range [] map = new Range [16 /*Enum.GetValues (typeof (TextSegment)).Length*/];
+
+		public void AddMap (TextSegment segment, int length)
+		{
+			map [(int) segment] = new Range (GetStart (segment), (uint) length);
+		}
+
+		public void AddMap (TextSegment segment, int length, int align)
+		{
+			align--;
+
+			AddMap (segment, (length + align) & ~align);
+		}
+
+		public void AddMap (TextSegment segment, Range range)
+		{
+			map [(int) segment] = range;
+		}
+
+		public Range GetRange (TextSegment segment)
+		{
+			return map [(int) segment];
+		}
+
+		public DataDirectory GetDataDirectory (TextSegment segment)
+		{
+			var range = map [(int) segment];
+
+			return new DataDirectory (range.Length == 0 ? 0 : range.Start, range.Length);
+		}
+
+		public RVA GetRVA (TextSegment segment)
+		{
+			return map [(int) segment].Start;
+		}
+
+		public RVA GetNextRVA (TextSegment segment)
+		{
+			var i = (int) segment;
+			return map [i].Start + map [i].Length;
+		}
+
+		public int GetLength (TextSegment segment)
+		{
+			return (int) map [(int) segment].Length;
+		}
+
+		RVA GetStart (TextSegment segment)
+		{
+			var index = (int) segment;
+			return index == 0 ? ImageWriter.text_rva : ComputeStart (index);
+		}
+
+		RVA ComputeStart (int index)
+		{
+			index--;
+			return map [index].Start + map [index].Length;
+		}
+
+		public uint GetLength ()
+		{
+			var range = map [(int) TextSegment.StartupStub];
+			return range.Start - ImageWriter.text_rva + range.Length;
+		}
+	}
+}
+
+#endif
diff --git a/src/Core/Compiler/Importer/IL/PInvokeAttributes.cs b/src/Core/Compiler/Importer/IL/PInvokeAttributes.cs
new file mode 100644
index 000000000..73a30892a
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PInvokeAttributes.cs
@@ -0,0 +1,62 @@
+//
+// PInvokeAttributes.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+	[Flags]
+    internal /* public */ enum PInvokeAttributes : ushort {
+		NoMangle			= 0x0001,	// PInvoke is to use the member name as specified
+
+		// Character set
+		CharSetMask			= 0x0006,
+		CharSetNotSpec		= 0x0000,
+		CharSetAnsi			= 0x0002,
+		CharSetUnicode		= 0x0004,
+		CharSetAuto			= 0x0006,
+
+		SupportsLastError	= 0x0040,	// Information about target function. Not relevant for fields
+
+		// Calling convetion
+		CallConvMask		= 0x0700,
+		CallConvWinapi		= 0x0100,
+		CallConvCdecl		= 0x0200,
+		CallConvStdCall		= 0x0300,
+		CallConvThiscall	= 0x0400,
+		CallConvFastcall	= 0x0500,
+
+		BestFitMask			= 0x0030,
+		BestFitEnabled		= 0x0010,
+		BestFidDisabled		= 0x0020,
+
+		ThrowOnUnmappableCharMask = 0x3000,
+		ThrowOnUnmappableCharEnabled = 0x1000,
+		ThrowOnUnmappableCharDisabled = 0x2000,
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PInvokeInfo.cs b/src/Core/Compiler/Importer/IL/PInvokeInfo.cs
new file mode 100644
index 000000000..8e493a617
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PInvokeInfo.cs
@@ -0,0 +1,138 @@
+//
+// PInvokeInfo.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class PInvokeInfo {
+
+		ushort attributes;
+		string entry_point;
+		ModuleReference module;
+
+		public PInvokeAttributes Attributes {
+			get { return (PInvokeAttributes) attributes; }
+			set { attributes = (ushort) value; }
+		}
+
+		public string EntryPoint {
+			get { return entry_point; }
+			set { entry_point = value; }
+		}
+
+		public ModuleReference Module {
+			get { return module; }
+			set { module = value; }
+		}
+
+		#region PInvokeAttributes
+
+		public bool IsNoMangle {
+			get { return attributes.GetAttributes ((ushort) PInvokeAttributes.NoMangle); }
+			set { attributes = attributes.SetAttributes ((ushort) PInvokeAttributes.NoMangle, value); }
+		}
+
+		public bool IsCharSetNotSpec {
+			get { return attributes.GetMaskedAttributes((ushort) PInvokeAttributes.CharSetMask, (ushort) PInvokeAttributes.CharSetNotSpec); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) PInvokeAttributes.CharSetMask, (ushort) PInvokeAttributes.CharSetNotSpec, value); }
+		}
+
+		public bool IsCharSetAnsi {
+			get { return attributes.GetMaskedAttributes ((ushort) PInvokeAttributes.CharSetMask, (ushort) PInvokeAttributes.CharSetAnsi); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) PInvokeAttributes.CharSetMask, (ushort) PInvokeAttributes.CharSetAnsi, value); }
+		}
+
+		public bool IsCharSetUnicode {
+			get { return attributes.GetMaskedAttributes ((ushort) PInvokeAttributes.CharSetMask, (ushort) PInvokeAttributes.CharSetUnicode); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) PInvokeAttributes.CharSetMask, (ushort) PInvokeAttributes.CharSetUnicode, value); }
+		}
+
+		public bool IsCharSetAuto {
+			get { return attributes.GetMaskedAttributes ((ushort) PInvokeAttributes.CharSetMask, (ushort) PInvokeAttributes.CharSetAuto); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) PInvokeAttributes.CharSetMask, (ushort) PInvokeAttributes.CharSetAuto, value); }
+		}
+
+		public bool SupportsLastError {
+			get { return attributes.GetAttributes ((ushort) PInvokeAttributes.SupportsLastError); }
+			set { attributes = attributes.SetAttributes ((ushort) PInvokeAttributes.SupportsLastError, value); }
+		}
+
+		public bool IsCallConvWinapi {
+			get { return attributes.GetMaskedAttributes((ushort) PInvokeAttributes.CallConvMask, (ushort) PInvokeAttributes.CallConvWinapi); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) PInvokeAttributes.CallConvMask, (ushort) PInvokeAttributes.CallConvWinapi, value); }
+		}
+
+		public bool IsCallConvCdecl {
+			get { return attributes.GetMaskedAttributes ((ushort) PInvokeAttributes.CallConvMask, (ushort) PInvokeAttributes.CallConvCdecl); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) PInvokeAttributes.CallConvMask, (ushort) PInvokeAttributes.CallConvCdecl, value); }
+		}
+
+		public bool IsCallConvStdCall {
+			get { return attributes.GetMaskedAttributes ((ushort) PInvokeAttributes.CallConvMask, (ushort) PInvokeAttributes.CallConvStdCall); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) PInvokeAttributes.CallConvMask, (ushort) PInvokeAttributes.CallConvStdCall, value); }
+		}
+
+		public bool IsCallConvThiscall {
+			get { return attributes.GetMaskedAttributes ((ushort) PInvokeAttributes.CallConvMask, (ushort) PInvokeAttributes.CallConvThiscall); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) PInvokeAttributes.CallConvMask, (ushort) PInvokeAttributes.CallConvThiscall, value); }
+		}
+
+		public bool IsCallConvFastcall {
+			get { return attributes.GetMaskedAttributes ((ushort) PInvokeAttributes.CallConvMask, (ushort) PInvokeAttributes.CallConvFastcall); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) PInvokeAttributes.CallConvMask, (ushort) PInvokeAttributes.CallConvFastcall, value); }
+		}
+
+		public bool IsBestFistEnabled {
+			get { return attributes.GetMaskedAttributes ((ushort) PInvokeAttributes.BestFitMask, (ushort) PInvokeAttributes.BestFitEnabled); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) PInvokeAttributes.BestFitMask, (ushort) PInvokeAttributes.BestFitEnabled, value); }
+		}
+
+		public bool IsBestFistDisabled {
+			get { return attributes.GetMaskedAttributes ((ushort) PInvokeAttributes.BestFitMask, (ushort) PInvokeAttributes.BestFidDisabled); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) PInvokeAttributes.BestFitMask, (ushort) PInvokeAttributes.BestFidDisabled, value); }
+		}
+
+		public bool IsThrowOnUnmappableCharEnabled {
+			get { return attributes.GetMaskedAttributes ((ushort) PInvokeAttributes.ThrowOnUnmappableCharMask, (ushort) PInvokeAttributes.ThrowOnUnmappableCharEnabled); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) PInvokeAttributes.ThrowOnUnmappableCharMask, (ushort) PInvokeAttributes.ThrowOnUnmappableCharEnabled, value); }
+		}
+
+		public bool IsThrowOnUnmappableCharDisabled {
+			get { return attributes.GetMaskedAttributes ((ushort) PInvokeAttributes.ThrowOnUnmappableCharMask, (ushort) PInvokeAttributes.ThrowOnUnmappableCharDisabled); }
+			set { attributes = attributes.SetMaskedAttributes ((ushort) PInvokeAttributes.ThrowOnUnmappableCharMask, (ushort) PInvokeAttributes.ThrowOnUnmappableCharDisabled, value); }
+		}
+
+		#endregion
+
+		public PInvokeInfo (PInvokeAttributes attributes, string entryPoint, ModuleReference module)
+		{
+			this.attributes = (ushort) attributes;
+			this.entry_point = entryPoint;
+			this.module = module;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/ParameterAttributes.cs b/src/Core/Compiler/Importer/IL/ParameterAttributes.cs
new file mode 100644
index 000000000..5f560c117
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/ParameterAttributes.cs
@@ -0,0 +1,45 @@
+//
+// ParameterAttributes.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+	[Flags]
+	internal /* public */ enum ParameterAttributes : ushort {
+		None				= 0x0000,
+		In					= 0x0001,	// Param is [In]
+		Out					= 0x0002,	// Param is [Out]
+		Lcid				= 0x0004,
+		Retval				= 0x0008,
+		Optional			= 0x0010,	// Param is optional
+		HasDefault			= 0x1000,	// Param has default value
+		HasFieldMarshal		= 0x2000,	// Param has field marshal
+		Unused				= 0xcfe0	 // Reserved: shall be zero in a conforming implementation
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/ParameterDefinition.cs b/src/Core/Compiler/Importer/IL/ParameterDefinition.cs
new file mode 100644
index 000000000..ea0d2e6c0
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/ParameterDefinition.cs
@@ -0,0 +1,157 @@
+//
+// ParameterDefinition.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class ParameterDefinition : ParameterReference, ICustomAttributeProvider, IConstantProvider, IMarshalInfoProvider {
+
+		ushort attributes;
+
+		internal IMethodSignature method;
+
+		object constant = Mixin.NotResolved;
+		Collection<CustomAttribute> custom_attributes;
+		MarshalInfo marshal_info;
+
+		public ParameterAttributes Attributes {
+			get { return (ParameterAttributes) attributes; }
+			set { attributes = (ushort) value; }
+		}
+
+		public IMethodSignature Method {
+			get { return method; }
+		}
+
+		public bool HasConstant {
+			get {
+				ResolveConstant ();
+
+				return constant != Mixin.NoValue;
+			}
+			set { if (!value) constant = Mixin.NoValue; }
+		}
+
+		public object Constant {
+			get { return HasConstant ? constant : null;	}
+			set { constant = value; }
+		}
+
+		void ResolveConstant ()
+		{
+			if (constant != Mixin.NotResolved)
+				return;
+
+			this.ResolveConstant (ref constant, parameter_type.Module);
+		}
+
+		public bool HasCustomAttributes {
+			get {
+				if (custom_attributes != null)
+					return custom_attributes.Count > 0;
+
+				return this.GetHasCustomAttributes (parameter_type.Module);
+			}
+		}
+
+		public Collection<CustomAttribute> CustomAttributes {
+			get { return custom_attributes ?? (custom_attributes = this.GetCustomAttributes (parameter_type.Module)); }
+		}
+
+		public bool HasMarshalInfo {
+			get {
+				if (marshal_info != null)
+					return true;
+
+				return this.GetHasMarshalInfo (parameter_type.Module);
+			}
+		}
+
+		public MarshalInfo MarshalInfo {
+			get { return marshal_info ?? (marshal_info = this.GetMarshalInfo (parameter_type.Module)); }
+			set { marshal_info = value; }
+		}
+
+		#region ParameterAttributes
+
+		public bool IsIn {
+			get { return attributes.GetAttributes ((ushort) ParameterAttributes.In); }
+			set { attributes = attributes.SetAttributes ((ushort) ParameterAttributes.In, value); }
+		}
+
+		public bool IsOut {
+			get { return attributes.GetAttributes ((ushort) ParameterAttributes.Out); }
+			set { attributes = attributes.SetAttributes ((ushort) ParameterAttributes.Out, value); }
+		}
+
+		public bool IsLcid {
+			get { return attributes.GetAttributes ((ushort) ParameterAttributes.Lcid); }
+			set { attributes = attributes.SetAttributes ((ushort) ParameterAttributes.Lcid, value); }
+		}
+
+		public bool IsReturnValue {
+			get { return attributes.GetAttributes ((ushort) ParameterAttributes.Retval); }
+			set { attributes = attributes.SetAttributes ((ushort) ParameterAttributes.Retval, value); }
+		}
+
+		public bool IsOptional {
+			get { return attributes.GetAttributes ((ushort) ParameterAttributes.Optional); }
+			set { attributes = attributes.SetAttributes ((ushort) ParameterAttributes.Optional, value); }
+		}
+
+		public bool HasDefault {
+			get { return attributes.GetAttributes ((ushort) ParameterAttributes.HasDefault); }
+			set { attributes = attributes.SetAttributes ((ushort) ParameterAttributes.HasDefault, value); }
+		}
+
+		public bool HasFieldMarshal {
+			get { return attributes.GetAttributes ((ushort) ParameterAttributes.HasFieldMarshal); }
+			set { attributes = attributes.SetAttributes ((ushort) ParameterAttributes.HasFieldMarshal, value); }
+		}
+
+		#endregion
+
+		public ParameterDefinition (TypeReference parameterType)
+			: this (string.Empty, ParameterAttributes.None, parameterType)
+		{
+		}
+
+		public ParameterDefinition (string name, ParameterAttributes attributes, TypeReference parameterType)
+			: base (name, parameterType)
+		{
+			this.attributes = (ushort) attributes;
+			this.token = new MetadataToken (TokenType.Param);
+		}
+
+		public override ParameterDefinition Resolve ()
+		{
+			return this;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/ParameterDefinitionCollection.cs b/src/Core/Compiler/Importer/IL/ParameterDefinitionCollection.cs
new file mode 100644
index 000000000..ec530c5f4
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/ParameterDefinitionCollection.cs
@@ -0,0 +1,79 @@
+//
+// ParameterDefinitionCollection.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+	sealed class ParameterDefinitionCollection : Collection<ParameterDefinition> {
+
+		readonly IMethodSignature method;
+
+		internal ParameterDefinitionCollection (IMethodSignature method)
+		{
+			this.method = method;
+		}
+
+		internal ParameterDefinitionCollection (IMethodSignature method, int capacity)
+			: base (capacity)
+		{
+			this.method = method;
+		}
+
+		protected override void OnAdd (ParameterDefinition item, int index)
+		{
+			item.method = method;
+			item.index = index;
+		}
+
+		protected override void OnInsert (ParameterDefinition item, int index)
+		{
+			item.method = method;
+			item.index = index;
+
+			for (int i = index; i < size; i++)
+				items [i].index = i + 1;
+		}
+
+		protected override void OnSet (ParameterDefinition item, int index)
+		{
+			item.method = method;
+			item.index = index;
+		}
+
+		protected override void OnRemove (ParameterDefinition item, int index)
+		{
+			item.method = null;
+			item.index = -1;
+
+			for (int i = index + 1; i < size; i++)
+				items [i].index = i - 1;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/ParameterReference.cs b/src/Core/Compiler/Importer/IL/ParameterReference.cs
new file mode 100644
index 000000000..d79f95695
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/ParameterReference.cs
@@ -0,0 +1,75 @@
+//
+// ParameterReference.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ abstract class ParameterReference : IMetadataTokenProvider {
+
+		string name;
+		internal int index = -1;
+		protected TypeReference parameter_type;
+		internal MetadataToken token;
+
+		public string Name {
+			get { return name; }
+			set { name = value; }
+		}
+
+		public int Index {
+			get { return index; }
+		}
+
+		public TypeReference ParameterType {
+			get { return parameter_type; }
+			set { parameter_type = value; }
+		}
+
+		public MetadataToken MetadataToken {
+			get { return token; }
+			set { token = value; }
+		}
+
+		internal ParameterReference (string name, TypeReference parameterType)
+		{
+			if (parameterType == null)
+				throw new ArgumentNullException ("parameterType");
+
+			this.name = name ?? string.Empty;
+			this.parameter_type = parameterType;
+		}
+
+		public override string ToString ()
+		{
+			return name;
+		}
+
+		public abstract ParameterDefinition Resolve ();
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PinnedType.cs b/src/Core/Compiler/Importer/IL/PinnedType.cs
new file mode 100644
index 000000000..f158490d1
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PinnedType.cs
@@ -0,0 +1,53 @@
+//
+// PinnedType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using MD = ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class PinnedType : TypeSpecification {
+
+		public override bool IsValueType {
+			get { return false; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override bool IsPinned {
+			get { return true; }
+		}
+
+		public PinnedType (TypeReference type)
+			: base (type)
+		{
+			Mixin.CheckType (type);
+			this.etype = MD.ElementType.Pinned;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PointerType.cs b/src/Core/Compiler/Importer/IL/PointerType.cs
new file mode 100644
index 000000000..49cb30938
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PointerType.cs
@@ -0,0 +1,61 @@
+//
+// PointerType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using MD = ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class PointerType : TypeSpecification {
+
+		public override string Name {
+			get { return base.Name + "*"; }
+		}
+
+		public override string FullName {
+			get { return base.FullName + "*"; }
+		}
+
+		public override bool IsValueType {
+			get { return false; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override bool IsPointer {
+			get { return true; }
+		}
+
+		public PointerType (TypeReference type)
+			: base (type)
+		{
+			Mixin.CheckType (type);
+			this.etype = MD.ElementType.Ptr;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PropertyAttributes.cs b/src/Core/Compiler/Importer/IL/PropertyAttributes.cs
new file mode 100644
index 000000000..d49e04e88
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PropertyAttributes.cs
@@ -0,0 +1,41 @@
+//
+// PropertyAttributes.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+	[Flags]
+    internal /* public */ enum PropertyAttributes : ushort {
+		None			= 0x0000,
+		SpecialName		= 0x0200,	// Property is special
+		RTSpecialName	= 0x0400,	// Runtime(metadata internal APIs) should check name encoding
+		HasDefault		= 0x1000,	// Property has default
+		Unused			= 0xe9ff	 // Reserved: shall be zero in a conforming implementation
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PropertyDefinition.cs b/src/Core/Compiler/Importer/IL/PropertyDefinition.cs
new file mode 100644
index 000000000..aa4a4dd4a
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PropertyDefinition.cs
@@ -0,0 +1,263 @@
+//
+// PropertyDefinition.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System.Text;
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class PropertyDefinition : PropertyReference, IMemberDefinition, IConstantProvider {
+
+		bool? has_this;
+		ushort attributes;
+
+		Collection<CustomAttribute> custom_attributes;
+
+		internal MethodDefinition get_method;
+		internal MethodDefinition set_method;
+		internal Collection<MethodDefinition> other_methods;
+
+		object constant = Mixin.NotResolved;
+
+		public PropertyAttributes Attributes {
+			get { return (PropertyAttributes) attributes; }
+			set { attributes = (ushort) value; }
+		}
+
+		public bool HasThis {
+			get {
+				if (has_this.HasValue)
+					return has_this.Value;
+
+				if (GetMethod != null)
+					return get_method.HasThis;
+
+				if (SetMethod != null)
+					return set_method.HasThis;
+
+				return false;
+			}
+			set { has_this = value; }
+		}
+
+		public bool HasCustomAttributes {
+			get {
+				if (custom_attributes != null)
+					return custom_attributes.Count > 0;
+
+				return this.GetHasCustomAttributes (Module);
+			}
+		}
+
+		public Collection<CustomAttribute> CustomAttributes {
+			get { return custom_attributes ?? (custom_attributes = this.GetCustomAttributes (Module)); }
+		}
+
+		public MethodDefinition GetMethod {
+			get {
+				if (get_method != null)
+					return get_method;
+
+				InitializeMethods ();
+				return get_method;
+			}
+			set { get_method = value; }
+		}
+
+		public MethodDefinition SetMethod {
+			get {
+				if (set_method != null)
+					return set_method;
+
+				InitializeMethods ();
+				return set_method;
+			}
+			set { set_method = value; }
+		}
+
+		public bool HasOtherMethods {
+			get {
+				if (other_methods != null)
+					return other_methods.Count > 0;
+
+				InitializeMethods ();
+				return !other_methods.IsNullOrEmpty ();
+			}
+		}
+
+		public Collection<MethodDefinition> OtherMethods {
+			get {
+				if (other_methods != null)
+					return other_methods;
+
+				InitializeMethods ();
+
+				if (other_methods != null)
+					return other_methods;
+
+				return other_methods = new Collection<MethodDefinition> ();
+			}
+		}
+
+		public bool HasParameters {
+			get {
+				if (get_method != null)
+					return get_method.HasParameters;
+
+				if (set_method != null)
+					return set_method.HasParameters && set_method.Parameters.Count > 1;
+
+				return false;
+			}
+		}
+
+		public override Collection<ParameterDefinition> Parameters {
+			get {
+				InitializeMethods ();
+
+				if (get_method != null)
+					return MirrorParameters (get_method, 0);
+
+				if (set_method != null)
+					return MirrorParameters (set_method, 1);
+
+				return new Collection<ParameterDefinition> ();
+			}
+		}
+
+		static Collection<ParameterDefinition> MirrorParameters (MethodDefinition method, int bound)
+		{
+			var parameters = new Collection<ParameterDefinition> ();
+			if (!method.HasParameters)
+				return parameters;
+
+			var original_parameters = method.Parameters;
+			var end = original_parameters.Count - bound;
+
+			for (int i = 0; i < end; i++)
+				parameters.Add (original_parameters [i]);
+
+			return parameters;
+		}
+
+		public bool HasConstant {
+			get {
+				ResolveConstant ();
+
+				return constant != Mixin.NoValue;
+			}
+			set { if (!value) constant = Mixin.NoValue; }
+		}
+
+		public object Constant {
+			get { return HasConstant ? constant : null;	}
+			set { constant = value; }
+		}
+
+		void ResolveConstant ()
+		{
+			if (constant != Mixin.NotResolved)
+				return;
+
+			this.ResolveConstant (ref constant, Module);
+		}
+
+		#region PropertyAttributes
+
+		public bool IsSpecialName {
+			get { return attributes.GetAttributes ((ushort) PropertyAttributes.SpecialName); }
+			set { attributes = attributes.SetAttributes ((ushort) PropertyAttributes.SpecialName, value); }
+		}
+
+		public bool IsRuntimeSpecialName {
+			get { return attributes.GetAttributes ((ushort) PropertyAttributes.RTSpecialName); }
+			set { attributes = attributes.SetAttributes ((ushort) PropertyAttributes.RTSpecialName, value); }
+		}
+
+		public bool HasDefault {
+			get { return attributes.GetAttributes ((ushort) PropertyAttributes.HasDefault); }
+			set { attributes = attributes.SetAttributes ((ushort) PropertyAttributes.HasDefault, value); }
+		}
+
+		#endregion
+
+		public new TypeDefinition DeclaringType {
+			get { return (TypeDefinition) base.DeclaringType; }
+			set { base.DeclaringType = value; }
+		}
+
+		public override bool IsDefinition {
+			get { return true; }
+		}
+
+		public override string FullName {
+			get {
+				var builder = new StringBuilder ();
+				builder.Append (PropertyType.ToString ());
+				builder.Append (' ');
+				builder.Append (MemberFullName ());
+				builder.Append ('(');
+				if (HasParameters) {
+					var parameters = Parameters;
+					for (int i = 0; i < parameters.Count; i++) {
+						if (i > 0)
+							builder.Append (',');
+						builder.Append (parameters [i].ParameterType.FullName);
+					}
+				}
+				builder.Append (')');
+				return builder.ToString ();
+			}
+		}
+
+		public PropertyDefinition (string name, PropertyAttributes attributes, TypeReference propertyType)
+			: base (name, propertyType)
+		{
+			this.attributes = (ushort) attributes;
+			this.token = new MetadataToken (TokenType.Property);
+		}
+
+		void InitializeMethods ()
+		{
+			if (get_method != null || set_method != null)
+				return;
+
+			var module = this.Module;
+			if (!module.HasImage ())
+				return;
+
+			module.Read (this, (property, reader) => reader.ReadMethods (property));
+		}
+
+		public override PropertyDefinition Resolve ()
+		{
+			return this;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/PropertyReference.cs b/src/Core/Compiler/Importer/IL/PropertyReference.cs
new file mode 100644
index 000000000..085100ef8
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/PropertyReference.cs
@@ -0,0 +1,59 @@
+//
+// PropertyReference.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ abstract class PropertyReference : MemberReference {
+
+		TypeReference property_type;
+
+		public TypeReference PropertyType {
+			get { return property_type; }
+			set { property_type = value; }
+		}
+
+		public abstract Collection<ParameterDefinition> Parameters {
+			get;
+		}
+
+		internal PropertyReference (string name, TypeReference propertyType)
+			: base (name)
+		{
+			if (propertyType == null)
+				throw new ArgumentNullException ("propertyType");
+
+			property_type = propertyType;
+		}
+
+		public abstract PropertyDefinition Resolve ();
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/ReferenceType.cs b/src/Core/Compiler/Importer/IL/ReferenceType.cs
new file mode 100644
index 000000000..c34b07b3c
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/ReferenceType.cs
@@ -0,0 +1,61 @@
+//
+// ByReferenceType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using MD = ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class ByReferenceType : TypeSpecification {
+
+		public override string Name {
+			get { return base.Name + "&"; }
+		}
+
+		public override string FullName {
+			get { return base.FullName + "&"; }
+		}
+
+		public override bool IsValueType {
+			get { return false; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override bool IsByReference {
+			get { return true; }
+		}
+
+		public ByReferenceType (TypeReference type)
+			: base (type)
+		{
+			Mixin.CheckType (type);
+			this.etype = MD.ElementType.ByRef;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Resource.cs b/src/Core/Compiler/Importer/IL/Resource.cs
new file mode 100644
index 000000000..39f880e94
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Resource.cs
@@ -0,0 +1,76 @@
+//
+// ResourceType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ enum ResourceType {
+		Linked,
+		Embedded,
+		AssemblyLinked,
+	}
+
+    internal /* public */ abstract class Resource {
+
+		string name;
+		uint attributes;
+
+		public string Name {
+			get { return name; }
+			set { name = value; }
+		}
+
+		public ManifestResourceAttributes Attributes {
+			get { return (ManifestResourceAttributes) attributes; }
+			set { attributes = (uint) value; }
+		}
+
+		public abstract ResourceType ResourceType {
+			get;
+		}
+
+		#region ManifestResourceAttributes
+
+		public bool IsPublic {
+			get { return attributes.GetMaskedAttributes ((uint) ManifestResourceAttributes.VisibilityMask, (uint) ManifestResourceAttributes.Public); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) ManifestResourceAttributes.VisibilityMask, (uint) ManifestResourceAttributes.Public, value); }
+		}
+
+		public bool IsPrivate {
+			get { return attributes.GetMaskedAttributes ((uint) ManifestResourceAttributes.VisibilityMask, (uint) ManifestResourceAttributes.Private); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) ManifestResourceAttributes.VisibilityMask, (uint) ManifestResourceAttributes.Private, value); }
+		}
+
+		#endregion
+
+		internal Resource (string name, ManifestResourceAttributes attributes)
+		{
+			this.name = name;
+			this.attributes = (uint) attributes;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/SecurityDeclaration.cs b/src/Core/Compiler/Importer/IL/SecurityDeclaration.cs
new file mode 100644
index 000000000..33200eea6
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/SecurityDeclaration.cs
@@ -0,0 +1,181 @@
+//
+// SecurityDeclaration.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ enum SecurityAction : ushort {
+		Request = 1,
+		Demand = 2,
+		Assert = 3,
+		Deny = 4,
+		PermitOnly = 5,
+		LinkDemand = 6,
+		InheritDemand = 7,
+		RequestMinimum = 8,
+		RequestOptional = 9,
+		RequestRefuse = 10,
+		PreJitGrant = 11,
+		PreJitDeny = 12,
+		NonCasDemand = 13,
+		NonCasLinkDemand = 14,
+		NonCasInheritance = 15
+	}
+
+    internal /* public */ interface ISecurityDeclarationProvider : IMetadataTokenProvider {
+
+		bool HasSecurityDeclarations { get; }
+		Collection<SecurityDeclaration> SecurityDeclarations { get; }
+	}
+
+    internal /* public */ sealed class SecurityAttribute : ICustomAttribute {
+
+		TypeReference attribute_type;
+
+		internal Collection<CustomAttributeNamedArgument> fields;
+		internal Collection<CustomAttributeNamedArgument> properties;
+
+		public TypeReference AttributeType {
+			get { return attribute_type; }
+			set { attribute_type = value; }
+		}
+
+		public bool HasFields {
+			get { return !fields.IsNullOrEmpty (); }
+		}
+
+		public Collection<CustomAttributeNamedArgument> Fields {
+			get { return fields ?? (fields = new Collection<CustomAttributeNamedArgument> ()); }
+		}
+
+		public bool HasProperties {
+			get { return !properties.IsNullOrEmpty (); }
+		}
+
+		public Collection<CustomAttributeNamedArgument> Properties {
+			get { return properties ?? (properties = new Collection<CustomAttributeNamedArgument> ()); }
+		}
+
+		public SecurityAttribute (TypeReference attributeType)
+		{
+			this.attribute_type = attributeType;
+		}
+	}
+
+    internal /* public */ sealed class SecurityDeclaration {
+
+		readonly internal uint signature;
+		readonly ModuleDefinition module;
+
+		internal bool resolved;
+		SecurityAction action;
+		internal Collection<SecurityAttribute> security_attributes;
+
+		public SecurityAction Action {
+			get { return action; }
+			set { action = value; }
+		}
+
+		public bool HasSecurityAttributes {
+			get {
+				Resolve ();
+
+				return !security_attributes.IsNullOrEmpty ();
+			}
+		}
+
+		public Collection<SecurityAttribute> SecurityAttributes {
+			get {
+				Resolve ();
+
+				return security_attributes ?? (security_attributes = new Collection<SecurityAttribute> ());
+			}
+		}
+
+		internal bool HasImage {
+			get { return module != null && module.HasImage; }
+		}
+
+		internal SecurityDeclaration (SecurityAction action, uint signature, ModuleDefinition module)
+		{
+			this.action = action;
+			this.signature = signature;
+			this.module = module;
+		}
+
+		public SecurityDeclaration (SecurityAction action)
+		{
+			this.action = action;
+			this.resolved = true;
+		}
+
+		public byte [] GetBlob ()
+		{
+			if (!HasImage || signature == 0)
+				throw new NotSupportedException ();
+
+			return module.Read (this, (declaration, reader) => reader.ReadSecurityDeclarationBlob (declaration.signature)); ;
+		}
+
+		void Resolve ()
+		{
+			if (resolved || !HasImage)
+				return;
+
+			module.Read (this, (declaration, reader) => {
+				reader.ReadSecurityDeclarationSignature (declaration);
+				return this;
+			});
+
+			resolved = true;
+		}
+	}
+
+	static partial class Mixin {
+
+		public static bool GetHasSecurityDeclarations (
+			this ISecurityDeclarationProvider self,
+			ModuleDefinition module)
+		{
+			return module.HasImage ()
+				? module.Read (self, (provider, reader) => reader.HasSecurityDeclarations (provider))
+				: false;
+		}
+
+		public static Collection<SecurityDeclaration> GetSecurityDeclarations (
+			this ISecurityDeclarationProvider self,
+			ModuleDefinition module)
+		{
+			return module.HasImage ()
+				? module.Read (self, (provider, reader) => reader.ReadSecurityDeclarations (provider))
+				: new Collection<SecurityDeclaration> ();
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/SentinelType.cs b/src/Core/Compiler/Importer/IL/SentinelType.cs
new file mode 100644
index 000000000..decb6aeeb
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/SentinelType.cs
@@ -0,0 +1,53 @@
+//
+// SentinelType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using MD = ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class SentinelType : TypeSpecification {
+
+		public override bool IsValueType {
+			get { return false; }
+			set { throw new InvalidOperationException (); }
+		}
+
+		public override bool IsSentinel {
+			get { return true; }
+		}
+
+		public SentinelType (TypeReference type)
+			: base (type)
+		{
+			Mixin.CheckType (type);
+			this.etype = MD.ElementType.Sentinel;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/TargetRuntime.cs b/src/Core/Compiler/Importer/IL/TargetRuntime.cs
new file mode 100644
index 000000000..53d275b38
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/TargetRuntime.cs
@@ -0,0 +1,37 @@
+//
+// TargetRuntime.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ enum TargetRuntime {
+		Net_1_0,
+		Net_1_1,
+		Net_2_0,
+		Net_4_0,
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/TypeAttributes.cs b/src/Core/Compiler/Importer/IL/TypeAttributes.cs
new file mode 100644
index 000000000..b478fa58b
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/TypeAttributes.cs
@@ -0,0 +1,80 @@
+//
+// TypeAttributes.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+namespace ScriptSharp.Importer.IL {
+
+	[Flags]
+    internal /* public */ enum TypeAttributes : uint {
+		// Visibility attributes
+		VisibilityMask		= 0x00000007,	// Use this mask to retrieve visibility information
+		NotPublic			= 0x00000000,	// Class has no public scope
+		Public				= 0x00000001,	// Class has public scope
+		NestedPublic		= 0x00000002,	// Class is nested with public visibility
+		NestedPrivate		= 0x00000003,	// Class is nested with private visibility
+		NestedFamily		= 0x00000004,	// Class is nested with family visibility
+		NestedAssembly		= 0x00000005,	// Class is nested with assembly visibility
+		NestedFamANDAssem	= 0x00000006,	// Class is nested with family and assembly visibility
+		NestedFamORAssem	= 0x00000007,	// Class is nested with family or assembly visibility
+
+		// Class layout attributes
+		LayoutMask			= 0x00000018,	// Use this mask to retrieve class layout information
+		AutoLayout			= 0x00000000,	// Class fields are auto-laid out
+		SequentialLayout	= 0x00000008,	// Class fields are laid out sequentially
+		ExplicitLayout		= 0x00000010,	// Layout is supplied explicitly
+
+		// Class semantics attributes
+		ClassSemanticMask	= 0x00000020,	// Use this mask to retrieve class semantics information
+		Class				= 0x00000000,	// Type is a class
+		Interface			= 0x00000020,	// Type is an interface
+
+		// Special semantics in addition to class semantics
+		Abstract			= 0x00000080,	// Class is abstract
+		Sealed				= 0x00000100,	// Class cannot be extended
+		SpecialName			= 0x00000400,	// Class name is special
+
+		// Implementation attributes
+		Import				= 0x00001000,	// Class/Interface is imported
+		Serializable		= 0x00002000,	// Class is serializable
+
+		// String formatting attributes
+		StringFormatMask	= 0x00030000,	// Use this mask to retrieve string information for native interop
+		AnsiClass			= 0x00000000,	// LPSTR is interpreted as ANSI
+		UnicodeClass		= 0x00010000,	// LPSTR is interpreted as Unicode
+		AutoClass			= 0x00020000,	// LPSTR is interpreted automatically
+
+		// Class initialization attributes
+		BeforeFieldInit		= 0x00100000,	// Initialize the class before first static field access
+
+		// Additional flags
+		RTSpecialName		= 0x00000800,	// CLI provides 'special' behavior, depending upon the name of the Type
+		HasSecurity			= 0x00040000,	// Type has security associate with it
+		Forwarder			= 0x00200000,   // Exported type is a type forwarder
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/TypeDefinition.cs b/src/Core/Compiler/Importer/IL/TypeDefinition.cs
new file mode 100644
index 000000000..25e95c284
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/TypeDefinition.cs
@@ -0,0 +1,498 @@
+//
+// TypeDefinition.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ sealed class TypeDefinition : TypeReference, IMemberDefinition, ISecurityDeclarationProvider {
+
+		uint attributes;
+		TypeReference base_type;
+		internal Range fields_range;
+		internal Range methods_range;
+
+		short packing_size = Mixin.NotResolvedMarker;
+		int class_size = Mixin.NotResolvedMarker;
+
+		Collection<TypeReference> interfaces;
+		Collection<TypeDefinition> nested_types;
+		Collection<MethodDefinition> methods;
+		Collection<FieldDefinition> fields;
+		Collection<EventDefinition> events;
+		Collection<PropertyDefinition> properties;
+		Collection<CustomAttribute> custom_attributes;
+		Collection<SecurityDeclaration> security_declarations;
+
+		public TypeAttributes Attributes {
+			get { return (TypeAttributes) attributes; }
+			set { attributes = (uint) value; }
+		}
+
+		public TypeReference BaseType {
+			get { return base_type; }
+			set { base_type = value; }
+		}
+
+		void ResolveLayout ()
+		{
+			if (packing_size != Mixin.NotResolvedMarker || class_size != Mixin.NotResolvedMarker)
+				return;
+
+			if (!HasImage) {
+				packing_size = Mixin.NoDataMarker;
+				class_size = Mixin.NoDataMarker;
+				return;
+			}
+
+			var row = Module.Read (this, (type, reader) => reader.ReadTypeLayout (type));
+
+			packing_size = row.Col1;
+			class_size = row.Col2;
+		}
+
+		public bool HasLayoutInfo {
+			get {
+				if (packing_size >= 0 || class_size >= 0)
+					return true;
+
+				ResolveLayout ();
+
+				return packing_size >= 0 || class_size >= 0;
+			}
+		}
+
+		public short PackingSize {
+			get {
+				if (packing_size >= 0)
+					return packing_size;
+
+				ResolveLayout ();
+
+				return packing_size >= 0 ? packing_size : (short) -1;
+			}
+			set { packing_size = value; }
+		}
+
+		public int ClassSize {
+			get {
+				if (class_size >= 0)
+					return class_size;
+
+				ResolveLayout ();
+
+				return class_size >= 0 ? class_size : -1;
+			}
+			set { class_size = value; }
+		}
+
+		public bool HasInterfaces {
+			get {
+				if (interfaces != null)
+					return interfaces.Count > 0;
+
+				if (HasImage)
+					return Module.Read (this, (type, reader) => reader.HasInterfaces (type));
+
+				return false;
+			}
+		}
+
+		public Collection<TypeReference> Interfaces {
+			get {
+				if (interfaces != null)
+					return interfaces;
+
+				if (HasImage)
+					return interfaces = Module.Read (this, (type, reader) => reader.ReadInterfaces (type));
+
+				return interfaces = new Collection<TypeReference> ();
+			}
+		}
+
+		public bool HasNestedTypes {
+			get {
+				if (nested_types != null)
+					return nested_types.Count > 0;
+
+				if (HasImage)
+					return Module.Read (this, (type, reader) => reader.HasNestedTypes (type));
+
+				return false;
+			}
+		}
+
+		public Collection<TypeDefinition> NestedTypes {
+			get {
+				if (nested_types != null)
+					return nested_types;
+
+				if (HasImage)
+					return nested_types = Module.Read (this, (type, reader) => reader.ReadNestedTypes (type));
+
+				return nested_types = new MemberDefinitionCollection<TypeDefinition> (this);
+			}
+		}
+
+		internal new bool HasImage {
+			get { return Module != null && Module.HasImage; }
+		}
+
+		public bool HasMethods {
+			get {
+				if (methods != null)
+					return methods.Count > 0;
+
+				if (HasImage)
+					return methods_range.Length > 0;
+
+				return false;
+			}
+		}
+
+		public Collection<MethodDefinition> Methods {
+			get {
+				if (methods != null)
+					return methods;
+
+				if (HasImage)
+					return methods = Module.Read (this, (type, reader) => reader.ReadMethods (type));
+
+				return methods = new MemberDefinitionCollection<MethodDefinition> (this);
+			}
+		}
+
+		public bool HasFields {
+			get {
+				if (fields != null)
+					return fields.Count > 0;
+
+				if (HasImage)
+					return fields_range.Length > 0;
+
+				return false;
+			}
+		}
+
+		public Collection<FieldDefinition> Fields {
+			get {
+				if (fields != null)
+					return fields;
+
+				if (HasImage)
+					return fields = Module.Read (this, (type, reader) => reader.ReadFields (type));
+
+				return fields = new MemberDefinitionCollection<FieldDefinition> (this);
+			}
+		}
+
+		public bool HasEvents {
+			get {
+				if (events != null)
+					return events.Count > 0;
+
+				if (HasImage)
+					return Module.Read (this, (type, reader) => reader.HasEvents (type));
+
+				return false;
+			}
+		}
+
+		public Collection<EventDefinition> Events {
+			get {
+				if (events != null)
+					return events;
+
+				if (HasImage)
+					return events = Module.Read (this, (type, reader) => reader.ReadEvents (type));
+
+				return events = new MemberDefinitionCollection<EventDefinition> (this);
+			}
+		}
+
+		public bool HasProperties {
+			get {
+				if (properties != null)
+					return properties.Count > 0;
+
+				if (HasImage)
+					return Module.Read (this, (type, reader) => reader.HasProperties (type));
+
+				return false;
+			}
+		}
+
+		public Collection<PropertyDefinition> Properties {
+			get {
+				if (properties != null)
+					return properties;
+
+				if (HasImage)
+					return properties = Module.Read (this, (type, reader) => reader.ReadProperties (type));
+
+				return properties = new MemberDefinitionCollection<PropertyDefinition> (this);
+			}
+		}
+
+		public bool HasSecurityDeclarations {
+			get {
+				if (security_declarations != null)
+					return security_declarations.Count > 0;
+
+				return this.GetHasSecurityDeclarations (Module);
+			}
+		}
+
+		public Collection<SecurityDeclaration> SecurityDeclarations {
+			get { return security_declarations ?? (security_declarations = this.GetSecurityDeclarations (Module)); }
+		}
+
+		public bool HasCustomAttributes {
+			get {
+				if (custom_attributes != null)
+					return custom_attributes.Count > 0;
+
+				return this.GetHasCustomAttributes (Module);
+			}
+		}
+
+		public Collection<CustomAttribute> CustomAttributes {
+			get { return custom_attributes ?? (custom_attributes = this.GetCustomAttributes (Module)); }
+		}
+
+		public override bool HasGenericParameters {
+			get {
+				if (generic_parameters != null)
+					return generic_parameters.Count > 0;
+
+				return this.GetHasGenericParameters (Module);
+			}
+		}
+
+		public override Collection<GenericParameter> GenericParameters {
+			get { return generic_parameters ?? (generic_parameters = this.GetGenericParameters (Module)); }
+		}
+
+		#region TypeAttributes
+
+		public bool IsNotPublic {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NotPublic); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NotPublic, value); }
+		}
+
+		public bool IsPublic {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.Public); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.Public, value); }
+		}
+
+		public bool IsNestedPublic {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedPublic); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedPublic, value); }
+		}
+
+		public bool IsNestedPrivate {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedPrivate); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedPrivate, value); }
+		}
+
+		public bool IsNestedFamily {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedFamily); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedFamily, value); }
+		}
+
+		public bool IsNestedAssembly {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedAssembly); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedAssembly, value); }
+		}
+
+		public bool IsNestedFamilyAndAssembly {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedFamANDAssem); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedFamANDAssem, value); }
+		}
+
+		public bool IsNestedFamilyOrAssembly {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedFamORAssem); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.VisibilityMask, (uint) TypeAttributes.NestedFamORAssem, value); }
+		}
+
+		public bool IsAutoLayout {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.LayoutMask, (uint) TypeAttributes.AutoLayout); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.LayoutMask, (uint) TypeAttributes.AutoLayout, value); }
+		}
+
+		public bool IsSequentialLayout {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.LayoutMask, (uint) TypeAttributes.SequentialLayout); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.LayoutMask, (uint) TypeAttributes.SequentialLayout, value); }
+		}
+
+		public bool IsExplicitLayout {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.LayoutMask, (uint) TypeAttributes.ExplicitLayout); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.LayoutMask, (uint) TypeAttributes.ExplicitLayout, value); }
+		}
+
+		public bool IsClass {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.ClassSemanticMask, (uint) TypeAttributes.Class); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.ClassSemanticMask, (uint) TypeAttributes.Class, value); }
+		}
+
+		public bool IsInterface {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.ClassSemanticMask, (uint) TypeAttributes.Interface); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.ClassSemanticMask, (uint) TypeAttributes.Interface, value); }
+		}
+
+		public bool IsAbstract {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.Abstract); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.Abstract, value); }
+		}
+
+		public bool IsSealed {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.Sealed); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.Sealed, value); }
+		}
+
+		public bool IsSpecialName {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.SpecialName); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.SpecialName, value); }
+		}
+
+		public bool IsImport {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.Import); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.Import, value); }
+		}
+
+		public bool IsSerializable {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.Serializable); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.Serializable, value); }
+		}
+
+		public bool IsAnsiClass {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.StringFormatMask, (uint) TypeAttributes.AnsiClass); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.StringFormatMask, (uint) TypeAttributes.AnsiClass, value); }
+		}
+
+		public bool IsUnicodeClass {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.StringFormatMask, (uint) TypeAttributes.UnicodeClass); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.StringFormatMask, (uint) TypeAttributes.UnicodeClass, value); }
+		}
+
+		public bool IsAutoClass {
+			get { return attributes.GetMaskedAttributes ((uint) TypeAttributes.StringFormatMask, (uint) TypeAttributes.AutoClass); }
+			set { attributes = attributes.SetMaskedAttributes ((uint) TypeAttributes.StringFormatMask, (uint) TypeAttributes.AutoClass, value); }
+		}
+
+		public bool IsBeforeFieldInit {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.BeforeFieldInit); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.BeforeFieldInit, value); }
+		}
+
+		public bool IsRuntimeSpecialName {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.RTSpecialName); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.RTSpecialName, value); }
+		}
+
+		public bool HasSecurity {
+			get { return attributes.GetAttributes ((uint) TypeAttributes.HasSecurity); }
+			set { attributes = attributes.SetAttributes ((uint) TypeAttributes.HasSecurity, value); }
+		}
+
+		#endregion
+
+		public bool IsEnum {
+			get { return base_type != null && base_type.IsTypeOf ("System", "Enum"); }
+		}
+
+		public override bool IsValueType {
+			get {
+				if (base_type == null)
+					return false;
+
+				return base_type.IsTypeOf ("System", "Enum") || (base_type.IsTypeOf ("System", "ValueType") && !this.IsTypeOf ("System", "Enum"));
+			}
+		}
+
+		public override bool IsDefinition {
+			get { return true; }
+		}
+
+		public new TypeDefinition DeclaringType {
+			get { return (TypeDefinition) base.DeclaringType; }
+			set { base.DeclaringType = value; }
+		}
+
+		public TypeDefinition (string @namespace, string name, TypeAttributes attributes)
+			: base (@namespace, name)
+		{
+			this.attributes = (uint) attributes;
+			this.token = new MetadataToken (TokenType.TypeDef);
+		}
+
+		public TypeDefinition (string @namespace, string name, TypeAttributes attributes, TypeReference baseType) :
+			this (@namespace, name, attributes)
+		{
+			this.BaseType = baseType;
+		}
+
+		public override TypeDefinition Resolve ()
+		{
+			return this;
+		}
+	}
+
+	static partial class Mixin {
+
+		public static TypeReference GetEnumUnderlyingType (this TypeDefinition self)
+		{
+			var fields = self.Fields;
+
+			for (int i = 0; i < fields.Count; i++) {
+				var field = fields [i];
+				if (!field.IsStatic)
+					return field.FieldType;
+			}
+
+			throw new ArgumentException ();
+		}
+
+		public static TypeDefinition GetNestedType (this TypeDefinition self, string name)
+		{
+			if (!self.HasNestedTypes)
+				return null;
+
+			var nested_types = self.NestedTypes;
+
+			for (int i = 0; i < nested_types.Count; i++) {
+				var nested_type = nested_types [i];
+				if (nested_type.Name == name)
+					return nested_type;
+			}
+
+			return null;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/TypeDefinitionCollection.cs b/src/Core/Compiler/Importer/IL/TypeDefinitionCollection.cs
new file mode 100644
index 000000000..cbd0333ac
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/TypeDefinitionCollection.cs
@@ -0,0 +1,117 @@
+//
+// TypeDefinitionCollection.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections.Generic;
+
+using ScriptSharp.Importer.IL.Metadata;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+	using Slot = Row<string, string>;
+
+	sealed class TypeDefinitionCollection : Collection<TypeDefinition> {
+
+		readonly ModuleDefinition container;
+		readonly Dictionary<Slot, TypeDefinition> name_cache;
+
+		internal TypeDefinitionCollection (ModuleDefinition container)
+		{
+			this.container = container;
+			this.name_cache = new Dictionary<Slot, TypeDefinition> (new RowEqualityComparer ());
+		}
+
+		internal TypeDefinitionCollection (ModuleDefinition container, int capacity)
+			: base (capacity)
+		{
+			this.container = container;
+			this.name_cache = new Dictionary<Slot, TypeDefinition> (capacity, new RowEqualityComparer ());
+		}
+
+		protected override void OnAdd (TypeDefinition item, int index)
+		{
+			Attach (item);
+		}
+
+		protected override void OnSet (TypeDefinition item, int index)
+		{
+			Attach (item);
+		}
+
+		protected override void OnInsert (TypeDefinition item, int index)
+		{
+			Attach (item);
+		}
+
+		protected override void OnRemove (TypeDefinition item, int index)
+		{
+			Detach (item);
+		}
+
+		protected override void OnClear ()
+		{
+			foreach (var type in this)
+				Detach (type);
+		}
+
+		void Attach (TypeDefinition type)
+		{
+			if (type.Module != null && type.Module != container)
+				throw new ArgumentException ("Type already attached");
+
+			type.module = container;
+			type.scope = container;
+			name_cache [new Slot (type.Namespace, type.Name)] = type;
+		}
+
+		void Detach (TypeDefinition type)
+		{
+			type.module = null;
+			type.scope = null;
+			name_cache.Remove (new Slot (type.Namespace, type.Name));
+		}
+
+		public TypeDefinition GetType (string fullname)
+		{
+			string @namespace, name;
+			TypeParser.SplitFullName (fullname, out @namespace, out name);
+
+			return GetType (@namespace, name);
+		}
+
+		public TypeDefinition GetType (string @namespace, string name)
+		{
+			TypeDefinition type;
+			if (name_cache.TryGetValue (new Slot (@namespace, name), out type))
+				return type;
+
+			return null;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/TypeParser.cs b/src/Core/Compiler/Importer/IL/TypeParser.cs
new file mode 100644
index 000000000..0c25158a6
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/TypeParser.cs
@@ -0,0 +1,555 @@
+//
+// TypeParser.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Text;
+
+using ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+	class TypeParser {
+
+		class Type {
+			public const int Ptr = -1;
+			public const int ByRef = -2;
+			public const int SzArray = -3;
+
+			public string type_fullname;
+			public string [] nested_names;
+			public int arity;
+			public int [] specs;
+			public Type [] generic_arguments;
+			public string assembly;
+		}
+
+		readonly string fullname;
+		readonly int length;
+
+		int position;
+
+		TypeParser (string fullname)
+		{
+			this.fullname = fullname;
+			this.length = fullname.Length;
+		}
+
+		Type ParseType (bool fq_name)
+		{
+			var type = new Type ();
+			type.type_fullname = ParsePart ();
+
+			type.nested_names = ParseNestedNames ();
+
+			if (TryGetArity (type))
+				type.generic_arguments = ParseGenericArguments (type.arity);
+
+			type.specs = ParseSpecs ();
+
+			if (fq_name)
+				type.assembly = ParseAssemblyName ();
+
+			return type;
+		}
+
+		static bool TryGetArity (Type type)
+		{
+			int arity = 0;
+
+			TryAddArity (type.type_fullname, ref arity);
+
+			var nested_names = type.nested_names;
+			if (!nested_names.IsNullOrEmpty ()) {
+				for (int i = 0; i < nested_names.Length; i++)
+					TryAddArity (nested_names [i], ref arity);
+			}
+
+			type.arity = arity;
+			return arity > 0;
+		}
+
+		static bool TryGetArity (string name, out int arity)
+		{
+			arity = 0;
+			var index = name.LastIndexOf ('`');
+			if (index == -1)
+				return false;
+
+			return ParseInt32 (name.Substring (index + 1), out arity);
+		}
+
+		static bool ParseInt32 (string value, out int result)
+		{
+#if CF
+			try {
+				result = int.Parse (value);
+				return true;
+			} catch {
+				result = 0;
+				return false;
+			}
+#else
+			return int.TryParse (value, out result);
+#endif
+		}
+
+		static void TryAddArity (string name, ref int arity)
+		{
+			int type_arity;
+			if (!TryGetArity (name, out type_arity))
+				return;
+
+			arity += type_arity;
+		}
+
+		string ParsePart ()
+		{
+			int start = position;
+			while (position < length && !IsDelimiter (fullname [position]))
+				position++;
+
+			return fullname.Substring (start, position - start);
+		}
+
+		static bool IsDelimiter (char chr)
+		{
+			return "+,[]*&".IndexOf (chr) != -1;
+		}
+
+		void TryParseWhiteSpace ()
+		{
+			while (position < length && Char.IsWhiteSpace (fullname [position]))
+				position++;
+		}
+
+		string [] ParseNestedNames ()
+		{
+			string [] nested_names = null;
+			while (TryParse ('+'))
+				Add (ref nested_names, ParsePart ());
+
+			return nested_names;
+		}
+
+		bool TryParse (char chr)
+		{
+			if (position < length && fullname [position] == chr) {
+				position++;
+				return true;
+			}
+
+			return false;
+		}
+
+		static void Add<T> (ref T [] array, T item)
+		{
+			if (array == null) {
+				array = new [] { item };
+				return;
+			}
+
+#if !CF
+			Array.Resize (ref array, array.Length + 1);
+#else
+			var copy = new T [array.Length + 1];
+			Array.Copy (array, copy, array.Length);
+			array = copy;
+#endif
+			array [array.Length - 1] = item;
+		}
+
+		int [] ParseSpecs ()
+		{
+			int [] specs = null;
+
+			while (position < length) {
+				switch (fullname [position]) {
+				case '*':
+					position++;
+					Add (ref specs, Type.Ptr);
+					break;
+				case '&':
+					position++;
+					Add (ref specs, Type.ByRef);
+					break;
+				case '[':
+					position++;
+					switch (fullname [position]) {
+					case ']':
+						position++;
+						Add (ref specs, Type.SzArray);
+						break;
+					case '*':
+						position++;
+						Add (ref specs, 1);
+						break;
+					default:
+						var rank = 1;
+						while (TryParse (','))
+							rank++;
+
+						Add (ref specs, rank);
+
+						TryParse (']');
+						break;
+					}
+					break;
+				default:
+					return specs;
+				}
+			}
+
+			return specs;
+		}
+
+		Type [] ParseGenericArguments (int arity)
+		{
+			Type [] generic_arguments = null;
+
+			if (position == length || fullname [position] != '[')
+				return generic_arguments;
+
+			TryParse ('[');
+
+			for (int i = 0; i < arity; i++) {
+				var fq_argument = TryParse ('[');
+				Add (ref generic_arguments, ParseType (fq_argument));
+				if (fq_argument)
+					TryParse (']');
+
+				TryParse (',');
+				TryParseWhiteSpace ();
+			}
+
+			TryParse (']');
+
+			return generic_arguments;
+		}
+
+		string ParseAssemblyName ()
+		{
+			if (!TryParse (','))
+				return string.Empty;
+
+			TryParseWhiteSpace ();
+
+			var start = position;
+			while (position < length) {
+				var chr = fullname [position];
+				if (chr == '[' || chr == ']')
+					break;
+
+				position++;
+			}
+
+			return fullname.Substring (start, position - start);
+		}
+
+		public static TypeReference ParseType (ModuleDefinition module, string fullname)
+		{
+			if (fullname == null)
+				return null;
+
+			var parser = new TypeParser (fullname);
+			return GetTypeReference (module, parser.ParseType (true));
+		}
+
+		static TypeReference GetTypeReference (ModuleDefinition module, Type type_info)
+		{
+			TypeReference type;
+			if (!TryGetDefinition (module, type_info, out type))
+				type = CreateReference (type_info, module, GetMetadataScope (module, type_info));
+
+			return CreateSpecs (type, type_info);
+		}
+
+		static TypeReference CreateSpecs (TypeReference type, Type type_info)
+		{
+			type = TryCreateGenericInstanceType (type, type_info);
+
+			var specs = type_info.specs;
+			if (specs.IsNullOrEmpty ())
+				return type;
+
+			for (int i = 0; i < specs.Length; i++) {
+				switch (specs [i]) {
+				case Type.Ptr:
+					type = new PointerType (type);
+					break;
+				case Type.ByRef:
+					type = new ByReferenceType (type);
+					break;
+				case Type.SzArray:
+					type = new ArrayType (type);
+					break;
+				default:
+					var array = new ArrayType (type);
+					array.Dimensions.Clear ();
+
+					for (int j = 0; j < specs [i]; j++)
+						array.Dimensions.Add (new ArrayDimension ());
+
+					type = array;
+					break;
+				}
+			}
+
+			return type;
+		}
+
+		static TypeReference TryCreateGenericInstanceType (TypeReference type, Type type_info)
+		{
+			var generic_arguments = type_info.generic_arguments;
+			if (generic_arguments.IsNullOrEmpty ())
+				return type;
+
+			var instance = new GenericInstanceType (type);
+			var instance_arguments = instance.GenericArguments;
+
+			for (int i = 0; i < generic_arguments.Length; i++)
+				instance_arguments.Add (GetTypeReference (type.Module, generic_arguments [i]));
+
+			return instance;
+		}
+
+		public static void SplitFullName (string fullname, out string @namespace, out string name)
+		{
+			var last_dot = fullname.LastIndexOf ('.');
+
+			if (last_dot == -1) {
+				@namespace = string.Empty;
+				name = fullname;
+			} else {
+				@namespace = fullname.Substring (0, last_dot);
+				name = fullname.Substring (last_dot + 1);
+			}
+		}
+
+		static TypeReference CreateReference (Type type_info, ModuleDefinition module, IMetadataScope scope)
+		{
+			string @namespace, name;
+			SplitFullName (type_info.type_fullname, out @namespace, out name);
+
+			var type = new TypeReference (@namespace, name, module, scope);
+			MetadataSystem.TryProcessPrimitiveType (type);
+
+			AdjustGenericParameters (type);
+
+			var nested_names = type_info.nested_names;
+			if (nested_names.IsNullOrEmpty ())
+				return type;
+
+			for (int i = 0; i < nested_names.Length; i++) {
+				type = new TypeReference (string.Empty, nested_names [i], module, null) {
+					DeclaringType = type,
+				};
+
+				AdjustGenericParameters (type);
+			}
+
+			return type;
+		}
+
+		static void AdjustGenericParameters (TypeReference type)
+		{
+			int arity;
+			if (!TryGetArity (type.Name, out arity))
+				return;
+
+			for (int i = 0; i < arity; i++)
+				type.GenericParameters.Add (new GenericParameter (type));
+		}
+
+		static IMetadataScope GetMetadataScope (ModuleDefinition module, Type type_info)
+		{
+			if (string.IsNullOrEmpty (type_info.assembly))
+				return module.TypeSystem.Corlib;
+
+			return MatchReference (module, AssemblyNameReference.Parse (type_info.assembly));
+		}
+
+		static AssemblyNameReference MatchReference (ModuleDefinition module, AssemblyNameReference pattern)
+		{
+			var references = module.AssemblyReferences;
+
+			for (int i = 0; i < references.Count; i++) {
+				var reference = references [i];
+				if (reference.FullName == pattern.FullName)
+					return reference;
+			}
+
+			return pattern;
+		}
+
+		static bool TryGetDefinition (ModuleDefinition module, Type type_info, out TypeReference type)
+		{
+			type = null;
+			if (!TryCurrentModule (module, type_info))
+				return false;
+
+			var typedef = module.GetType (type_info.type_fullname);
+			if (typedef == null)
+				return false;
+
+			var nested_names = type_info.nested_names;
+			if (!nested_names.IsNullOrEmpty ()) {
+				for (int i = 0; i < nested_names.Length; i++)
+					typedef = typedef.GetNestedType (nested_names [i]);
+			}
+
+			type = typedef;
+			return true;
+		}
+
+		static bool TryCurrentModule (ModuleDefinition module, Type type_info)
+		{
+			if (string.IsNullOrEmpty (type_info.assembly))
+				return true;
+
+			if (module.assembly != null && module.assembly.Name.FullName == type_info.assembly)
+				return true;
+
+			return false;
+		}
+
+		public static string ToParseable (TypeReference type)
+		{
+			if (type == null)
+				return null;
+
+			var name = new StringBuilder ();
+			AppendType (type, name, true, true);
+			return name.ToString ();
+		}
+
+		static void AppendType (TypeReference type, StringBuilder name, bool fq_name, bool top_level)
+		{
+			var declaring_type = type.DeclaringType;
+			if (declaring_type != null) {
+				AppendType (declaring_type, name, false, top_level);
+				name.Append ('+');
+			}
+
+			var @namespace = type.Namespace;
+			if (!string.IsNullOrEmpty (@namespace)) {
+				name.Append (@namespace);
+				name.Append ('.');
+			}
+
+			name.Append (type.GetElementType ().Name);
+
+			if (!fq_name)
+				return;
+
+			if (type.IsTypeSpecification ())
+				AppendTypeSpecification ((TypeSpecification) type, name);
+
+			if (RequiresFullyQualifiedName (type, top_level)) {
+				name.Append (", ");
+				name.Append (GetScopeFullName (type));
+			}
+		}
+
+		static string GetScopeFullName (TypeReference type)
+		{
+			var scope = type.Scope;
+			switch (scope.MetadataScopeType) {
+			case MetadataScopeType.AssemblyNameReference:
+				return ((AssemblyNameReference) scope).FullName;
+			case MetadataScopeType.ModuleDefinition:
+				return ((ModuleDefinition) scope).Assembly.Name.FullName;
+			}
+
+			throw new ArgumentException ();
+		}
+
+		static void AppendTypeSpecification (TypeSpecification type, StringBuilder name)
+		{
+			if (type.ElementType.IsTypeSpecification ())
+				AppendTypeSpecification ((TypeSpecification) type.ElementType, name);
+
+			switch (type.etype) {
+			case ElementType.Ptr:
+				name.Append ('*');
+				break;
+			case ElementType.ByRef:
+				name.Append ('&');
+				break;
+			case ElementType.SzArray:
+			case ElementType.Array:
+				var array = (ArrayType) type;
+				if (array.IsVector) {
+					name.Append ("[]");
+				} else {
+					name.Append ('[');
+					for (int i = 1; i < array.Rank; i++)
+						name.Append (',');
+					name.Append (']');
+				}
+				break;
+			case ElementType.GenericInst:
+				var instance = (GenericInstanceType) type;
+				var arguments = instance.GenericArguments;
+
+				name.Append ('[');
+
+				for (int i = 0; i < arguments.Count; i++) {
+					if (i > 0)
+						name.Append (',');
+
+					var argument = arguments [i];
+					var requires_fqname = argument.Scope != argument.Module;
+
+					if (requires_fqname)
+						name.Append ('[');
+
+					AppendType (argument, name, true, false);
+
+					if (requires_fqname)
+						name.Append (']');
+				}
+
+				name.Append (']');
+				break;
+			default:
+				return;
+			}
+		}
+
+		static bool RequiresFullyQualifiedName (TypeReference type, bool top_level)
+		{
+			if (type.Scope == type.Module)
+				return false;
+
+			if (type.Scope.Name == "mscorlib" && top_level)
+				return false;
+
+			return true;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/TypeReference.cs b/src/Core/Compiler/Importer/IL/TypeReference.cs
new file mode 100644
index 000000000..421fcbafb
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/TypeReference.cs
@@ -0,0 +1,327 @@
+//
+// TypeReference.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using ScriptSharp.Importer.IL.Metadata;
+using ScriptSharp.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ enum MetadataType : byte {
+		Void = ElementType.Void,
+		Boolean = ElementType.Boolean,
+		Char = ElementType.Char,
+		SByte = ElementType.I1,
+		Byte = ElementType.U1,
+		Int16 = ElementType.I2,
+		UInt16 = ElementType.U2,
+		Int32 = ElementType.I4,
+		UInt32 = ElementType.U4,
+		Int64 = ElementType.I8,
+		UInt64 = ElementType.U8,
+		Single = ElementType.R4,
+		Double = ElementType.R8,
+		String = ElementType.String,
+		Pointer = ElementType.Ptr,
+		ByReference = ElementType.ByRef,
+		ValueType = ElementType.ValueType,
+		Class = ElementType.Class,
+		Var = ElementType.Var,
+		Array = ElementType.Array,
+		GenericInstance = ElementType.GenericInst,
+		TypedByReference = ElementType.TypedByRef,
+		IntPtr = ElementType.I,
+		UIntPtr = ElementType.U,
+		FunctionPointer = ElementType.FnPtr,
+		Object = ElementType.Object,
+		MVar = ElementType.MVar,
+		RequiredModifier = ElementType.CModReqD,
+		OptionalModifier = ElementType.CModOpt,
+		Sentinel = ElementType.Sentinel,
+		Pinned = ElementType.Pinned,
+	}
+
+    internal /* public */ class TypeReference : MemberReference, IGenericParameterProvider, IGenericContext {
+
+		string @namespace;
+		bool value_type;
+		internal IMetadataScope scope;
+		internal ModuleDefinition module;
+
+		internal ElementType etype = ElementType.None;
+
+		string fullname;
+
+		protected Collection<GenericParameter> generic_parameters;
+
+		public override string Name {
+			get { return base.Name; }
+			set {
+				base.Name = value;
+				fullname = null;
+			}
+		}
+
+		public virtual string Namespace {
+			get { return @namespace; }
+			set {
+				@namespace = value;
+				fullname = null;
+			}
+		}
+
+		public virtual bool IsValueType {
+			get { return value_type; }
+			set { value_type = value; }
+		}
+
+		public override ModuleDefinition Module {
+			get {
+				if (module != null)
+					return module;
+
+				var declaring_type = this.DeclaringType;
+				if (declaring_type != null)
+					return declaring_type.Module;
+
+				return null;
+			}
+		}
+
+		IGenericParameterProvider IGenericContext.Type {
+			get { return this; }
+		}
+
+		IGenericParameterProvider IGenericContext.Method {
+			get { return null; }
+		}
+
+		GenericParameterType IGenericParameterProvider.GenericParameterType {
+			get { return GenericParameterType.Type; }
+		}
+
+		public virtual bool HasGenericParameters {
+			get { return !generic_parameters.IsNullOrEmpty (); }
+		}
+
+		public virtual Collection<GenericParameter> GenericParameters {
+			get {
+				if (generic_parameters != null)
+					return generic_parameters;
+
+				return generic_parameters = new Collection<GenericParameter> ();
+			}
+		}
+
+		public virtual IMetadataScope Scope {
+			get {
+				var declaring_type = this.DeclaringType;
+				if (declaring_type != null)
+					return declaring_type.Scope;
+
+				return scope;
+			}
+		}
+
+		public bool IsNested {
+			get { return this.DeclaringType != null; }
+		}
+
+		public override TypeReference DeclaringType {
+			get { return base.DeclaringType; }
+			set {
+				base.DeclaringType = value;
+				fullname = null;
+			}
+		}
+
+		public override string FullName {
+			get {
+				if (fullname != null)
+					return fullname;
+
+				if (IsNested)
+					return fullname = DeclaringType.FullName + "/" + Name;
+
+				if (string.IsNullOrEmpty (@namespace))
+					return fullname = Name;
+
+				return fullname = @namespace + "." + Name;
+			}
+		}
+
+		public virtual bool IsByReference {
+			get { return false; }
+		}
+
+		public virtual bool IsPointer {
+			get { return false; }
+		}
+
+		public virtual bool IsSentinel {
+			get { return false; }
+		}
+
+		public virtual bool IsArray {
+			get { return false; }
+		}
+
+		public virtual bool IsGenericParameter {
+			get { return false; }
+		}
+
+		public virtual bool IsGenericInstance {
+			get { return false; }
+		}
+
+		public virtual bool IsRequiredModifier {
+			get { return false; }
+		}
+
+		public virtual bool IsOptionalModifier {
+			get { return false; }
+		}
+
+		public virtual bool IsPinned {
+			get { return false; }
+		}
+
+		public virtual bool IsFunctionPointer {
+			get { return false; }
+		}
+
+		public bool IsPrimitive {
+			get {
+				switch (etype) {
+				case ElementType.Boolean:
+				case ElementType.Char:
+				case ElementType.I:
+				case ElementType.U:
+				case ElementType.I1:
+				case ElementType.U1:
+				case ElementType.I2:
+				case ElementType.U2:
+				case ElementType.I4:
+				case ElementType.U4:
+				case ElementType.I8:
+				case ElementType.U8:
+				case ElementType.R4:
+				case ElementType.R8:
+					return true;
+				default:
+					return false;
+				}
+			}
+		}
+
+		public virtual MetadataType MetadataType {
+			get {
+				switch (etype) {
+				case ElementType.None:
+					return IsValueType ? MetadataType.ValueType : MetadataType.Class;
+				default:
+					return (MetadataType) etype;
+				}
+			}
+		}
+
+		protected TypeReference (string @namespace, string name)
+			: base (name)
+		{
+			this.@namespace = @namespace ?? string.Empty;
+			this.token = new MetadataToken (TokenType.TypeRef, 0);
+		}
+
+		public TypeReference (string @namespace, string name, ModuleDefinition module, IMetadataScope scope)
+			: this (@namespace, name)
+		{
+			this.module = module;
+			this.scope = scope;
+		}
+
+		public TypeReference (string @namespace, string name, ModuleDefinition module, IMetadataScope scope, bool valueType) :
+			this (@namespace, name, module, scope)
+		{
+			value_type = valueType;
+		}
+
+		public virtual TypeReference GetElementType ()
+		{
+			return this;
+		}
+
+		public virtual TypeDefinition Resolve ()
+		{
+			var module = this.Module;
+			if (module == null)
+				throw new NotSupportedException ();
+
+			return module.Resolve (this);
+		}
+	}
+
+	static partial class Mixin {
+
+		public static bool IsTypeOf (this TypeReference self, string @namespace, string name)
+		{
+			return self.Name == name
+				&& self.Namespace == @namespace;
+		}
+
+		public static bool IsTypeSpecification (this TypeReference type)
+		{
+			switch (type.etype) {
+			case ElementType.Array:
+			case ElementType.ByRef:
+			case ElementType.CModOpt:
+			case ElementType.CModReqD:
+			case ElementType.FnPtr:
+			case ElementType.GenericInst:
+			case ElementType.MVar:
+			case ElementType.Pinned:
+			case ElementType.Ptr:
+			case ElementType.SzArray:
+			case ElementType.Sentinel:
+			case ElementType.Var:
+				return true;
+			}
+
+			return false;
+		}
+
+		public static TypeDefinition CheckedResolve (this TypeReference self)
+		{
+			var type = self.Resolve ();
+			if (type == null)
+				throw new ResolutionException (self);
+
+			return type;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/TypeSpecification.cs b/src/Core/Compiler/Importer/IL/TypeSpecification.cs
new file mode 100644
index 000000000..5fef9631b
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/TypeSpecification.cs
@@ -0,0 +1,94 @@
+//
+// TypeSpecification.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ abstract class TypeSpecification : TypeReference {
+
+		readonly TypeReference element_type;
+
+		public TypeReference ElementType {
+			get { return element_type; }
+		}
+
+		public override string Name {
+			get { return element_type.Name; }
+			set { throw new NotSupportedException (); }
+		}
+
+		public override string Namespace {
+			get { return element_type.Namespace; }
+			set { throw new NotSupportedException (); }
+		}
+
+		public override IMetadataScope Scope {
+			get { return element_type.Scope; }
+		}
+
+		public override ModuleDefinition Module {
+			get { return element_type.Module; }
+		}
+
+		public override string FullName {
+			get { return element_type.FullName; }
+		}
+
+		internal override bool ContainsGenericParameter {
+			get { return element_type.ContainsGenericParameter; }
+		}
+
+		public override MetadataType MetadataType {
+			get { return (MetadataType) etype; }
+		}
+
+		internal TypeSpecification (TypeReference type)
+			: base (null, null)
+		{
+			this.element_type = type;
+			this.token = new MetadataToken (TokenType.TypeSpec);
+		}
+
+		public override TypeReference GetElementType ()
+		{
+			return element_type.GetElementType ();
+		}
+	}
+
+	static partial class Mixin {
+
+		public static void CheckType (TypeReference type)
+		{
+			if (type == null)
+				throw new ArgumentNullException ("type");
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/TypeSystem.cs b/src/Core/Compiler/Importer/IL/TypeSystem.cs
new file mode 100644
index 000000000..7151b1cab
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/TypeSystem.cs
@@ -0,0 +1,273 @@
+//
+// TypeSystem.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+
+using ScriptSharp.Importer.IL.Metadata;
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ abstract class TypeSystem {
+
+		sealed class CorlibTypeSystem : TypeSystem {
+
+			public CorlibTypeSystem (ModuleDefinition module)
+				: base (module)
+			{
+			}
+
+			internal override TypeReference LookupType (string @namespace, string name)
+			{
+				var metadata = module.MetadataSystem;
+				if (metadata.Types == null)
+					Initialize (module.Types);
+
+				return module.Read (new Row<string, string> (@namespace, name), (row, reader) => {
+					var types = reader.metadata.Types;
+
+					for (int i = 0; i < types.Length; i++) {
+						if (types [i] == null)
+							types [i] = reader.GetTypeDefinition ((uint) i + 1);
+
+						var type = types [i];
+
+						if (type.Name == row.Col2 && type.Namespace == row.Col1)
+							return type;
+					}
+
+					return null;
+				});
+			}
+
+			static void Initialize (object obj)
+			{
+			}
+		}
+
+		sealed class CommonTypeSystem : TypeSystem {
+
+			AssemblyNameReference corlib;
+
+			public CommonTypeSystem (ModuleDefinition module)
+				: base (module)
+			{
+			}
+
+			internal override TypeReference LookupType (string @namespace, string name)
+			{
+				return CreateTypeReference (@namespace, name);
+			}
+
+			public AssemblyNameReference GetCorlibReference ()
+			{
+				if (corlib != null)
+					return corlib;
+
+				const string mscorlib = "mscorlib";
+
+				var references = module.AssemblyReferences;
+
+				for (int i = 0; i < references.Count; i++) {
+					var reference = references [i];
+					if (reference.Name == mscorlib)
+						return corlib = reference;
+				}
+
+				corlib = new AssemblyNameReference {
+					Name = mscorlib,
+					Version = GetCorlibVersion (),
+					PublicKeyToken = new byte [] { 0xb7, 0x7a, 0x5c, 0x56, 0x19, 0x34, 0xe0, 0x89 },
+				};
+
+				references.Add (corlib);
+
+				return corlib;
+			}
+
+			Version GetCorlibVersion ()
+			{
+				switch (module.Runtime) {
+				case TargetRuntime.Net_1_0:
+				case TargetRuntime.Net_1_1:
+					return new Version (1, 0, 0, 0);
+				case TargetRuntime.Net_2_0:
+					return new Version (2, 0, 0, 0);
+				case TargetRuntime.Net_4_0:
+					return new Version (4, 0, 0, 0);
+				default:
+					throw new NotSupportedException ();
+				}
+			}
+
+			TypeReference CreateTypeReference (string @namespace, string name)
+			{
+				return new TypeReference (@namespace, name, module, GetCorlibReference ());
+			}
+		}
+
+		readonly ModuleDefinition module;
+
+		TypeReference type_object;
+		TypeReference type_void;
+		TypeReference type_bool;
+		TypeReference type_char;
+		TypeReference type_sbyte;
+		TypeReference type_byte;
+		TypeReference type_int16;
+		TypeReference type_uint16;
+		TypeReference type_int32;
+		TypeReference type_uint32;
+		TypeReference type_int64;
+		TypeReference type_uint64;
+		TypeReference type_single;
+		TypeReference type_double;
+		TypeReference type_intptr;
+		TypeReference type_uintptr;
+		TypeReference type_string;
+		TypeReference type_typedref;
+
+		TypeSystem (ModuleDefinition module)
+		{
+			this.module = module;
+		}
+
+		internal static TypeSystem CreateTypeSystem (ModuleDefinition module)
+		{
+			if (IsCorlib (module))
+				return new CorlibTypeSystem (module);
+
+			return new CommonTypeSystem (module);
+		}
+
+		static bool IsCorlib (ModuleDefinition module)
+		{
+			if (module.Assembly == null)
+				return false;
+
+			return module.Assembly.Name.Name == "mscorlib";
+		}
+
+		internal abstract TypeReference LookupType (string @namespace, string name);
+
+		TypeReference LookupSystemType (string name, ElementType element_type)
+		{
+			var type = LookupType ("System", name);
+			type.etype = element_type;
+			return type;
+		}
+
+		TypeReference LookupSystemValueType (string name, ElementType element_type)
+		{
+			var type = LookupSystemType (name, element_type);
+			type.IsValueType = true;
+			return type;
+		}
+
+		public IMetadataScope Corlib {
+			get {
+				var common = this as CommonTypeSystem;
+				if (common == null)
+					return module;
+
+				return common.GetCorlibReference ();
+			}
+		}
+
+		public TypeReference Object {
+			get { return type_object ?? (type_object = LookupSystemType ("Object", ElementType.Object)); }
+		}
+
+		public TypeReference Void {
+			get { return type_void ?? (type_void = LookupSystemType ("Void", ElementType.Void)); }
+		}
+
+		public TypeReference Boolean {
+			get { return type_bool ?? (type_bool = LookupSystemValueType ("Boolean", ElementType.Boolean)); }
+		}
+
+		public TypeReference Char {
+			get { return type_char ?? (type_char = LookupSystemValueType ("Char", ElementType.Char)); }
+		}
+
+		public TypeReference SByte {
+			get { return type_sbyte ?? (type_sbyte = LookupSystemValueType ("SByte", ElementType.I1)); }
+		}
+
+		public TypeReference Byte {
+			get { return type_byte ?? (type_byte = LookupSystemValueType ("Byte", ElementType.U1)); }
+		}
+
+		public TypeReference Int16 {
+			get { return type_int16 ?? (type_int16 = LookupSystemValueType ("Int16", ElementType.I2)); }
+		}
+
+		public TypeReference UInt16 {
+			get { return type_uint16 ?? (type_uint16 = LookupSystemValueType ("UInt16", ElementType.U2)); }
+		}
+
+		public TypeReference Int32 {
+			get { return type_int32 ?? (type_int32 = LookupSystemValueType ("Int32", ElementType.I4)); }
+		}
+
+		public TypeReference UInt32 {
+			get { return type_uint32 ?? (type_uint32 = LookupSystemValueType ("UInt32", ElementType.U4)); }
+		}
+
+		public TypeReference Int64 {
+			get { return type_int64 ?? (type_int64 = LookupSystemValueType ("Int64", ElementType.I8)); }
+		}
+
+		public TypeReference UInt64 {
+			get { return type_uint64 ?? (type_uint64 = LookupSystemValueType ("UInt64", ElementType.U8)); }
+		}
+
+		public TypeReference Single {
+			get { return type_single ?? (type_single = LookupSystemValueType ("Single", ElementType.R4)); }
+		}
+
+		public TypeReference Double {
+			get { return type_double ?? (type_double = LookupSystemValueType ("Double", ElementType.R8)); }
+		}
+
+		public TypeReference IntPtr {
+			get { return type_intptr ?? (type_intptr = LookupSystemValueType ("IntPtr", ElementType.I)); }
+		}
+
+		public TypeReference UIntPtr {
+			get { return type_uintptr ?? (type_uintptr = LookupSystemValueType ("UIntPtr", ElementType.U)); }
+		}
+
+		public TypeReference String {
+			get { return type_string ?? (type_string = LookupSystemType ("String", ElementType.String)); }
+		}
+
+		public TypeReference TypedReference {
+			get { return type_typedref ?? (type_typedref = LookupSystemValueType ("TypedReference", ElementType.TypedByRef)); }
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Utility/Collection.cs b/src/Core/Compiler/Importer/IL/Utility/Collection.cs
new file mode 100644
index 000000000..defb50d5f
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Utility/Collection.cs
@@ -0,0 +1,418 @@
+//
+// Collection.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using ScriptSharp.Importer.IL;
+
+namespace ScriptSharp.Collections.Generic {
+
+	internal /* public */ class Collection<T> : IList<T>, IList {
+
+		internal T [] items;
+		internal int size;
+		int version;
+
+		public int Count {
+			get { return size; }
+		}
+
+		public T this [int index] {
+			get {
+				if (index >= size)
+					throw new ArgumentOutOfRangeException ();
+
+				return items [index];
+			}
+			set {
+				CheckIndex (index);
+				if (index == size)
+					throw new ArgumentOutOfRangeException ();
+
+				OnSet (value, index);
+
+				items [index] = value;
+			}
+		}
+
+		bool ICollection<T>.IsReadOnly {
+			get { return false; }
+		}
+
+		bool IList.IsFixedSize {
+			get { return false; }
+		}
+
+		bool IList.IsReadOnly {
+			get { return false; }
+		}
+
+		object IList.this [int index] {
+			get { return this [index]; }
+			set {
+				CheckIndex (index);
+
+				try {
+					this [index] = (T) value;
+					return;
+				} catch (InvalidCastException) {
+				} catch (NullReferenceException) {
+				}
+
+				throw new ArgumentException ();
+			}
+		}
+
+		int ICollection.Count {
+			get { return Count; }
+		}
+
+		bool ICollection.IsSynchronized {
+			get { return false; }
+		}
+
+		object ICollection.SyncRoot {
+			get { return this; }
+		}
+
+		public Collection ()
+		{
+			items = Empty<T>.Array;
+		}
+
+		public Collection (int capacity)
+		{
+			if (capacity < 0)
+				throw new ArgumentOutOfRangeException ();
+
+			items = new T [capacity];
+		}
+
+		public Collection (ICollection<T> items)
+		{
+			this.items = new T [items.Count];
+			items.CopyTo (this.items, 0);
+			this.size = this.items.Length;
+		}
+
+		public void Add (T item)
+		{
+			if (size == items.Length)
+				Grow (1);
+
+			OnAdd (item, size);
+
+			items [size++] = item;
+			version++;
+		}
+
+		public bool Contains (T item)
+		{
+			return IndexOf (item) != -1;
+		}
+
+		public int IndexOf (T item)
+		{
+			return Array.IndexOf (items, item, 0, size);
+		}
+
+		public void Insert (int index, T item)
+		{
+			CheckIndex (index);
+			if (size == items.Length)
+				Grow (1);
+
+			OnInsert (item, index);
+
+			Shift (index, 1);
+			items [index] = item;
+			version++;
+		}
+
+		public void RemoveAt (int index)
+		{
+			if (index < 0 || index >= size)
+				throw new ArgumentOutOfRangeException ();
+
+			var item = items [index];
+
+			OnRemove (item, index);
+
+			Shift (index, -1);
+			Array.Clear (items, size, 1);
+			version++;
+		}
+
+		public bool Remove (T item)
+		{
+			var index = IndexOf (item);
+			if (index == -1)
+				return false;
+
+			OnRemove (item, index);
+
+			Shift (index, -1);
+			Array.Clear (items, size, 1);
+			version++;
+
+			return true;
+		}
+
+		public void Clear ()
+		{
+			OnClear ();
+
+			Array.Clear (items, 0, size);
+			size = 0;
+			version++;
+		}
+
+		public void CopyTo (T [] array, int arrayIndex)
+		{
+			Array.Copy (items, 0, array, arrayIndex, size);
+		}
+
+		public T [] ToArray ()
+		{
+			var array = new T [size];
+			Array.Copy (items, 0, array, 0, size);
+			return array;
+		}
+
+		void CheckIndex (int index)
+		{
+			if (index < 0 || index > size)
+				throw new ArgumentOutOfRangeException ();
+		}
+
+		void Shift (int start, int delta)
+		{
+			if (delta < 0)
+				start -= delta;
+
+			if (start < size)
+				Array.Copy (items, start, items, start + delta, size - start);
+
+			size += delta;
+
+			if (delta < 0)
+				Array.Clear (items, size, -delta);
+		}
+
+		protected virtual void OnAdd (T item, int index)
+		{
+		}
+
+		protected virtual void OnInsert (T item, int index)
+		{
+		}
+
+		protected virtual void OnSet (T item, int index)
+		{
+		}
+
+		protected virtual void OnRemove (T item, int index)
+		{
+		}
+
+		protected virtual void OnClear ()
+		{
+		}
+
+		internal virtual void Grow (int desired)
+		{
+			int new_size = size + desired;
+			if (new_size <= items.Length)
+				return;
+
+			const int default_capacity = 4;
+
+			new_size = System.Math.Max (
+				System.Math.Max (items.Length * 2, default_capacity),
+				new_size);
+
+#if !CF
+			Array.Resize (ref items, new_size);
+#else
+			var array = new T [new_size];
+			Array.Copy (items, array, size);
+			items = array;
+#endif
+		}
+
+		int IList.Add (object value)
+		{
+			try {
+				Add ((T) value);
+				return size - 1;
+			} catch (InvalidCastException) {
+			} catch (NullReferenceException) {
+			}
+
+			throw new ArgumentException ();
+		}
+
+		void IList.Clear ()
+		{
+			Clear ();
+		}
+
+		bool IList.Contains (object value)
+		{
+			return ((IList) this).IndexOf (value) > -1;
+		}
+
+		int IList.IndexOf (object value)
+		{
+			try {
+				return IndexOf ((T) value);
+			} catch (InvalidCastException) {
+			} catch (NullReferenceException) {
+			}
+
+			return -1;
+		}
+
+		void IList.Insert (int index, object value)
+		{
+			CheckIndex (index);
+
+			try {
+				Insert (index, (T) value);
+				return;
+			} catch (InvalidCastException) {
+			} catch (NullReferenceException) {
+			}
+
+			throw new ArgumentException ();
+		}
+
+		void IList.Remove (object value)
+		{
+			try {
+				Remove ((T) value);
+			} catch (InvalidCastException) {
+			} catch (NullReferenceException) {
+			}
+		}
+
+		void IList.RemoveAt (int index)
+		{
+			RemoveAt (index);
+		}
+
+		void ICollection.CopyTo (Array array, int index)
+		{
+			Array.Copy (items, 0, array, index, size);
+		}
+
+		public Enumerator GetEnumerator ()
+		{
+			return new Enumerator (this);
+		}
+
+		IEnumerator IEnumerable.GetEnumerator ()
+		{
+			return new Enumerator (this);
+		}
+
+		IEnumerator<T> IEnumerable<T>.GetEnumerator ()
+		{
+			return new Enumerator (this);
+		}
+
+		public struct Enumerator : IEnumerator<T>, IDisposable {
+
+			Collection<T> collection;
+			T current;
+
+			int next;
+			readonly int version;
+
+			public T Current {
+				get { return current; }
+			}
+
+			object IEnumerator.Current {
+				get {
+					CheckState ();
+
+					if (next <= 0)
+						throw new InvalidOperationException ();
+
+					return current;
+				}
+			}
+
+			internal Enumerator (Collection<T> collection)
+				: this ()
+			{
+				this.collection = collection;
+				this.version = collection.version;
+			}
+
+			public bool MoveNext ()
+			{
+				CheckState ();
+
+				if (next < 0)
+					return false;
+
+				if (next < collection.size) {
+					current = collection.items [next++];
+					return true;
+				}
+
+				next = -1;
+				return false;
+			}
+
+			public void Reset ()
+			{
+				CheckState ();
+
+				next = 0;
+			}
+
+			void CheckState ()
+			{
+				if (collection == null)
+					throw new ObjectDisposedException (GetType ().FullName);
+
+				if (version != collection.version)
+					throw new InvalidOperationException ();
+			}
+
+			public void Dispose ()
+			{
+				collection = null;
+			}
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/Utility/CryptoConvert.cs b/src/Core/Compiler/Importer/IL/Utility/CryptoConvert.cs
new file mode 100644
index 000000000..2800da2a8
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Utility/CryptoConvert.cs
@@ -0,0 +1,243 @@
+//
+// CryptoConvert.cs - Crypto Convertion Routines
+//
+// Author:
+//	Sebastien Pouliot  <sebastien@ximian.com>
+//
+// (C) 2003 Motus Technologies Inc. (http://www.motus.com)
+// Copyright (C) 2004-2006 Novell Inc. (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Security.Cryptography;
+
+#if !(SILVERLIGHT || IL_READ_ONLY)
+
+namespace ScriptSharp.Importer.IL {
+
+	static class CryptoConvert {
+
+		static private int ToInt32LE (byte [] bytes, int offset)
+		{
+			return (bytes [offset+3] << 24) | (bytes [offset+2] << 16) | (bytes [offset+1] << 8) | bytes [offset];
+		}
+
+		static private uint ToUInt32LE (byte [] bytes, int offset)
+		{
+			return (uint)((bytes [offset+3] << 24) | (bytes [offset+2] << 16) | (bytes [offset+1] << 8) | bytes [offset]);
+		}
+
+		static private byte[] Trim (byte[] array)
+		{
+			for (int i=0; i < array.Length; i++) {
+				if (array [i] != 0x00) {
+					byte[] result = new byte [array.Length - i];
+					Buffer.BlockCopy (array, i, result, 0, result.Length);
+					return result;
+				}
+			}
+			return null;
+		}
+
+		static RSA FromCapiPrivateKeyBlob (byte[] blob, int offset)
+		{
+			RSAParameters rsap = new RSAParameters ();
+			try {
+				if ((blob [offset]   != 0x07) ||				// PRIVATEKEYBLOB (0x07)
+				    (blob [offset+1] != 0x02) ||				// Version (0x02)
+				    (blob [offset+2] != 0x00) ||				// Reserved (word)
+				    (blob [offset+3] != 0x00) ||
+				    (ToUInt32LE (blob, offset+8) != 0x32415352))	// DWORD magic = RSA2
+					throw new CryptographicException ("Invalid blob header");
+
+				// ALGID (CALG_RSA_SIGN, CALG_RSA_KEYX, ...)
+				// int algId = ToInt32LE (blob, offset+4);
+
+				// DWORD bitlen
+				int bitLen = ToInt32LE (blob, offset+12);
+
+				// DWORD public exponent
+				byte[] exp = new byte [4];
+				Buffer.BlockCopy (blob, offset+16, exp, 0, 4);
+				Array.Reverse (exp);
+				rsap.Exponent = Trim (exp);
+
+				int pos = offset+20;
+				// BYTE modulus[rsapubkey.bitlen/8];
+				int byteLen = (bitLen >> 3);
+				rsap.Modulus = new byte [byteLen];
+				Buffer.BlockCopy (blob, pos, rsap.Modulus, 0, byteLen);
+				Array.Reverse (rsap.Modulus);
+				pos += byteLen;
+
+				// BYTE prime1[rsapubkey.bitlen/16];
+				int byteHalfLen = (byteLen >> 1);
+				rsap.P = new byte [byteHalfLen];
+				Buffer.BlockCopy (blob, pos, rsap.P, 0, byteHalfLen);
+				Array.Reverse (rsap.P);
+				pos += byteHalfLen;
+
+				// BYTE prime2[rsapubkey.bitlen/16];
+				rsap.Q = new byte [byteHalfLen];
+				Buffer.BlockCopy (blob, pos, rsap.Q, 0, byteHalfLen);
+				Array.Reverse (rsap.Q);
+				pos += byteHalfLen;
+
+				// BYTE exponent1[rsapubkey.bitlen/16];
+				rsap.DP = new byte [byteHalfLen];
+				Buffer.BlockCopy (blob, pos, rsap.DP, 0, byteHalfLen);
+				Array.Reverse (rsap.DP);
+				pos += byteHalfLen;
+
+				// BYTE exponent2[rsapubkey.bitlen/16];
+				rsap.DQ = new byte [byteHalfLen];
+				Buffer.BlockCopy (blob, pos, rsap.DQ, 0, byteHalfLen);
+				Array.Reverse (rsap.DQ);
+				pos += byteHalfLen;
+
+				// BYTE coefficient[rsapubkey.bitlen/16];
+				rsap.InverseQ = new byte [byteHalfLen];
+				Buffer.BlockCopy (blob, pos, rsap.InverseQ, 0, byteHalfLen);
+				Array.Reverse (rsap.InverseQ);
+				pos += byteHalfLen;
+
+				// ok, this is hackish but CryptoAPI support it so...
+				// note: only works because CRT is used by default
+				// http://bugzilla.ximian.com/show_bug.cgi?id=57941
+				rsap.D = new byte [byteLen]; // must be allocated
+				if (pos + byteLen + offset <= blob.Length) {
+					// BYTE privateExponent[rsapubkey.bitlen/8];
+					Buffer.BlockCopy (blob, pos, rsap.D, 0, byteLen);
+					Array.Reverse (rsap.D);
+				}
+			}
+			catch (Exception e) {
+				throw new CryptographicException ("Invalid blob.", e);
+			}
+
+			RSA rsa = null;
+			try {
+				rsa = RSA.Create ();
+				rsa.ImportParameters (rsap);
+			}
+			catch (CryptographicException ce) {
+				// this may cause problem when this code is run under
+				// the SYSTEM identity on Windows (e.g. ASP.NET). See
+				// http://bugzilla.ximian.com/show_bug.cgi?id=77559
+				try {
+					CspParameters csp = new CspParameters ();
+					csp.Flags = CspProviderFlags.UseMachineKeyStore;
+					rsa = new RSACryptoServiceProvider (csp);
+					rsa.ImportParameters (rsap);
+				}
+				catch {
+					// rethrow original, not the later, exception if this fails
+					throw ce;
+				}
+			}
+			return rsa;
+		}
+
+		static RSA FromCapiPublicKeyBlob (byte[] blob, int offset)
+		{
+			try {
+				if ((blob [offset]   != 0x06) ||				// PUBLICKEYBLOB (0x06)
+				    (blob [offset+1] != 0x02) ||				// Version (0x02)
+				    (blob [offset+2] != 0x00) ||				// Reserved (word)
+				    (blob [offset+3] != 0x00) ||
+				    (ToUInt32LE (blob, offset+8) != 0x31415352))	// DWORD magic = RSA1
+					throw new CryptographicException ("Invalid blob header");
+
+				// ALGID (CALG_RSA_SIGN, CALG_RSA_KEYX, ...)
+				// int algId = ToInt32LE (blob, offset+4);
+
+				// DWORD bitlen
+				int bitLen = ToInt32LE (blob, offset+12);
+
+				// DWORD public exponent
+				RSAParameters rsap = new RSAParameters ();
+				rsap.Exponent = new byte [3];
+				rsap.Exponent [0] = blob [offset+18];
+				rsap.Exponent [1] = blob [offset+17];
+				rsap.Exponent [2] = blob [offset+16];
+
+				int pos = offset+20;
+				// BYTE modulus[rsapubkey.bitlen/8];
+				int byteLen = (bitLen >> 3);
+				rsap.Modulus = new byte [byteLen];
+				Buffer.BlockCopy (blob, pos, rsap.Modulus, 0, byteLen);
+				Array.Reverse (rsap.Modulus);
+
+				RSA rsa = null;
+				try {
+					rsa = RSA.Create ();
+					rsa.ImportParameters (rsap);
+				}
+				catch (CryptographicException) {
+					// this may cause problem when this code is run under
+					// the SYSTEM identity on Windows (e.g. ASP.NET). See
+					// http://bugzilla.ximian.com/show_bug.cgi?id=77559
+					CspParameters csp = new CspParameters ();
+					csp.Flags = CspProviderFlags.UseMachineKeyStore;
+					rsa = new RSACryptoServiceProvider (csp);
+					rsa.ImportParameters (rsap);
+				}
+				return rsa;
+			}
+			catch (Exception e) {
+				throw new CryptographicException ("Invalid blob.", e);
+			}
+		}
+
+		// PRIVATEKEYBLOB
+		// PUBLICKEYBLOB
+		static public RSA FromCapiKeyBlob (byte[] blob)
+		{
+			return FromCapiKeyBlob (blob, 0);
+		}
+
+		static public RSA FromCapiKeyBlob (byte[] blob, int offset)
+		{
+			if (blob == null)
+				throw new ArgumentNullException ("blob");
+			if (offset >= blob.Length)
+				throw new ArgumentException ("blob is too small.");
+
+			switch (blob [offset]) {
+				case 0x00:
+					// this could be a public key inside an header
+					// like "sn -e" would produce
+					if (blob [offset + 12] == 0x06) {
+						return FromCapiPublicKeyBlob (blob, offset + 12);
+					}
+					break;
+				case 0x06:
+					return FromCapiPublicKeyBlob (blob, offset);
+				case 0x07:
+					return FromCapiPrivateKeyBlob (blob, offset);
+			}
+			throw new CryptographicException ("Unknown blob format.");
+		}
+	}
+}
+
+#endif
diff --git a/src/Core/Compiler/Importer/IL/Utility/CryptoService.cs b/src/Core/Compiler/Importer/IL/Utility/CryptoService.cs
new file mode 100644
index 000000000..861b4536b
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Utility/CryptoService.cs
@@ -0,0 +1,176 @@
+//
+// CryptoService.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Security.Cryptography;
+
+#if !IL_READ_ONLY
+
+#if !SILVERLIGHT && !CF
+using System.Runtime.Serialization;
+#endif
+
+using ScriptSharp.Importer.IL.PE;
+
+namespace ScriptSharp.Importer.IL {
+
+	// Most of this code has been adapted
+	// from Jeroen Frijters' fantastic work
+	// in IKVM.Reflection.Emit. Thanks!
+
+	static class CryptoService {
+
+#if !SILVERLIGHT && !CF
+		public static void StrongName (Stream stream, ImageWriter writer, StrongNameKeyPair key_pair)
+		{
+			int strong_name_pointer;
+
+			var strong_name = CreateStrongName (key_pair, HashStream (stream, writer, out strong_name_pointer));
+			PatchStrongName (stream, strong_name_pointer, strong_name);
+		}
+
+		static void PatchStrongName (Stream stream, int strong_name_pointer, byte [] strong_name)
+		{
+			stream.Seek (strong_name_pointer, SeekOrigin.Begin);
+			stream.Write (strong_name, 0, strong_name.Length);
+		}
+
+		static byte [] CreateStrongName (StrongNameKeyPair key_pair, byte [] hash)
+		{
+			const string hash_algo = "SHA1";
+
+			using (var rsa = key_pair.CreateRSA ()) {
+				var formatter = new RSAPKCS1SignatureFormatter (rsa);
+				formatter.SetHashAlgorithm (hash_algo);
+
+				byte [] signature = formatter.CreateSignature (hash);
+				Array.Reverse (signature);
+
+				return signature;
+			}
+		}
+
+		static byte [] HashStream (Stream stream, ImageWriter writer, out int strong_name_pointer)
+		{
+			const int buffer_size = 8192;
+
+			var text = writer.text;
+			var header_size = (int) writer.GetHeaderSize ();
+			var text_section_pointer = (int) text.PointerToRawData;
+			var strong_name_directory = writer.GetStrongNameSignatureDirectory ();
+
+			if (strong_name_directory.Size == 0)
+				throw new InvalidOperationException ();
+
+			strong_name_pointer = (int) (text_section_pointer
+				+ (strong_name_directory.VirtualAddress - text.VirtualAddress));
+			var strong_name_length = (int) strong_name_directory.Size;
+
+			var sha1 = new SHA1Managed ();
+			var buffer = new byte [buffer_size];
+			using (var crypto_stream = new CryptoStream (Stream.Null, sha1, CryptoStreamMode.Write)) {
+
+				stream.Seek (0, SeekOrigin.Begin);
+				CopyStreamChunk (stream, crypto_stream, buffer, header_size);
+
+				stream.Seek (text_section_pointer, SeekOrigin.Begin);
+				CopyStreamChunk (stream, crypto_stream, buffer, (int) strong_name_pointer - text_section_pointer);
+
+				stream.Seek (strong_name_length, SeekOrigin.Current);
+				CopyStreamChunk (stream, crypto_stream, buffer, (int) (stream.Length - (strong_name_pointer + strong_name_length)));
+			}
+
+			return sha1.Hash;
+		}
+#endif
+		static void CopyStreamChunk (Stream stream, Stream dest_stream, byte [] buffer, int length)
+		{
+			while (length > 0) {
+				int read = stream.Read (buffer, 0, System.Math.Min (buffer.Length, length));
+				dest_stream.Write (buffer, 0, read);
+				length -= read;
+			}
+		}
+
+		public static byte [] ComputeHash (string file)
+		{
+			if (!File.Exists (file))
+				return Empty<byte>.Array;
+
+			const int buffer_size = 8192;
+
+			var sha1 = new SHA1Managed ();
+
+			using (var stream = new FileStream (file, FileMode.Open, FileAccess.Read, FileShare.Read)) {
+
+				var buffer = new byte [buffer_size];
+
+				using (var crypto_stream = new CryptoStream (Stream.Null, sha1, CryptoStreamMode.Write))
+					CopyStreamChunk (stream, crypto_stream, buffer, (int) stream.Length);
+			}
+
+			return sha1.Hash;
+		}
+	}
+
+#if !SILVERLIGHT && !CF
+	static partial class Mixin {
+
+		public static RSA CreateRSA (this StrongNameKeyPair key_pair)
+		{
+			byte [] key;
+			string key_container;
+
+			if (!TryGetKeyContainer (key_pair, out key, out key_container))
+				return CryptoConvert.FromCapiKeyBlob (key);
+
+			var parameters = new CspParameters {
+				Flags = CspProviderFlags.UseMachineKeyStore,
+				KeyContainerName = key_container,
+				KeyNumber = 2,
+			};
+
+			return new RSACryptoServiceProvider (parameters);
+		}
+
+		static bool TryGetKeyContainer (ISerializable key_pair, out byte [] key, out string key_container)
+		{
+			var info = new SerializationInfo (typeof (StrongNameKeyPair), new FormatterConverter ());
+			key_pair.GetObjectData (info, new StreamingContext ());
+
+			key = (byte []) info.GetValue ("_keyPairArray", typeof (byte []));
+			key_container = info.GetString ("_keyPairContainer");
+			return key_container != null;
+		}
+	}
+#endif
+}
+
+#endif
diff --git a/src/Core/Compiler/Importer/IL/Utility/Empty.cs b/src/Core/Compiler/Importer/IL/Utility/Empty.cs
new file mode 100644
index 000000000..2a7d0a1e5
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/Utility/Empty.cs
@@ -0,0 +1,55 @@
+//
+// Empty.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+namespace ScriptSharp.Importer.IL {
+
+	static class Empty<T> {
+
+		public static readonly T [] Array = new T [0];
+	}
+}
+
+namespace ScriptSharp.Importer.IL {
+
+	static partial class Mixin {
+
+		public static bool IsNullOrEmpty<T> (this T [] self)
+		{
+			return self == null || self.Length == 0;
+		}
+
+		public static bool IsNullOrEmpty<T> (this ICollection<T> self)
+		{
+			return self == null || self.Count == 0;
+		}
+	}
+}
diff --git a/src/Core/Compiler/Importer/IL/VariantType.cs b/src/Core/Compiler/Importer/IL/VariantType.cs
new file mode 100644
index 000000000..408de03f2
--- /dev/null
+++ b/src/Core/Compiler/Importer/IL/VariantType.cs
@@ -0,0 +1,53 @@
+//
+// VariantType.cs
+//
+// Author:
+//   Jb Evain (jbevain@gmail.com)
+//
+// Copyright (c) 2008 - 2010 Jb Evain
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+namespace ScriptSharp.Importer.IL {
+
+    internal /* public */ enum VariantType {
+		None = 0,
+		I2 = 2,
+		I4 = 3,
+		R4 = 4,
+		R8 = 5,
+		CY = 6,
+		Date = 7,
+		BStr = 8,
+		Dispatch = 9,
+		Error = 10,
+		Bool = 11,
+		Variant = 12,
+		Unknown = 13,
+		Decimal = 14,
+		I1 = 16,
+		UI1 = 17,
+		UI2 = 18,
+		UI4 = 19,
+		Int = 22,
+		UInt = 23
+	}
+}
diff --git a/src/Core/Compiler/Importer/Interop.cs b/src/Core/Compiler/Importer/Interop.cs
new file mode 100644
index 000000000..1468ca306
--- /dev/null
+++ b/src/Core/Compiler/Importer/Interop.cs
@@ -0,0 +1,953 @@
+// Interop.cs
+// Script#/Core/ScriptSharp
+// Copyright (c) Nikhil Kothari.
+// Copyright (c) Microsoft Corporation.
+// This source code is subject to terms and conditions of the Microsoft 
+// Public License. A copy of the license can be found in License.txt.
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace ScriptSharp.Importer {
+
+    internal static class Interop {
+
+        internal enum CorTokenType {
+            mdtModule = 0x00000000,
+            mdtTypeRef = 0x01000000,
+            mdtTypeDef = 0x02000000,
+            mdtFieldDef = 0x04000000,
+            mdtMethodDef = 0x06000000,
+            mdtParamDef = 0x08000000,
+            mdtInterfaceImpl = 0x09000000,
+            mdtMemberRef = 0x0a000000,
+            mdtCustomAttribute = 0x0c000000,
+            mdtPermission = 0x0e000000,
+            mdtSignature = 0x11000000,
+            mdtEvent = 0x14000000,
+            mdtProperty = 0x17000000,
+            mdtModuleRef = 0x1a000000,
+            mdtTypeSpec = 0x1b000000,
+            mdtAssembly = 0x20000000,
+            mdtAssemblyRef = 0x23000000,
+            mdtFile = 0x26000000,
+            mdtExportedType = 0x27000000,
+            mdtManifestResource = 0x28000000,
+            mdtGenericParam = 0x2a000000,
+            mdtMethodSpec = 0x2b000000,
+            mdtGenericParamConstraint = 0x2c000000,
+            mdtString = 0x70000000,
+            mdtName = 0x71000000,
+            mdtBaseType = 0x72000000,
+        }
+
+        internal enum CorTypeAttr {
+            // Use this mask to retrieve the type visibility information.
+            tdVisibilityMask = 0x00000007,
+            tdNotPublic = 0x00000000,           // Class is not public scope.
+            tdPublic = 0x00000001,              // Class is public scope.
+            tdNestedPublic = 0x00000002,        // Class is nested with public visibility.
+            tdNestedPrivate = 0x00000003,       // Class is nested with private visibility.
+            tdNestedFamily = 0x00000004,        // Class is nested with family visibility.
+            tdNestedAssembly = 0x00000005,      // Class is nested with assembly visibility.
+            tdNestedFamANDAssem = 0x00000006,   // Class is nested with family and assembly visibility.
+            tdNestedFamORAssem = 0x00000007,    // Class is nested with family or assembly visibility.
+
+            // Use this mask to retrieve class layout information
+            tdLayoutMask = 0x00000018,
+            tdAutoLayout = 0x00000000,          // Class fields are auto-laid out
+            tdSequentialLayout = 0x00000008,    // Class fields are laid out sequentially
+            tdExplicitLayout = 0x00000010,      // Layout is supplied explicitly
+
+            // Use this mask to retrieve class semantics information.
+            tdClassSemanticsMask = 0x00000060,
+            tdClass = 0x00000000,               // Type is a class.
+            tdInterface = 0x00000020,           // Type is an interface.
+
+            // Special semantics in addition to class semantics.
+            tdAbstract = 0x00000080,            // Class is abstract
+            tdSealed = 0x00000100,              // Class is concrete and may not be extended
+            tdSpecialName = 0x00000400,         // Class name is special.  Name describes how.
+
+            // Implementation attributes.
+            tdImport = 0x00001000,              // Class / interface is imported
+            tdSerializable = 0x00002000,        // The class is Serializable.
+
+            // Use tdStringFormatMask to retrieve string information for native interop
+            tdStringFormatMask = 0x00030000,
+            tdAnsiClass = 0x00000000,           // LPTSTR is interpreted as ANSI in this class
+            tdUnicodeClass = 0x00010000,        // LPTSTR is interpreted as UNICODE
+            tdAutoClass = 0x00020000,           // LPTSTR is interpreted automatically
+            tdCustomFormatClass = 0x00030000,   // A non-standard encoding specified by CustomFormatMask
+            tdCustomFormatMask = 0x00C00000,    // Use this mask to retrieve non-standard encoding information for native interop. The meaning of the values of these 2 bits is unspecified.
+
+            // Flags reserved for runtime use.
+            tdBeforeFieldInit = 0x00100000,     // Initialize the class any time before first static field access.
+            tdForwarder = 0x00200000,           // This ExportedType is a type forwarder.
+            tdReservedMask = 0x00040800,
+            tdRTSpecialName = 0x00000800,       // Runtime should check name encoding.
+            tdHasSecurity = 0x00040000,         // Class has security associate with it.
+        }
+
+        internal enum CorFieldAttr {
+            // member access mask - Use this mask to retrieve accessibility information.
+            fdFieldAccessMask = 0x0007,
+            fdPrivateScope = 0x0000,            // Member not referenceable.
+            fdPrivate = 0x0001,                 // Accessible only by the parent type.
+            fdFamANDAssem = 0x0002,             // Accessible by sub-types only in this Assembly.
+            fdAssembly = 0x0003,                // Accessibly by anyone in the Assembly.
+            fdFamily = 0x0004,                  // Accessible only by type and sub-types.
+            fdFamORAssem = 0x0005,              // Accessibly by sub-types anywhere, plus anyone in assembly.
+            fdPublic = 0x0006,                  // Accessibly by anyone who has visibility to this scope.
+
+            // field contract attributes.
+            fdStatic = 0x0010,                  // Defined on type, else per instance.
+            fdInitOnly = 0x0020,                // Field may only be initialized, not written to after init.
+            fdLiteral = 0x0040,                 // Value is compile time constant.
+            fdNotSerialized = 0x0080,           // Field does not have to be serialized when type is remoted.
+
+            fdSpecialName = 0x0200,             // field is special.  Name describes how.
+
+            // interop attributes
+            fdPinvokeImpl = 0x2000,             // Implementation is forwarded through pinvoke.
+
+            // Reserved flags for runtime use only.
+            fdReservedMask = 0x9500,
+            fdRTSpecialName = 0x0400,           // Runtime(metadata internal APIs) should check name encoding.
+            fdHasFieldMarshal = 0x1000,         // Field has marshalling information.
+            fdHasDefault = 0x8000,              // Field has default.
+            fdHasFieldRVA = 0x0100,             // Field has RVA.
+        }
+
+        public enum CorMethodAttr {
+            // member access mask - Use this mask to retrieve accessibility information.
+            mdMemberAccessMask = 0x0007,
+            mdPrivateScope = 0x0000,            // Member not referenceable.
+            mdPrivate = 0x0001,                 // Accessible only by the parent type.
+            mdFamANDAssem = 0x0002,             // Accessible by sub-types only in this Assembly.
+            mdAssembly = 0x0003,                   // Accessibly by anyone in the Assembly.
+            mdFamily = 0x0004,                  // Accessible only by type and sub-types.
+            mdFamORAssem = 0x0005,              // Accessibly by sub-types anywhere, plus anyone in assembly.
+            mdPublic = 0x0006,                  // Accessibly by anyone who has visibility to this scope.
+
+            // method contract attributes.
+            mdStatic = 0x0010,                  // Defined on type, else per instance.
+            mdFinal = 0x0020,                   // Method may not be overridden.
+            mdVirtual = 0x0040,                 // Method virtual.
+            mdHideBySig = 0x0080,               // Method hides by name+sig, else just by name.
+
+            // vtable layout mask - Use this mask to retrieve vtable attributes.
+            mdVtableLayoutMask = 0x0100,
+            mdReuseSlot = 0x0000,               // The default.
+            mdNewSlot = 0x0100,                 // Method always gets a new slot in the vtable.
+
+            // method implementation attributes.
+            mdCheckAccessOnOverride = 0x0200,   // Overridability is the same as the visibility.
+            mdAbstract = 0x0400,                // Method does not provide an implementation.
+            mdSpecialName = 0x0800,             // Method is special.  Name describes how.
+
+            // interop attributes
+            mdPinvokeImpl = 0x2000,             // Implementation is forwarded through pinvoke.
+            mdUnmanagedExport = 0x0008,         // Managed method exported via thunk to unmanaged code.
+
+            // Reserved flags for runtime use only.
+            mdReservedMask = 0xd000,
+            mdRTSpecialName = 0x1000,           // Runtime should check name encoding.
+            mdHasSecurity = 0x4000,             // Method has security associate with it.
+            mdRequireSecObject = 0x8000,        // Method calls another method containing security code.
+        }
+
+        public enum CorPropertyAttr {
+            prSpecialName = 0x0200,             // property is special.  Name describes how.
+
+            // Reserved flags for Runtime use only.
+            prReservedMask = 0xf400,
+            prRTSpecialName = 0x0400,           // Runtime(metadata internal APIs) should check name encoding.
+            prHasDefault = 0x1000,              // Property has default
+
+            prUnused = 0xe9ff,
+        }
+
+        public enum CorEventAttr {
+            evSpecialName = 0x0200,             // event is special.  Name describes how.
+
+            // Reserved flags for Runtime use only.
+            evReservedMask = 0x0400,
+            evRTSpecialName = 0x0400,           // Runtime(metadata internal APIs) should check name encoding.
+        }
+
+        public const byte ELEMENT_TYPE_END = 0x00;           // Marks end of a list
+        public const byte ELEMENT_TYPE_VOID = 0x01;
+        public const byte ELEMENT_TYPE_BOOLEAN = 0x02;
+        public const byte ELEMENT_TYPE_CHAR = 0x03;
+        public const byte ELEMENT_TYPE_I1 = 0x04;
+        public const byte ELEMENT_TYPE_U1 = 0x05;
+        public const byte ELEMENT_TYPE_I2 = 0x06;
+        public const byte ELEMENT_TYPE_U2 = 0x07;
+        public const byte ELEMENT_TYPE_I4 = 0x08;
+        public const byte ELEMENT_TYPE_U4 = 0x09;
+        public const byte ELEMENT_TYPE_I8 = 0x0a;
+        public const byte ELEMENT_TYPE_U8 = 0x0b;
+        public const byte ELEMENT_TYPE_R4 = 0x0c;
+        public const byte ELEMENT_TYPE_R8 = 0x0d;
+        public const byte ELEMENT_TYPE_STRING = 0x0e;
+        public const byte ELEMENT_TYPE_PTR = 0x0f;            // Followed by type
+        public const byte ELEMENT_TYPE_BYREF = 0x10;          // Followed by type
+        public const byte ELEMENT_TYPE_VALUETYPE = 0x11;      // Followed by TypeDef or TypeRef token
+        public const byte ELEMENT_TYPE_CLASS = 0x12;          // Followed by TypeDef or TypeRef token
+        public const byte ELEMENT_TYPE_VAR = 0x13;            // Generic parameter in a generic type definition; represented as number
+        public const byte ELEMENT_TYPE_ARRAY = 0x14;          // type rank boundsCount bound1 ... loCount lo1 ...
+        public const byte ELEMENT_TYPE_GENERICINST = 0x15;    // Generic type instantiation. Followed by type type-arg-count type-1 ... type-n
+        public const byte ELEMENT_TYPE_TYPEDBYREF = 0x16;
+        public const byte ELEMENT_TYPE_I = 0x18;              // System.IntPtr
+        public const byte ELEMENT_TYPE_U = 0x19;              // System.UIntPtr
+        public const byte ELEMENT_TYPE_FNPTR = 0x1b;          // Followed by full method signature
+        public const byte ELEMENT_TYPE_OBJECT = 0x1c;         // System.Object
+        public const byte ELEMENT_TYPE_SZARRAY = 0x1d;        // Single-dim array with 0 lower bound
+
+        public const byte ELEMENT_TYPE_MVAR = 0x1e;           // Generic parameter in a generic method definition;represented as number
+        public const byte ELEMENT_TYPE_CMOD_REQD = 0x1f;      // Required modifier : followed by a TypeDef or TypeRef token
+        public const byte ELEMENT_TYPE_CMOD_OPT = 0x20;       // Optional modifier : followed by a TypeDef or TypeRef token
+        public const byte ELEMENT_TYPE_INTERNAL = 0x21;       // Implemented within the CLI
+        public const byte ELEMENT_TYPE_MODIFIER = 0x40;       // Or’d with following element types
+        public const byte ELEMENT_TYPE_SENTINEL = 0x41;       // Sentinel for vararg method signature
+        public const byte ELEMENT_TYPE_PINNED = 0x45;         // Denotes a local variable that points at a pinned object
+
+        public const byte SIG_METHOD_DEFAULT = 0x0;             // default calling convention
+        public const byte SIG_METHOD_C = 0x1;                   // C calling convention
+        public const byte SIG_METHOD_STDCALL = 0x2;             // Stdcall calling convention
+        public const byte SIG_METHOD_THISCALL = 0x3;            // thiscall  calling convention
+        public const byte SIG_METHOD_FASTCALL = 0x4;            // fastcall calling convention
+        public const byte SIG_METHOD_VARARG = 0x5;              // vararg calling convention
+        public const byte SIG_FIELD = 0x6;                      // encodes a field
+        public const byte SIG_LOCAL_SIG = 0x7;                  // used for the .locals directive
+        public const byte SIG_PROPERTY = 0x8;                   // used to encode a property
+
+        public const byte SIG_GENERIC = 0x10;                   // used to indicate that the method has one or more generic parameters.
+        public const byte SIG_HASTHIS = 0x20;                   // used to encode the keyword instance in the calling convention
+        public const byte SIG_EXPLICITTHIS = 0x40;              // used to encode the keyword explicit in the calling convention
+
+        public const byte SIG_INDEX_TYPE_TYPEDEF = 0;           // ParseTypeDefOrRefEncoded returns this as the out index type for typedefs
+        public const byte SIG_INDEX_TYPE_TYPEREF = 1;           // ParseTypeDefOrRefEncoded returns this as the out index type for typerefs
+        public const byte SIG_INDEX_TYPE_TYPESPEC = 2;          // ParseTypeDefOrRefEncoded returns this as the out index type for typespecs
+
+        [
+        ComImport,
+        Guid("E5CB7A31-7512-11d2-89CE-0080C792E5D8"),
+        ClassInterface(ClassInterfaceType.None)
+        ]
+        internal class CorMetadataDispenser {
+        }
+
+        [
+        Guid("809c652e-7396-11d2-9771-00a0c9b4d50c"),
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown)
+        ]
+        internal interface IMetadataDispenser {
+
+            [return: MarshalAs(UnmanagedType.Interface)]
+            object DefineScope(
+                ref Guid rclsid,
+                int dwCreateFlags,
+                ref Guid riid);
+
+            [return: MarshalAs(UnmanagedType.Interface)]
+            object OpenScope(
+                [MarshalAs(UnmanagedType.LPWStr)]  string szScope,
+                int dwOpenFlags,
+                ref Guid riid);
+
+            [return: MarshalAs(UnmanagedType.Interface)]
+            object OpenScopeOnMemory(
+                IntPtr pData,
+                int cbData,
+                int dwOpenFlags,
+                ref Guid riid);
+        }
+
+        [
+        Guid("7DAC8207-D3AE-4c75-9B67-92801A497D44"),
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown)
+        ]
+        internal interface IMetadataImport {
+
+            // STDMETHOD_(void, CloseEnum)(HCORENUM hEnum) PURE;
+            [PreserveSig]
+            void CloseEnum(IntPtr hEnum);
+
+            // STDMETHOD(CountEnum)(HCORENUM hEnum, ULONG *pulCount) PURE;
+            void CountEnum_();
+
+            // STDMETHOD(ResetEnum)(HCORENUM hEnum, ULONG ulPos) PURE;
+            void ResetEnum_();
+
+            // STDMETHOD(EnumTypeDefs)(HCORENUM *phEnum, mdTypeDef rTypeDefs[],ULONG cMax, ULONG *pcTypeDefs) PURE;
+            void EnumTypeDefs(
+                ref IntPtr phEnum,
+                [Out] out int rTypeDefs,
+                int cMax /* must be 1 */,
+                out int pcTypeDefs);
+
+            // STDMETHOD(EnumInterfaceImpls)(HCORENUM *phEnum, mdTypeDef td, mdInterfaceImpl rImpls[], ULONG cMax, ULONG* pcImpls) PURE;
+            void EnumInterfaceImpls_();
+
+            // STDMETHOD(EnumTypeRefs)(HCORENUM *phEnum, mdTypeRef rTypeRefs[], ULONG cMax, ULONG* pcTypeRefs) PURE;
+            void EnumTypeRefs_();
+
+            // STDMETHOD(FindTypeDefByName)(           // S_OK or error.
+            //     LPCWSTR     szTypeDef,              // [IN] Name of the Type.
+            //     mdToken     tkEnclosingClass,       // [IN] TypeDef/TypeRef for Enclosing class.
+            //     mdTypeDef   *ptd) PURE;             // [OUT] Put the TypeDef token here.
+            void FindTypeDefByName(
+                [MarshalAs(UnmanagedType.LPWStr)] string szTypeDef,
+                int tkEnclosingClass,
+                [Out] out int ptkClass);
+
+            // STDMETHOD(GetScopeProps)(               // S_OK or error.
+            //     LPWSTR      szName,                 // [OUT] Put the name here.
+            //     ULONG       cchName,                // [IN] Size of name buffer in wide chars.
+            //     ULONG       *pchName,               // [OUT] Put size of name (wide chars) here.
+            //     GUID        *pmvid) PURE;           // [OUT, OPTIONAL] Put MVID here.
+            void GetScopeProps_();
+
+            // STDMETHOD(GetModuleFromScope)(mdModule* pmd) // [OUT] Put mdModule token here.
+            void GetModuleFromScope([Out] out int pmd);
+
+            // STDMETHOD(GetTypeDefProps)(             // S_OK or error.
+            //     mdTypeDef   td,                     // [IN] TypeDef token for inquiry.
+            //     LPWSTR      szTypeDef,              // [OUT] Put name here.
+            //     ULONG       cchTypeDef,             // [IN] size of name buffer in wide chars.
+            //     ULONG       *pchTypeDef,            // [OUT] put size of name (wide chars) here.
+            //     DWORD       *pdwTypeDefFlags,       // [OUT] Put flags here.
+            //     mdToken     *ptkExtends) PURE;      // [OUT] Put base class TypeDef/TypeRef here.
+            void GetTypeDefProps(
+                int tkTypeDef,
+                [Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder szTypeDef,
+                int cchTypeDef,
+                out int pchTypeDef,
+                out int pdwTypeDefFlags,
+                out int ptkExtends);
+
+            // STDMETHOD(GetInterfaceImplProps)(       // S_OK or error.
+            //     mdInterfaceImpl iiImpl,             // [IN] InterfaceImpl token.
+            //     mdTypeDef   *pClass,                // [OUT] Put implementing class token here.
+            //     mdToken     *ptkIface) PURE;        // [OUT] Put implemented interface token here.
+            void GetInterfaceImplProps_();
+
+            // STDMETHOD(GetTypeRefProps)(             // S_OK or error.
+            //     mdTypeRef   tr,                     // [IN] TypeRef token.
+            //     mdToken     *ptkResolutionScope,    // [OUT] Resolution scope, ModuleRef or AssemblyRef.
+            //     LPWSTR      szName,                 // [OUT] Name of the TypeRef.
+            //     ULONG       cchName,                // [IN] Size of buffer.
+            //     ULONG       *pchName) PURE;         // [OUT] Size of Name.
+            void GetTypeRefProps(
+                int tkTypeRef,
+                [Out] out int ptkResolutionScope,
+                [Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder szName,
+                int cchName,
+                out int pchName);
+
+            // STDMETHOD(ResolveTypeRef)(mdTypeRef tr, REFIID riid, IUnknown **ppIScope, mdTypeDef *ptd) PURE;
+            void ResolveTypeRef_();
+
+            // STDMETHOD(EnumMembers)(                 // S_OK, S_FALSE, or error. 
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.    
+            //     mdTypeDef   cl,                     // [IN] TypeDef to scope the enumeration.   
+            //     mdToken     rMembers[],             // [OUT] Put MemberDefs here.   
+            //     ULONG       cMax,                   // [IN] Max MemberDefs to put.  
+            //     ULONG       *pcTokens) PURE;        // [OUT] Put # put here.    
+            void EnumMembers_();
+
+            // STDMETHOD(EnumMembersWithName)(         // S_OK, S_FALSE, or error.             
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.                
+            //     mdTypeDef   cl,                     // [IN] TypeDef to scope the enumeration.   
+            //     LPCWSTR     szName,                 // [IN] Limit results to those with this name.              
+            //     mdToken     rMembers[],             // [OUT] Put MemberDefs here.                   
+            //     ULONG       cMax,                   // [IN] Max MemberDefs to put.              
+            //     ULONG       *pcTokens) PURE;        // [OUT] Put # put here.    
+            void EnumMembersWithName_();
+
+            // STDMETHOD(EnumMethods)(                 // S_OK, S_FALSE, or error. 
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.    
+            //     mdTypeDef   cl,                     // [IN] TypeDef to scope the enumeration.   
+            //     mdMethodDef rMethods[],             // [OUT] Put MethodDefs here.   
+            //     ULONG       cMax,                   // [IN] Max MethodDefs to put.  
+            //     ULONG       *pcTokens) PURE;        // [OUT] Put # put here.    
+            void EnumMethods(
+                ref IntPtr phEnum,
+                int tkType,
+                out int mdMethodDef,
+                int cMax /* must be 1 */,
+                out int pcTokens);
+
+            // STDMETHOD(EnumMethodsWithName)(         // S_OK, S_FALSE, or error.             
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.                
+            //     mdTypeDef   cl,                     // [IN] TypeDef to scope the enumeration.   
+            //     LPCWSTR     szName,                 // [IN] Limit results to those with this name.              
+            //     mdMethodDef rMethods[],             // [OU] Put MethodDefs here.    
+            //     ULONG       cMax,                   // [IN] Max MethodDefs to put.              
+            //     ULONG       *pcTokens) PURE;        // [OUT] Put # put here.    
+            void EnumMethodsWithName_();
+
+            // STDMETHOD(EnumFields)(                 // S_OK, S_FALSE, or error.  
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.    
+            //     mdTypeDef   cl,                     // [IN] TypeDef to scope the enumeration.   
+            //     mdFieldDef  rFields[],              // [OUT] Put FieldDefs here.    
+            //     ULONG       cMax,                   // [IN] Max FieldDefs to put.   
+            //     ULONG       *pcTokens) PURE;        // [OUT] Put # put here.    
+            void EnumFields(
+                ref IntPtr phEnum,
+                int tkType,
+                out int mdFieldDef,
+                int cMax /* must be 1 */,
+                out int pcTokens);
+
+            // STDMETHOD(EnumFieldsWithName)(         // S_OK, S_FALSE, or error.              
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.                
+            //     mdTypeDef   cl,                     // [IN] TypeDef to scope the enumeration.   
+            //     LPCWSTR     szName,                 // [IN] Limit results to those with this name.              
+            //     mdFieldDef  rFields[],              // [OUT] Put MemberDefs here.                   
+            //     ULONG       cMax,                   // [IN] Max MemberDefs to put.              
+            //     ULONG       *pcTokens) PURE;        // [OUT] Put # put here.    
+            void EnumFieldsWithName_();
+
+            // STDMETHOD(EnumParams)(                  // S_OK, S_FALSE, or error. 
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.    
+            //     mdMethodDef mb,                     // [IN] MethodDef to scope the enumeration. 
+            //     mdParamDef  rParams[],              // [OUT] Put ParamDefs here.    
+            //     ULONG       cMax,                   // [IN] Max ParamDefs to put.   
+            //     ULONG       *pcTokens) PURE;        // [OUT] Put # put here.
+            void EnumParams_();
+
+            // STDMETHOD(EnumMemberRefs)(              // S_OK, S_FALSE, or error. 
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.    
+            //     mdToken     tkParent,               // [IN] Parent token to scope the enumeration.  
+            //     mdMemberRef rMemberRefs[],          // [OUT] Put MemberRefs here.   
+            //     ULONG       cMax,                   // [IN] Max MemberRefs to put.  
+            //     ULONG       *pcTokens) PURE;        // [OUT] Put # put here.    
+            void EnumMemberRefs_();
+
+            // STDMETHOD(EnumMethodImpls)(             // S_OK, S_FALSE, or error  
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.    
+            //     mdTypeDef   td,                     // [IN] TypeDef to scope the enumeration.   
+            //     mdToken     rMethodBody[],          // [OUT] Put Method Body tokens here.   
+            //     mdToken     rMethodDecl[],          // [OUT] Put Method Declaration tokens here.
+            //     ULONG       cMax,                   // [IN] Max tokens to put.  
+            //     ULONG       *pcTokens) PURE;        // [OUT] Put # put here.    
+            void EnumMethodImpls_();
+
+            // STDMETHOD(EnumPermissionSets)(          // S_OK, S_FALSE, or error. 
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.    
+            //     mdToken     tk,                     // [IN] if !NIL, token to scope the enumeration.    
+            //     DWORD       dwActions,              // [IN] if !0, return only these actions.   
+            //     mdPermission rPermission[],         // [OUT] Put Permissions here.  
+            //     ULONG       cMax,                   // [IN] Max Permissions to put. 
+            //     ULONG       *pcTokens) PURE;        // [OUT] Put # put here.    
+            void EnumPermissionSets_();
+
+            // STDMETHOD(FindMember)(  
+            //     mdTypeDef   td,                     // [IN] given typedef   
+            //     LPCWSTR     szName,                 // [IN] member name 
+            //     PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature 
+            //     ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob    
+            //     mdToken     *pmb) PURE;             // [OUT] matching memberdef 
+            void FindMember_();
+
+            // STDMETHOD(FindMethod)(  
+            //     mdTypeDef   td,                     // [IN] given typedef   
+            //     LPCWSTR     szName,                 // [IN] member name 
+            //     PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature 
+            //     ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob    
+            //     mdMethodDef *pmb) PURE;             // [OUT] matching memberdef 
+            void FindMethod(
+                int td,
+                [MarshalAs(UnmanagedType.LPWStr)] string szName,
+                IntPtr pvSigBlob,
+                int cbSigBlock,
+                [Out] out int pmd);
+
+            // STDMETHOD(FindField)(   
+            //     mdTypeDef   td,                     // [IN] given typedef   
+            //     LPCWSTR     szName,                 // [IN] member name 
+            //     PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature 
+            //     ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob    
+            //     mdFieldDef  *pmb) PURE;             // [OUT] matching memberdef 
+            void FindField_();
+
+            // STDMETHOD(FindMemberRef)(   
+            //     mdTypeRef   td,                     // [IN] given typeRef   
+            //     LPCWSTR     szName,                 // [IN] member name 
+            //     PCCOR_SIGNATURE pvSigBlob,          // [IN] point to a blob value of CLR signature 
+            //     ULONG       cbSigBlob,              // [IN] count of bytes in the signature blob    
+            //     mdMemberRef *pmr) PURE;             // [OUT] matching memberref 
+            void FindMemberRef_();
+
+            // STDMETHOD (GetMethodProps)( 
+            //     mdMethodDef mb,                     // The method for which to get props.   
+            //     mdTypeDef   *pClass,                // Put method's class here. 
+            //     LPWSTR      szMethod,               // Put method's name here.  
+            //     ULONG       cchMethod,              // Size of szMethod buffer in wide chars.   
+            //     ULONG       *pchMethod,             // Put actual size here 
+            //     DWORD       *pdwAttr,               // Put flags here.  
+            //     PCCOR_SIGNATURE *ppvSigBlob,        // [OUT] point to the blob value of meta data   
+            //     ULONG       *pcbSigBlob,            // [OUT] actual size of signature blob  
+            //     ULONG       *pulCodeRVA,            // [OUT] codeRVA    
+            //     DWORD       *pdwImplFlags) PURE;    // [OUT] Impl. Flags    
+            void GetMethodProps(
+                int md,
+                [Out] out int pClass,
+                [Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder szMethod,
+                int cchMethod,
+                [Out] out int pchMethod,
+                [Out] out int pdwAttr,
+                [Out] out IntPtr ppvSigBlob,
+                [Out] out int pcbSigBlob,
+                [Out] out int pulCodeRVA,
+                [Out] out int pdwImplFlags);
+
+            // STDMETHOD(GetMemberRefProps)(           // S_OK or error.   
+            //     mdMemberRef mr,                     // [IN] given memberref 
+            //     mdToken     *ptk,                   // [OUT] Put classref or classdef here. 
+            //     LPWSTR      szMember,               // [OUT] buffer to fill for member's name   
+            //     ULONG       cchMember,              // [IN] the count of char of szMember   
+            //     ULONG       *pchMember,             // [OUT] actual count of char in member name    
+            //     PCCOR_SIGNATURE *ppvSigBlob,        // [OUT] point to meta data blob value  
+            //     ULONG       *pbSig) PURE;           // [OUT] actual size of signature blob  
+            void GetMemberRefProps(
+                int mdMemberRef,
+                [Out] out int mdToken,
+                [Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder szMember,
+                int cchMember,
+                [Out] out int pchMember,
+                [Out] out IntPtr ppvSigBlob,
+                [Out] out int pcbSigBlob);
+
+            // STDMETHOD(EnumProperties)(              // S_OK, S_FALSE, or error. 
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.    
+            //     mdTypeDef   td,                     // [IN] TypeDef to scope the enumeration.   
+            //     mdProperty  rProperties[],          // [OUT] Put Properties here.   
+            //     ULONG       cMax,                   // [IN] Max properties to put.  
+            //     ULONG       *pcProperties) PURE;    // [OUT] Put # put here.    
+            void EnumProperties(
+                ref IntPtr phEnum,
+                int tkType,
+                out int mdPropertyDef,
+                int cMax /* must be 1 */,
+                out int pcTokens);
+
+            // STDMETHOD(EnumEvents)(                  // S_OK, S_FALSE, or error. 
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.    
+            //     mdTypeDef   td,                     // [IN] TypeDef to scope the enumeration.   
+            //     mdEvent     rEvents[],              // [OUT] Put events here.   
+            //     ULONG       cMax,                   // [IN] Max events to put.  
+            //     ULONG       *pcEvents) PURE;        // [OUT] Put # put here.    
+            void EnumEvents(
+                ref IntPtr phEnum,
+                int tkType,
+                out int mdEventDef,
+                int cMax /* must be 1 */,
+                out int pcTokens);
+
+            // STDMETHOD(GetEventProps)(               // S_OK, S_FALSE, or error. 
+            //     mdEvent     ev,                     // [IN] event token 
+            //     mdTypeDef   *pClass,                // [OUT] typedef containing the event declarion.    
+            //     LPCWSTR     szEvent,                // [OUT] Event name 
+            //     ULONG       cchEvent,               // [IN] the count of wchar of szEvent   
+            //     ULONG       *pchEvent,              // [OUT] actual count of wchar for event's name 
+            //     DWORD       *pdwEventFlags,         // [OUT] Event flags.   
+            //     mdToken     *ptkEventType,          // [OUT] EventType class    
+            //     mdMethodDef *pmdAddOn,              // [OUT] AddOn method of the event  
+            //     mdMethodDef *pmdRemoveOn,           // [OUT] RemoveOn method of the event   
+            //     mdMethodDef *pmdFire,               // [OUT] Fire method of the event   
+            //     mdMethodDef rmdOtherMethod[],       // [OUT] other method of the event  
+            //     ULONG       cMax,                   // [IN] size of rmdOtherMethod  
+            //     ULONG       *pcOtherMethod) PURE;   // [OUT] total number of other method of this event 
+            void GetEventProps(
+                int ed,
+                [Out] out int pClass,
+                [Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder szEvent,
+                int cchEvent,
+                [Out] out int pchEvent,
+                [Out] out int pdwAttr,
+                [Out] out int ptkEventType,
+                [Out] out int pmdAddOn,
+                [Out] out int pmdRemoveOn,
+                [Out] out int pmdFire,
+                [Out] out int pmdOtherMethod,
+                int cOtherMethod,
+                [Out] out int pcOtherMethod);
+
+            // STDMETHOD(EnumMethodSemantics)(         // S_OK, S_FALSE, or error. 
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.    
+            //     mdMethodDef mb,                     // [IN] MethodDef to scope the enumeration. 
+            //     mdToken     rEventProp[],           // [OUT] Put Event/Property here.   
+            //     ULONG       cMax,                   // [IN] Max properties to put.  
+            //     ULONG       *pcEventProp) PURE;     // [OUT] Put # put here.    
+            void EnumMethodSemantics_();
+
+            // STDMETHOD(GetMethodSemantics)(          // S_OK, S_FALSE, or error. 
+            //     mdMethodDef mb,                     // [IN] method token    
+            //     mdToken     tkEventProp,            // [IN] event/property token.   
+            //     DWORD       *pdwSemanticsFlags) PURE; // [OUT] the role flags for the method/propevent pair 
+            void GetMethodSemantics_();
+
+            // STDMETHOD(GetClassLayout) ( 
+            //     mdTypeDef   td,                     // [IN] give typedef    
+            //     DWORD       *pdwPackSize,           // [OUT] 1, 2, 4, 8, or 16  
+            //     COR_FIELD_OFFSET rFieldOffset[],    // [OUT] field offset array 
+            //     ULONG       cMax,                   // [IN] size of the array   
+            //     ULONG       *pcFieldOffset,         // [OUT] needed array size  
+            //     ULONG       *pulClassSize) PURE;        // [OUT] the size of the class  
+            void GetClassLayout_();
+
+            // STDMETHOD(GetFieldMarshal) (    
+            //     mdToken     tk,                     // [IN] given a field's memberdef   
+            //     PCCOR_SIGNATURE *ppvNativeType,     // [OUT] native type of this field  
+            //     ULONG       *pcbNativeType) PURE;   // [OUT] the count of bytes of *ppvNativeType   
+            void GetFieldMarshal_();
+
+            // STDMETHOD(GetRVA)(                      // S_OK or error.   
+            //     mdToken     tk,                     // Member for which to set offset   
+            //     ULONG       *pulCodeRVA,            // The offset   
+            //     DWORD       *pdwImplFlags) PURE;    // the implementation flags 
+            void GetRVA_();
+
+            // STDMETHOD(GetPermissionSetProps) (  
+            //     mdPermission pm,                    // [IN] the permission token.   
+            //     DWORD       *pdwAction,             // [OUT] CorDeclSecurity.   
+            //     void const  **ppvPermission,        // [OUT] permission blob.   
+            //     ULONG       *pcbPermission) PURE;   // [OUT] count of bytes of pvPermission.    
+            void GetPermissionSetProps_();
+
+            // STDMETHOD(GetSigFromToken)(             // S_OK or error.   
+            //     mdSignature mdSig,                  // [IN] Signature token.    
+            //     PCCOR_SIGNATURE *ppvSig,            // [OUT] return pointer to token.   
+            //     ULONG       *pcbSig) PURE;          // [OUT] return size of signature.  
+            void GetSigFromToken_();
+
+            // STDMETHOD(GetModuleRefProps)(           // S_OK or error.   
+            //     mdModuleRef mur,                    // [IN] moduleref token.    
+            //     LPWSTR      szName,                 // [OUT] buffer to fill with the moduleref name.    
+            //     ULONG       cchName,                // [IN] size of szName in wide characters.  
+            //     ULONG       *pchName) PURE;         // [OUT] actual count of characters in the name.    
+            void GetModuleRefProps_();
+
+            // STDMETHOD(EnumModuleRefs)(              // S_OK or error.   
+            //     HCORENUM    *phEnum,                // [IN|OUT] pointer to the enum.    
+            //     mdModuleRef rModuleRefs[],          // [OUT] put modulerefs here.   
+            //     ULONG       cmax,                   // [IN] max memberrefs to put.  
+            //     ULONG       *pcModuleRefs) PURE;    // [OUT] put # put here.    
+            void EnumModuleRefs_();
+
+            // STDMETHOD(GetTypeSpecFromToken)(        // S_OK or error.   
+            //     mdTypeSpec typespec,                // [IN] TypeSpec token.    
+            //     PCCOR_SIGNATURE *ppvSig,            // [OUT] return pointer to TypeSpec signature  
+            //     ULONG       *pcbSig) PURE;          // [OUT] return size of signature.  
+            void GetTypeSpecFromToken_();
+
+            // STDMETHOD(GetNameFromToken)(            // Not Recommended! May be removed!
+            //     mdToken     tk,                     // [IN] Token to get name from.  Must have a name.
+            //     MDUTF8CSTR  *pszUtf8NamePtr) PURE;  // [OUT] Return pointer to UTF8 name in heap.
+            void GetNameFromToken_();
+
+            // STDMETHOD(EnumUnresolvedMethods)(       // S_OK, S_FALSE, or error. 
+            //     HCORENUM    *phEnum,                // [IN|OUT] Pointer to the enum.    
+            //     mdToken     rMethods[],             // [OUT] Put MemberDefs here.   
+            //     ULONG       cMax,                   // [IN] Max MemberDefs to put.  
+            //     ULONG       *pcTokens) PURE;        // [OUT] Put # put here.
+            void EnumUnresolvedMethods_();
+
+            // STDMETHOD(GetUserString)(               // S_OK or error.
+            //     mdString    stk,                    // [IN] String token.
+            //     LPWSTR      szString,               // [OUT] Copy of string.
+            //     ULONG       cchString,              // [IN] Max chars of room in szString.
+            //     ULONG       *pchString) PURE;       // [OUT] How many chars in actual string.
+            void GetUserString_();
+
+            // STDMETHOD(GetPinvokeMap)(               // S_OK or error.
+            //     mdToken     tk,                     // [IN] FieldDef or MethodDef.
+            //     DWORD       *pdwMappingFlags,       // [OUT] Flags used for mapping.
+            //     LPWSTR      szImportName,           // [OUT] Import name.
+            //     ULONG       cchImportName,          // [IN] Size of the name buffer.
+            //     ULONG       *pchImportName,         // [OUT] Actual number of characters stored.
+            //     mdModuleRef *pmrImportDLL) PURE;    // [OUT] ModuleRef token for the target DLL.
+            void GetPinvokeMap_();
+
+            // STDMETHOD(EnumSignatures)(              // S_OK or error.
+            //     HCORENUM    *phEnum,                // [IN|OUT] pointer to the enum.    
+            //     mdSignature rSignatures[],          // [OUT] put signatures here.   
+            //     ULONG       cmax,                   // [IN] max signatures to put.  
+            //     ULONG       *pcSignatures) PURE;    // [OUT] put # put here.
+            void EnumSignatures_();
+
+            // STDMETHOD(EnumTypeSpecs)(               // S_OK or error.
+            //     HCORENUM    *phEnum,                // [IN|OUT] pointer to the enum.    
+            //     mdTypeSpec  rTypeSpecs[],           // [OUT] put TypeSpecs here.   
+            //     ULONG       cmax,                   // [IN] max TypeSpecs to put.  
+            //     ULONG       *pcTypeSpecs) PURE;     // [OUT] put # put here.
+            void EnumTypeSpecs_();
+
+            // STDMETHOD(EnumUserStrings)(             // S_OK or error.
+            //     HCORENUM    *phEnum,                // [IN/OUT] pointer to the enum.
+            //     mdString    rStrings[],             // [OUT] put Strings here.
+            //     ULONG       cmax,                   // [IN] max Strings to put.
+            //     ULONG       *pcStrings) PURE;       // [OUT] put # put here.
+            void EnumUserStrings_();
+
+            // STDMETHOD(GetParamForMethodIndex)(      // S_OK or error.
+            //     mdMethodDef md,                     // [IN] Method token.
+            //     ULONG       ulParamSeq,             // [IN] Parameter sequence.
+            //     mdParamDef  *ppd) PURE;             // [IN] Put Param token here.
+            void GetParamForMethodIndex_();
+
+            // STDMETHOD(EnumCustomAttributes)(        // S_OK or error.
+            //     HCORENUM    *phEnum,                // [IN, OUT] COR enumerator.
+            //     mdToken     tk,                     // [IN] Token to scope the enumeration, 0 for all.
+            //     mdToken     tkType,                 // [IN] Type of interest, 0 for all.
+            //     mdCustomAttribute rCustomAttributes[], // [OUT] Put custom attribute tokens here.
+            //     ULONG       cMax,                   // [IN] Size of rCustomAttributes.
+            //     ULONG       *pcCustomAttributes) PURE;  // [OUT, OPTIONAL] Put count of token values here.
+            void EnumCustomAttributes(
+                ref IntPtr phEnum,
+                int tkItem,
+                int tkType,
+                out int mdAttributeDef,
+                int cMax /* must be 1 */,
+                out int pcTokens);
+
+            // STDMETHOD(GetCustomAttributeProps)(     // S_OK or error.
+            //     mdCustomAttribute cv,               // [IN] CustomAttribute token.
+            //     mdToken     *ptkObj,                // [OUT, OPTIONAL] Put object token here.
+            //     mdToken     *ptkType,               // [OUT, OPTIONAL] Put AttrType token here.
+            //     void const  **ppBlob,               // [OUT, OPTIONAL] Put pointer to data here.
+            //     ULONG       *pcbSize) PURE;         // [OUT, OPTIONAL] Put size of date here.
+            void GetCustomAttributeProps(
+                int attributeToken,
+                [Out] out int tkObj,
+                [Out] out int tkType,
+                [Out] out IntPtr ppData,
+                [Out] out int pcbData);
+
+            // STDMETHOD(FindTypeRef)(   
+            //     mdToken     tkResolutionScope,      // [IN] ModuleRef, AssemblyRef or TypeRef.
+            //     LPCWSTR     szName,                 // [IN] TypeRef Name.
+            //     mdTypeRef   *ptr) PURE;             // [OUT] matching TypeRef.
+            void FindTypeRef_();
+
+            // STDMETHOD(GetMemberProps)(  
+            //     mdToken     mb,                     // The member for which to get props.   
+            //     mdTypeDef   *pClass,                // Put member's class here. 
+            //     LPWSTR      szMember,               // Put member's name here.  
+            //     ULONG       cchMember,              // Size of szMember buffer in wide chars.   
+            //     ULONG       *pchMember,             // Put actual size here 
+            //     DWORD       *pdwAttr,               // Put flags here.  
+            //     PCCOR_SIGNATURE *ppvSigBlob,        // [OUT] point to the blob value of meta data   
+            //     ULONG       *pcbSigBlob,            // [OUT] actual size of signature blob  
+            //     ULONG       *pulCodeRVA,            // [OUT] codeRVA    
+            //     DWORD       *pdwImplFlags,          // [OUT] Impl. Flags    
+            //     DWORD       *pdwCPlusTypeFlag,      // [OUT] flag for value type. selected ELEMENT_TYPE_*   
+            //     void const  **ppValue,              // [OUT] constant value 
+            //     ULONG       *pcchValue) PURE;       // [OUT] size of constant string in chars, 0 for non-strings.
+            void GetMemberProps_();
+
+            // STDMETHOD(GetFieldProps)(  
+            //     mdFieldDef  mb,                     // The field for which to get props.    
+            //     mdTypeDef   *pClass,                // Put field's class here.  
+            //     LPWSTR      szField,                // Put field's name here.   
+            //     ULONG       cchField,               // Size of szField buffer in wide chars.    
+            //     ULONG       *pchField,              // Put actual size here 
+            //     DWORD       *pdwAttr,               // Put flags here.  
+            //     PCCOR_SIGNATURE *ppvSigBlob,        // [OUT] point to the blob value of meta data   
+            //     ULONG       *pcbSigBlob,            // [OUT] actual size of signature blob  
+            //     DWORD       *pdwCPlusTypeFlag,      // [OUT] flag for value type. selected ELEMENT_TYPE_*   
+            //     void const  **ppValue,              // [OUT] constant value 
+            //     ULONG       *pcchValue) PURE;       // [OUT] size of constant string in chars, 0 for non-strings.
+            void GetFieldProps(
+                int fd,
+                [Out] out int tkTypeDef,
+                [Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder szField,
+                int cchField,
+                out int pchField,
+                out int pdwAttr,
+                out IntPtr ppvSigBlob,
+                out int pcbSigBlob,
+                out int pdwValueTypeFlag,
+                out IntPtr ppValue,
+                out int pcchValue);
+
+            // STDMETHOD(GetPropertyProps)(            // S_OK, S_FALSE, or error. 
+            //     mdProperty  prop,                   // [IN] property token  
+            //     mdTypeDef   *pClass,                // [OUT] typedef containing the property declarion. 
+            //     LPCWSTR     szProperty,             // [OUT] Property name  
+            //     ULONG       cchProperty,            // [IN] the count of wchar of szProperty    
+            //     ULONG       *pchProperty,           // [OUT] actual count of wchar for property name    
+            //     DWORD       *pdwPropFlags,          // [OUT] property flags.    
+            //     PCCOR_SIGNATURE *ppvSig,            // [OUT] property type. pointing to meta data internal blob 
+            //     ULONG       *pbSig,                 // [OUT] count of bytes in *ppvSig  
+            //     DWORD       *pdwCPlusTypeFlag,      // [OUT] flag for value type. selected ELEMENT_TYPE_*   
+            //     void const  **ppDefaultValue,       // [OUT] constant value 
+            //     ULONG       *pcchDefaultValue,      // [OUT] size of constant string in chars, 0 for non-strings.
+            //     mdMethodDef *pmdSetter,             // [OUT] setter method of the property  
+            //     mdMethodDef *pmdGetter,             // [OUT] getter method of the property  
+            //     mdMethodDef rmdOtherMethod[],       // [OUT] other method of the property   
+            //     ULONG       cMax,                   // [IN] size of rmdOtherMethod  
+            //     ULONG       *pcOtherMethod) PURE;   // [OUT] total number of other method of this property
+            void GetPropertyProps(
+                int pd,
+                [Out] out int pClass,
+                [Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder szProperty,
+                int cchProperty,
+                [Out] out int pchProperty,
+                [Out] out int pdwAttr,
+                [Out] out IntPtr ppvSigBlob,
+                [Out] out int pcbSigBlob,
+                [Out] out int pTypeFlag,
+                [Out] out IntPtr ppDefaultValue,
+                [Out] out int pcchDefaultValue,
+                [Out] out int pmdSetter,
+                [Out] out int pmdGetter,
+                [Out] out int pmdOtherMethod,
+                int cOtherMethod,
+                [Out] out int pcOtherMethod);
+
+            // STDMETHOD(GetParamProps)(               // S_OK or error.
+            //     mdParamDef  tk,                     // [IN]The Parameter.
+            //     mdMethodDef *pmd,                   // [OUT] Parent Method token.
+            //     ULONG       *pulSequence,           // [OUT] Parameter sequence.
+            //     LPWSTR      szName,                 // [OUT] Put name here.
+            //     ULONG       cchName,                // [OUT] Size of name buffer.
+            //     ULONG       *pchName,               // [OUT] Put actual size of name here.
+            //     DWORD       *pdwAttr,               // [OUT] Put flags here.
+            //     DWORD       *pdwCPlusTypeFlag,      // [OUT] Flag for value type. selected ELEMENT_TYPE_*.
+            //     void const  **ppValue,              // [OUT] Constant value.
+            //     ULONG       *pcchValue) PURE;       // [OUT] size of constant string in chars, 0 for non-strings.
+            void GetParamProps_();
+
+            // STDMETHOD(GetCustomAttributeByName)(    // S_OK or error.
+            //     mdToken     tkObj,                  // [IN] Object with Custom Attribute.
+            //     LPCWSTR     szName,                 // [IN] Name of desired Custom Attribute.
+            //     const void  **ppData,               // [OUT] Put pointer to data here.
+            //     ULONG       *pcbData) PURE;         // [OUT] Put size of data here.
+            void GetCustomAttributeByName(
+                int tkItem,
+                [MarshalAs(UnmanagedType.LPWStr)] string szName,
+                [Out] out IntPtr ppData,
+                [Out] out int pcbData);
+
+            // STDMETHOD_(BOOL, IsValidToken)(         // True or False.
+            //     mdToken     tk) PURE;               // [IN] Given token.
+            [PreserveSig]
+            bool IsValidToken([MarshalAs(UnmanagedType.U4)] int tk);
+
+            // STDMETHOD(GetNestedClassProps)(         // S_OK or error.
+            //     mdTypeDef   tdNestedClass,          // [IN] NestedClass token.
+            //     mdTypeDef   *ptdEnclosingClass) PURE; // [OUT] EnclosingClass token.
+            void GetNestedClassProps_();
+
+            // STDMETHOD(GetNativeCallConvFromSig)(    // S_OK or error.
+            //     void const  *pvSig,                 // [IN] Pointer to signature.
+            //     ULONG       cbSig,                  // [IN] Count of signature bytes.
+            //     ULONG       *pCallConv) PURE;       // [OUT] Put calling conv here (see CorPinvokemap).
+            void GetNativeCallConvFromSig_();
+
+            // STDMETHOD(IsGlobal)(                    // S_OK or error.
+            //     mdToken     pd,                     // [IN] Type, Field, or Method token.
+            //     int         *pbGlobal) PURE;        // [OUT] Put 1 if global, 0 otherwise.
+            void IsGlobal_();
+        }
+
+        [
+        ComImport,
+        Guid("EE62470B-E94B-424e-9B7C-2F00C9249F93"),
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown)
+        ]
+        public interface IMetadataAssemblyImport {
+
+            [PreserveSig]
+            int GetAssemblyProps(
+                UInt32 mdAsm,
+                out IntPtr pPublicKeyPtr,
+                out UInt32 ucbPublicKeyPtr,
+                out UInt32 uHashAlg,
+                [MarshalAs(UnmanagedType.LPArray)] char[] strName,
+                UInt32 cchNameIn,
+                out UInt32 cchNameRequired,
+                IntPtr amdInfo,
+                out UInt32 dwFlags
+                );
+
+            [PreserveSig]
+            int GetAssemblyRefProps(
+                UInt32 mdAsmRef,
+                out IntPtr ppbPublicKeyOrToken,
+                out UInt32 pcbPublicKeyOrToken,
+                [MarshalAs(UnmanagedType.LPArray)] char[] strName,
+                UInt32 cchNameIn,
+                out UInt32 pchNameOut,
+                IntPtr amdInfo,
+                out IntPtr ppbHashValue,
+                out UInt32 pcbHashValue,
+                out UInt32 pdwAssemblyRefFlags
+                );
+
+            [PreserveSig]
+            int GetFileProps(
+                [In] UInt32 mdFile,
+                [MarshalAs(UnmanagedType.LPArray)] char[] strName,
+                UInt32 cchName,
+                out UInt32 cchNameRequired,
+                out IntPtr bHashData,
+                out UInt32 cchHashBytes,
+                out UInt32 dwFileFlags
+                );
+
+            [PreserveSig]
+            int GetExportedTypeProps();
+
+            [PreserveSig]
+            int GetManifestResourceProps();
+
+            [PreserveSig]
+            int EnumAssemblyRefs(
+                [In, Out] ref IntPtr phEnum,
+                [MarshalAs(UnmanagedType.LPArray), Out] UInt32[] asmRefs,
+                System.UInt32 asmRefCount,
+                out System.UInt32 iFetched
+            );
+
+            [PreserveSig]
+            int EnumFiles(
+                [In, Out] ref IntPtr phEnum,
+                [MarshalAs(UnmanagedType.LPArray), Out] UInt32[] fileRefs,
+                System.UInt32 fileRefCount,
+                out System.UInt32 iFetched
+                );
+
+            [PreserveSig]
+            void EnumExportedTypes();
+
+            [PreserveSig]
+            int EnumManifestResources();
+
+            [PreserveSig]
+            int GetAssemblyFromScope(out int mdAsm);
+
+            [PreserveSig]
+            int FindExportedTypeByName();
+
+            [PreserveSig]
+            int FindManifestResourceByName();
+
+            // PreserveSig because this method is an exception that 
+            // actually returns void, not HRESULT.
+            [PreserveSig]
+            void CloseEnum([In] IntPtr phEnum);
+
+            [PreserveSig]
+            int FindAssembliesByName();
+        }
+    }
+}
diff --git a/src/Core/Compiler/Importer/MetadataHelpers.cs b/src/Core/Compiler/Importer/MetadataHelpers.cs
new file mode 100644
index 000000000..d4e6d8c96
--- /dev/null
+++ b/src/Core/Compiler/Importer/MetadataHelpers.cs
@@ -0,0 +1,162 @@
+// MetadataHelpers.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Reflection;
+using ScriptSharp.Importer.IL;
+using ScriptSharp.ScriptModel;
+using ICustomAttributeProvider = ScriptSharp.Importer.IL.ICustomAttributeProvider;
+
+namespace ScriptSharp.Importer {
+
+    internal static class MetadataHelpers {
+
+        private static CustomAttribute GetAttribute(ICustomAttributeProvider attributeProvider, string attributeTypeName) {
+            foreach (CustomAttribute attribute in attributeProvider.CustomAttributes) {
+                if (String.CompareOrdinal(attribute.Constructor.DeclaringType.FullName, attributeTypeName) == 0) {
+                    return attribute;
+                }
+            }
+
+            return null;
+        }
+
+        private static string GetAttributeArgument(CustomAttribute attribute) {
+            return attribute.ConstructorArguments[0].Value as string;
+        }
+
+        public static string GetScriptAlias(ICustomAttributeProvider attributeProvider) {
+            CustomAttribute scriptAliasAttribute = GetAttribute(attributeProvider, "System.Runtime.CompilerServices.ScriptAliasAttribute");
+            if (scriptAliasAttribute != null) {
+                return GetAttributeArgument(scriptAliasAttribute);
+            }
+
+            return null;
+        }
+
+        public static string GetScriptAssemblyName(ICustomAttributeProvider attributeProvider) {
+            CustomAttribute scriptAssemblyAttribute = GetAttribute(attributeProvider, "System.Runtime.CompilerServices.ScriptAssemblyAttribute");
+            if (scriptAssemblyAttribute != null) {
+                return GetAttributeArgument(scriptAssemblyAttribute);
+            }
+
+            return null;
+        }
+
+        public static string GetScriptName(ICustomAttributeProvider attributeProvider) {
+            CustomAttribute scriptAssemblyAttribute = GetAttribute(attributeProvider, "System.Runtime.CompilerServices.ScriptNameAttribute");
+            if (scriptAssemblyAttribute != null) {
+                return GetAttributeArgument(scriptAssemblyAttribute);
+            }
+
+            return null;
+        }
+
+        public static string GetScriptNamespace(ICustomAttributeProvider attributeProvider) {
+            CustomAttribute scriptNamespaceAttribute = GetAttribute(attributeProvider, "System.Runtime.CompilerServices.ScriptNamespaceAttribute");
+            if (scriptNamespaceAttribute != null) {
+                return GetAttributeArgument(scriptNamespaceAttribute);
+            }
+
+            return null;
+        }
+
+        public static bool IsCompilerGeneratedType(TypeDefinition type) {
+            return GetAttribute(type, "System.Runtime.CompilerServices.CompilerGeneratedAttribute") != null;
+        }
+
+        public static bool IsDelegate(TypeDefinition type) {
+            TypeReference baseType = type.BaseType;
+            if (baseType == null) {
+                return false;
+            }
+
+            string baseTypeName = type.BaseType.FullName;
+
+            return (String.CompareOrdinal(baseTypeName, "System.MulticastDelegate") == 0) ||
+                   (String.CompareOrdinal(baseTypeName, "System.Delegate") == 0);
+        }
+
+        public static bool IsEnum(TypeDefinition type) {
+            TypeReference baseType = type.BaseType;
+            if (baseType == null) {
+                return false;
+            }
+
+            return (String.CompareOrdinal(type.BaseType.FullName, "System.Enum") == 0);
+        }
+
+        public static bool ShouldGlobalizeMembers(TypeDefinition type, out string mixinRoot) {
+            mixinRoot = null;
+
+            CustomAttribute globalMethodsAttribute = GetAttribute(type, "System.Runtime.CompilerServices.GlobalMethodsAttribute");
+            if (globalMethodsAttribute != null) {
+                return true;
+            }
+
+            CustomAttribute mixinAttribute = GetAttribute(type, "System.Runtime.CompilerServices.MixinAttribute");
+            if (mixinAttribute != null) {
+                mixinRoot = GetAttributeArgument(mixinAttribute);
+            }
+
+            return false;
+        }
+
+        public static bool ShouldIgnoreNamespace(TypeDefinition type) {
+            return GetAttribute(type, "System.Runtime.CompilerServices.IgnoreNamespaceAttribute") != null;
+        }
+
+        public static bool ShouldImportScriptCoreType(TypeDefinition type) {
+            return GetAttribute(type, "System.Runtime.CompilerServices.NonScriptableAttribute") == null;
+        }
+
+        public static bool ShouldPreserveCase(ICustomAttributeProvider attributeProvider) {
+            return GetAttribute(attributeProvider, "System.Runtime.CompilerServices.PreserveCaseAttribute") != null;
+        }
+
+        public static bool ShouldSkipFromScript(ICustomAttributeProvider attributeProvider) {
+            return GetAttribute(attributeProvider, "System.Runtime.CompilerServices.ScriptSkipAttribute") != null;
+        }
+
+        public static bool ShouldTreatAsIntrinsicProperty(PropertyDefinition property) {
+            return GetAttribute(property, "System.Runtime.CompilerServices.IntrinsicPropertyAttribute") != null;
+        }
+
+        public static bool ShouldTreatAsConditionalMethod(MethodDefinition method, out ICollection<string> conditions) {
+            conditions = null;
+
+            foreach (CustomAttribute attribute in method.CustomAttributes) {
+                string typeName = attribute.Constructor.DeclaringType.FullName;
+                if (String.CompareOrdinal(typeName, "System.Diagnostics.ConditionalAttribute") == 0) {
+                    if (conditions == null) {
+                        conditions = new List<string>();
+                    }
+
+                    conditions.Add(GetAttributeArgument(attribute));
+                }
+            }
+            
+            return (conditions != null);
+        }
+
+        public static bool ShouldTreatAsRecordType(TypeDefinition type) {
+            if ((type.BaseType != null) &&
+                (String.CompareOrdinal(type.BaseType.FullName, "System.Record") == 0)) {
+                return true;
+            }
+
+            return false;
+        }
+
+        public static bool ShouldUseEnumNames(TypeDefinition type) {
+            return GetAttribute(type, "System.Runtime.CompilerServices.NamedValuesAttribute") != null;
+        }
+
+        public static bool ShouldUseEnumValues(TypeDefinition type) {
+            return GetAttribute(type, "System.Runtime.CompilerServices.NumericValuesAttribute") != null;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Importer/MetadataImporter.cs b/src/Core/Compiler/Importer/MetadataImporter.cs
new file mode 100644
index 000000000..f631ac90c
--- /dev/null
+++ b/src/Core/Compiler/Importer/MetadataImporter.cs
@@ -0,0 +1,849 @@
+// MetadataImporter.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Runtime.InteropServices;
+using System.Text;
+using ScriptSharp;
+using ScriptSharp.Importer.IL;
+using ScriptSharp.ScriptModel;
+using ICustomAttributeProvider = ScriptSharp.Importer.IL.ICustomAttributeProvider;
+
+namespace ScriptSharp.Importer {
+
+    internal sealed class MetadataImporter {
+
+        private SymbolSet _symbols;
+        private CompilerOptions _options;
+        private IErrorHandler _errorHandler;
+
+        private List<TypeSymbol> _importedTypes;
+        private bool _resolveError;
+
+        public MetadataImporter(CompilerOptions options, IErrorHandler errorHandler) {
+            Debug.Assert(options != null);
+            Debug.Assert(errorHandler != null);
+
+            _options = options;
+            _errorHandler = errorHandler;
+        }
+
+#if STATIC_ARRAY_EXTENSIONS
+        private void ConvertInstanceMembersToStaticMembers() {
+            // Mark the following members on Array, ArrayList, Queue and Stack
+            // as generated static, as they aren't implemented as instance/prototype
+            // members at runtime.
+
+            string[] members = new string[] {
+                "Add", "AddRange", "Aggregate", "Clear", "Clone", "Contains",
+                "Dequeue", "Enqueue", "Every", "Extract", "Filter", "ForEach",
+                "GetEnumerator", "GroupBy", "Index", "IndexOf", "Insert", "InsertRange",
+                "Map", "Peek", "Remove", "RemoveAt", "RemoveRange", "Some"
+            };
+
+            foreach (TypeSymbol typeSymbol in _importedTypes) {
+                if ((typeSymbol.Type == SymbolType.Class) &&
+                    (typeSymbol.Name.Equals("Array", StringComparison.Ordinal) ||
+                     typeSymbol.Name.Equals("ArrayList", StringComparison.Ordinal) ||
+                     typeSymbol.Name.Equals("ArrayGrouping", StringComparison.Ordinal) ||
+                     typeSymbol.Name.Equals("Queue", StringComparison.Ordinal) ||
+                     typeSymbol.Name.Equals("Stack", StringComparison.Ordinal))) {
+
+                    foreach (string memberName in members) {
+                        MethodSymbol methodSymbol = typeSymbol.GetMember(memberName) as MethodSymbol;
+                        if ((methodSymbol != null) && ((methodSymbol.Visibility & MemberVisibility.Static) == 0)) {
+                            methodSymbol.GenerateAsStaticMethod();
+                        }
+                    }
+                }
+            }
+        }
+#endif // STATIC_ARRAY_EXTENSIONS
+
+        private ICollection<TypeSymbol> ImportAssemblies(MetadataSource mdSource) {
+            _importedTypes = new List<TypeSymbol>();
+
+            ImportScriptAssembly(mdSource, mdSource.CoreAssemblyPath, /* coreAssembly */ true);
+
+            foreach (TypeSymbol typeSymbol in _importedTypes) {
+                if ((typeSymbol.Type == SymbolType.Class) &&
+                    (typeSymbol.Name.Equals("Array", StringComparison.Ordinal))) {
+                    // Array is special - it is used to build other Arrays of more
+                    // specific types we load members for in the second pass...
+                    ImportMembers(typeSymbol);
+                }
+            }
+
+            foreach (TypeSymbol typeSymbol in _importedTypes) {
+                if (typeSymbol.IsGeneric) {
+                    // Generics are also special - they are used to build other generic instances
+                    // with specific types for generic arguments as we load members for other
+                    // types subsequently...
+                    ImportMembers(typeSymbol);
+                }
+            }
+
+            foreach (TypeSymbol typeSymbol in _importedTypes) {
+                if ((typeSymbol.IsGeneric == false) &&
+                    ((typeSymbol.Type != SymbolType.Class) ||
+                     (typeSymbol.Name.Equals("Array", StringComparison.Ordinal) == false))) {
+                    ImportMembers(typeSymbol);
+                }
+
+                // There is some special-case logic to be performed on some members of the
+                // global namespace.
+
+                if (typeSymbol.Type == SymbolType.Class) {
+                    if (typeSymbol.Name.Equals("Script", StringComparison.Ordinal)) {
+                        // The Script class contains additional pseudo global methods that cannot
+                        // be referenced at compile-time by the app author, but can be
+                        // referenced by generated code during compilation.
+                        ImportPseudoMembers(PseudoClassMembers.Script, (ClassSymbol)typeSymbol);
+                    }
+                    else if (typeSymbol.Name.Equals("Object", StringComparison.Ordinal)) {
+                        // We need to add a static GetType method
+
+                        ImportPseudoMembers(PseudoClassMembers.Object, (ClassSymbol)typeSymbol);
+                    }
+                    else if (typeSymbol.Name.Equals("Type", StringComparison.Ordinal)) {
+                        ImportPseudoMembers(PseudoClassMembers.Type, (ClassSymbol)typeSymbol);
+                    }
+                    else if (typeSymbol.Name.Equals("Dictionary", StringComparison.Ordinal)) {
+                        // The Dictionary class contains static methods at runtime, rather
+                        // than instance methods.
+
+                        ImportPseudoMembers(PseudoClassMembers.Dictionary, (ClassSymbol)typeSymbol);
+                    }
+                    else if (typeSymbol.Name.Equals("Arguments", StringComparison.Ordinal)) {
+                        // We need to add a static indexer, which isn't allowed in C#
+
+                        ImportPseudoMembers(PseudoClassMembers.Arguments, (ClassSymbol)typeSymbol);
+                    }
+                    else if (typeSymbol.Name.Equals("String", StringComparison.Ordinal)) {
+                        // We need to change generated names on Replace methods
+
+                        ImportPseudoMembers(PseudoClassMembers.String, (ClassSymbol)typeSymbol);
+                    }
+                }
+            }
+
+            // Import all the types first.
+            // Types need to be loaded upfront so that they can be used in resolving types associated
+            // with members.
+            foreach (string assemblyPath in mdSource.Assemblies) {
+                ImportScriptAssembly(mdSource, assemblyPath, /* coreAssembly */ false);
+            }
+
+            // Resolve Base Types
+            foreach (TypeSymbol typeSymbol in _importedTypes) {
+                if (typeSymbol.Type == SymbolType.Class) {
+                    ImportBaseType((ClassSymbol)typeSymbol);
+                }
+            }
+
+            // Import members
+            foreach (TypeSymbol typeSymbol in _importedTypes) {
+                if (typeSymbol.IsCoreType) {
+                    // already processed above
+                    continue;
+                }
+
+                ImportMembers(typeSymbol);
+            }
+
+            return _importedTypes;
+        }
+
+        private void ImportBaseType(ClassSymbol classSymbol) {
+            TypeDefinition type = (TypeDefinition)classSymbol.MetadataReference;
+            TypeReference baseType = type.BaseType;
+
+            if (baseType != null) {
+                ClassSymbol baseClassSymbol = ResolveType(baseType) as ClassSymbol;
+                if ((baseClassSymbol != null) &&
+                    (String.CompareOrdinal(baseClassSymbol.FullName, "Object") != 0)) {
+                    classSymbol.SetInheritance(baseClassSymbol, /* interfaces */ null);
+                }
+            }
+        }
+
+        private void ImportDelegateInvoke(TypeSymbol delegateTypeSymbol) {
+            TypeDefinition type = (TypeDefinition)delegateTypeSymbol.MetadataReference;
+
+            foreach (MethodDefinition method in type.Methods) {
+                if (String.CompareOrdinal(method.Name, "Invoke") != 0) {
+                    continue;
+                }
+
+                TypeSymbol returnType = ResolveType(method.MethodReturnType.ReturnType);
+                Debug.Assert(returnType != null);
+                if (returnType == null) {
+                    continue;
+                }
+
+                MethodSymbol methodSymbol = new MethodSymbol("Invoke", delegateTypeSymbol, returnType, MemberVisibility.Public);
+                methodSymbol.SetImplementationState(SymbolImplementationFlags.Abstract);
+                methodSymbol.SetTransformedName(String.Empty);
+
+                delegateTypeSymbol.AddMember(methodSymbol);
+            }
+        }
+
+        private void ImportEnumFields(TypeSymbol enumTypeSymbol) {
+            TypeDefinition type = (TypeDefinition)enumTypeSymbol.MetadataReference;
+
+            foreach (FieldDefinition field in type.Fields) {
+                if (field.IsSpecialName) {
+                    continue;
+                }
+
+                Debug.Assert(enumTypeSymbol is EnumerationSymbol);
+                EnumerationSymbol enumSymbol = (EnumerationSymbol)enumTypeSymbol;
+
+                TypeSymbol fieldType;
+                if (enumSymbol.UseNamedValues) {
+                    fieldType = _symbols.ResolveIntrinsicType(IntrinsicType.String);
+                }
+                else {
+                    fieldType = _symbols.ResolveIntrinsicType(IntrinsicType.Integer);
+                }
+
+                string fieldName = field.Name;
+                int fieldValue = (int)field.Constant;
+
+                EnumerationFieldSymbol fieldSymbol =
+                    new EnumerationFieldSymbol(fieldName, enumTypeSymbol, fieldValue, fieldType);
+                ImportMemberDetails(fieldSymbol, null, field);
+
+                enumTypeSymbol.AddMember(fieldSymbol);
+            }
+        }
+
+        private void ImportEvents(TypeSymbol typeSymbol) {
+            TypeDefinition type = (TypeDefinition)typeSymbol.MetadataReference;
+
+            foreach (EventDefinition eventDef in type.Events) {
+                if (eventDef.IsSpecialName) {
+                    continue;
+                }
+                if ((eventDef.AddMethod == null) || (eventDef.RemoveMethod == null)) {
+                    continue;
+                }
+                if (eventDef.AddMethod.IsPrivate || eventDef.AddMethod.IsAssembly || eventDef.AddMethod.IsFamilyAndAssembly) {
+                    continue;
+                }
+
+                string eventName = eventDef.Name;
+
+                TypeSymbol eventHandlerType = ResolveType(eventDef.EventType);
+                if (eventHandlerType == null) {
+                    continue;
+                }
+
+                EventSymbol eventSymbol = new EventSymbol(eventName, typeSymbol, eventHandlerType);
+                ImportMemberDetails(eventSymbol, eventDef.AddMethod, eventDef);
+
+                typeSymbol.AddMember(eventSymbol);
+            }
+        }
+
+        private void ImportFields(TypeSymbol typeSymbol) {
+            TypeDefinition type = (TypeDefinition)typeSymbol.MetadataReference;
+
+            foreach (FieldDefinition field in type.Fields) {
+                if (field.IsSpecialName) {
+                    continue;
+                }
+                if (field.IsPrivate || field.IsAssembly || field.IsFamilyAndAssembly) {
+                    continue;
+                }
+
+                string fieldName = field.Name;
+
+                TypeSymbol fieldType = ResolveType(field.FieldType);
+                if (fieldType == null) {
+                    continue;
+                }
+
+                MemberVisibility visibility = MemberVisibility.PrivateInstance;
+                if (field.IsStatic) {
+                    visibility |= MemberVisibility.Static;
+                }
+                if (field.IsPublic) {
+                    visibility |= MemberVisibility.Public;
+                }
+                else if (field.IsFamily || field.IsFamilyOrAssembly) {
+                    visibility |= MemberVisibility.Protected;
+                }
+
+                FieldSymbol fieldSymbol = new FieldSymbol(fieldName, typeSymbol, fieldType);
+
+                fieldSymbol.SetVisibility(visibility);
+                ImportMemberDetails(fieldSymbol, null, field);
+
+                typeSymbol.AddMember(fieldSymbol);
+            }
+        }
+
+        private void ImportMemberDetails(MemberSymbol memberSymbol, MethodDefinition methodDefinition, ICustomAttributeProvider attributeProvider) {
+            if (methodDefinition != null) {
+                MemberVisibility visibility = MemberVisibility.PrivateInstance;
+                if (methodDefinition.IsStatic) {
+                    visibility |= MemberVisibility.Static;
+                }
+                if (methodDefinition.IsPublic) {
+                    visibility |= MemberVisibility.Public;
+                }
+                else if (methodDefinition.IsFamily || methodDefinition.IsFamilyOrAssembly) {
+                    visibility |= MemberVisibility.Protected;
+                }
+
+                memberSymbol.SetVisibility(visibility);
+            }
+
+            memberSymbol.SetNameCasing(MetadataHelpers.ShouldPreserveCase(attributeProvider));
+
+            string scriptName = MetadataHelpers.GetScriptName(attributeProvider);
+            if (scriptName != null) {
+                memberSymbol.SetTransformedName(scriptName);
+            }
+        }
+
+        private void ImportMembers(TypeSymbol typeSymbol) {
+            switch (typeSymbol.Type) {
+                case SymbolType.Class:
+                case SymbolType.Interface:
+                case SymbolType.Record:
+                    if (typeSymbol.Type != SymbolType.Interface) {
+                        ImportFields(typeSymbol);
+                    }
+                    ImportProperties(typeSymbol);
+                    ImportMethods(typeSymbol);
+                    ImportEvents(typeSymbol);
+                    break;
+                case SymbolType.Enumeration:
+                    ImportEnumFields(typeSymbol);
+                    break;
+                case SymbolType.Delegate:
+                    ImportDelegateInvoke(typeSymbol);
+                    break;
+                default:
+                    Debug.Fail("Unknown symbol type.");
+                    break;
+            }
+        }
+
+        public ICollection<TypeSymbol> ImportMetadata(ICollection<string> references, SymbolSet symbols) {
+            Debug.Assert(references != null);
+            Debug.Assert(symbols != null);
+
+            _symbols = symbols;
+
+            MetadataSource mdSource = new MetadataSource();
+            bool hasLoadErrors = mdSource.LoadReferences(references, _errorHandler);
+
+            ICollection<TypeSymbol> importedTypes = null;
+            if (hasLoadErrors == false) {
+                importedTypes = ImportAssemblies(mdSource);
+            }
+
+            if (_resolveError) {
+                return null;
+            }
+
+#if STATIC_ARRAY_EXTENSIONS
+                // Update instance members that need to be generated as static methods
+                ConvertInstanceMembersToStaticMembers();
+#endif // STATIC_ARRAY_EXTENSIONS
+
+            return importedTypes;
+        }
+
+        private void ImportMethods(TypeSymbol typeSymbol) {
+            // NOTE: We do not import parameters for imported members.
+            //       Parameters are used in the script model generation phase to populate
+            //       symbol tables, which is not done for imported methods.
+
+            TypeDefinition type = (TypeDefinition)typeSymbol.MetadataReference;
+
+            foreach (MethodDefinition method in type.Methods) {
+                if (method.IsSpecialName) {
+                    continue;
+                }
+                if (method.IsPrivate || method.IsAssembly || method.IsFamilyAndAssembly) {
+                    continue;
+                }
+
+                string methodName = method.Name;
+                if (typeSymbol.GetMember(methodName) != null) {
+                    // Ignore if its an overload since we don't care about parameters
+                    // for imported methods, overloaded ctors don't matter.
+                    // We just care about return values pretty much, and existence of the
+                    // method.
+                    continue;
+                }
+
+                TypeSymbol returnType = ResolveType(method.MethodReturnType.ReturnType);
+                if (returnType == null) {
+                    continue;
+                }
+
+                MethodSymbol methodSymbol = new MethodSymbol(methodName, typeSymbol, returnType);
+                ImportMemberDetails(methodSymbol, method, method);
+
+                if (method.HasGenericParameters) {
+                    List<GenericParameterSymbol> genericArguments = new List<GenericParameterSymbol>();
+                    foreach (GenericParameter genericParameter in method.GenericParameters) {
+                        GenericParameterSymbol arg =
+                            new GenericParameterSymbol(genericParameter.Position, genericParameter.Name,
+                                                      /* typeArgument */ false,
+                                                      _symbols.GlobalNamespace);
+                        genericArguments.Add(arg);
+                    }
+
+                    methodSymbol.AddGenericArguments(genericArguments);
+                }
+
+                if (method.IsAbstract) {
+                    // NOTE: We're ignoring the override scenario - it doesn't matter in terms
+                    //       of the compilation and code generation
+                    methodSymbol.SetImplementationState(SymbolImplementationFlags.Abstract);
+                }
+
+                if (MetadataHelpers.ShouldSkipFromScript(method)) {
+                    methodSymbol.SetSkipGeneration();
+                }
+
+                if ((methodSymbol.Visibility & MemberVisibility.Static) != 0) {
+                    string alias = MetadataHelpers.GetScriptAlias(method);
+                    if (String.IsNullOrEmpty(alias) == false) {
+                        methodSymbol.SetAlias(alias);
+                    }
+                }
+
+                ICollection<string> conditions;
+                if (MetadataHelpers.ShouldTreatAsConditionalMethod(method, out conditions)) {
+                    methodSymbol.SetConditions(conditions);
+                }
+
+                typeSymbol.AddMember(methodSymbol);
+            }
+        }
+
+        private void ImportProperties(TypeSymbol typeSymbol) {
+            TypeDefinition type = (TypeDefinition)typeSymbol.MetadataReference;
+
+            foreach (PropertyDefinition property in type.Properties) {
+                if (property.IsSpecialName) {
+                    continue;
+                }
+                if (property.GetMethod == null) {
+                    continue;
+                }
+                if (property.GetMethod.IsPrivate || property.GetMethod.IsAssembly || property.GetMethod.IsFamilyAndAssembly) {
+                    continue;
+                }
+
+                string propertyName = property.Name;
+                bool preserveCase = MetadataHelpers.ShouldPreserveCase(property);
+                bool intrinsicProperty = MetadataHelpers.ShouldTreatAsIntrinsicProperty(property);
+
+                TypeSymbol propertyType = ResolveType(property.PropertyType);
+                if (propertyType == null) {
+                    continue;
+                }
+
+                PropertySymbol propertySymbol = null;
+                if (property.Parameters.Count != 0) {
+                    IndexerSymbol indexerSymbol = new IndexerSymbol(typeSymbol, propertyType);
+                    ImportMemberDetails(indexerSymbol, property.GetMethod, property);
+
+                    if (intrinsicProperty) {
+                        indexerSymbol.SetIntrinsic();
+                    }
+
+                    propertySymbol = indexerSymbol;
+                    propertySymbol.SetNameCasing(preserveCase);
+                }
+                else {
+                    if (intrinsicProperty) {
+                        // Properties marked with this attribute are to be thought of as
+                        // fields. If they are read-only, the C# compiler will enforce that,
+                        // so we don't have to worry about making them read-write via a field
+                        // instead of a property
+
+                        FieldSymbol fieldSymbol = new FieldSymbol(propertyName, typeSymbol, propertyType);
+                        ImportMemberDetails(fieldSymbol, property.GetMethod, property);
+
+                        string alias = MetadataHelpers.GetScriptAlias(property);
+                        if (String.IsNullOrEmpty(alias) == false) {
+                            fieldSymbol.SetAlias(alias);
+                        }
+
+                        typeSymbol.AddMember(fieldSymbol);
+                    }
+                    else {
+                        propertySymbol = new PropertySymbol(propertyName, typeSymbol, propertyType);
+                        ImportMemberDetails(propertySymbol, property.GetMethod, property);
+                    }
+                }
+
+                if (propertySymbol != null) {
+                    SymbolImplementationFlags implFlags = SymbolImplementationFlags.Regular;
+                    if (property.SetMethod == null) {
+                        implFlags |= SymbolImplementationFlags.ReadOnly;
+                    }
+                    if (property.GetMethod.IsAbstract) {
+                        implFlags |= SymbolImplementationFlags.Abstract;
+                    }
+                    propertySymbol.SetImplementationState(implFlags);
+
+                    typeSymbol.AddMember(propertySymbol);
+                }
+            }
+        }
+
+        private void ImportPseudoMembers(PseudoClassMembers memberSet, ClassSymbol classSymbol) {
+            // Import pseudo members that go on the class but aren't defined in mscorlib.dll
+            // These are meant to be used by internal compiler-generated transformations etc.
+            // and aren't meant to be referenced directly in C# code.
+
+            if (memberSet == PseudoClassMembers.Script) {
+                TypeSymbol boolType = (TypeSymbol)((ISymbolTable)_symbols.SystemNamespace).FindSymbol("Boolean", null, SymbolFilter.Types);
+                Debug.Assert(boolType != null);
+
+                TypeSymbol intType = (TypeSymbol)((ISymbolTable)_symbols.SystemNamespace).FindSymbol("Int32", null, SymbolFilter.Types);
+                Debug.Assert(intType != null);
+
+                TypeSymbol floatType = (TypeSymbol)((ISymbolTable)_symbols.SystemNamespace).FindSymbol("Single", null, SymbolFilter.Types);
+                Debug.Assert(floatType != null);
+
+                TypeSymbol stringType = (TypeSymbol)((ISymbolTable)_symbols.SystemNamespace).FindSymbol("String", null, SymbolFilter.Types);
+                Debug.Assert(stringType != null);
+
+                // Define the Escape, Unescape, encodeURI, decodeURI, encodeURIComponent, decodeURIComponent methods
+                MethodSymbol escapeMethod = new MethodSymbol("Escape", classSymbol, stringType, MemberVisibility.Public | MemberVisibility.Static);
+                classSymbol.AddMember(escapeMethod);
+
+                MethodSymbol unescapeMethod = new MethodSymbol("Unescape", classSymbol, stringType, MemberVisibility.Public | MemberVisibility.Static);
+                classSymbol.AddMember(unescapeMethod);
+
+                MethodSymbol encodeURIMethod = new MethodSymbol("EncodeUri", classSymbol, stringType, MemberVisibility.Public | MemberVisibility.Static);
+                encodeURIMethod.SetTransformedName("encodeURI");
+                classSymbol.AddMember(encodeURIMethod);
+
+                MethodSymbol decodeURIMethod = new MethodSymbol("DecodeUri", classSymbol, stringType, MemberVisibility.Public | MemberVisibility.Static);
+                decodeURIMethod.SetTransformedName("decodeURI");
+                classSymbol.AddMember(decodeURIMethod);
+
+                MethodSymbol encodeURIComponentMethod = new MethodSymbol("EncodeUriComponent", classSymbol, stringType, MemberVisibility.Public | MemberVisibility.Static);
+                encodeURIComponentMethod.SetTransformedName("encodeURIComponent");
+                classSymbol.AddMember(encodeURIComponentMethod);
+
+                MethodSymbol decodeURIComponentMethod = new MethodSymbol("DecodeUriComponent", classSymbol, stringType, MemberVisibility.Public | MemberVisibility.Static);
+                decodeURIComponentMethod.SetTransformedName("decodeURIComponent");
+                classSymbol.AddMember(decodeURIComponentMethod);
+
+                return;
+            }
+
+            if (memberSet == PseudoClassMembers.Arguments) {
+                TypeSymbol objectType = (TypeSymbol)((ISymbolTable)_symbols.SystemNamespace).FindSymbol("Object", null, SymbolFilter.Types);
+                Debug.Assert(objectType != null);
+
+                IndexerSymbol indexer = new IndexerSymbol(classSymbol, objectType, MemberVisibility.Public | MemberVisibility.Static);
+                indexer.SetIntrinsic();
+                classSymbol.AddMember(indexer);
+
+                return;
+            }
+
+            if (memberSet == PseudoClassMembers.Type) {
+                // Define the Type.GetInstanceType static method which provides the functionality of
+                // Object.GetType instance method. We don't extend Object.prototype in script to add
+                // GetType, since we want to keep Object's protoype clean of any extensions.
+                //
+                // We create this symbol here, so that later the ExpressionBuilder can transform
+                // calls to Object.GetType to this.
+                TypeSymbol objectType = (TypeSymbol)((ISymbolTable)_symbols.SystemNamespace).FindSymbol("Object", null, SymbolFilter.Types);
+                Debug.Assert(objectType != null);
+
+                TypeSymbol typeType = (TypeSymbol)((ISymbolTable)_symbols.SystemNamespace).FindSymbol("Type", null, SymbolFilter.Types);
+                Debug.Assert(objectType != null);
+
+                MethodSymbol getTypeMethod = new MethodSymbol("GetInstanceType", classSymbol, typeType, MemberVisibility.Public | MemberVisibility.Static);
+                getTypeMethod.AddParameter(new ParameterSymbol("instance", getTypeMethod, objectType, ParameterMode.In));
+                classSymbol.AddMember(getTypeMethod);
+
+                return;
+            }
+
+            if (memberSet == PseudoClassMembers.Dictionary) {
+                TypeSymbol intType = (TypeSymbol)((ISymbolTable)_symbols.SystemNamespace).FindSymbol("Int32", null, SymbolFilter.Types);
+                Debug.Assert(intType != null);
+
+                TypeSymbol boolType = (TypeSymbol)((ISymbolTable)_symbols.SystemNamespace).FindSymbol("Boolean", null, SymbolFilter.Types);
+                Debug.Assert(boolType != null);
+
+                TypeSymbol voidType = (TypeSymbol)((ISymbolTable)_symbols.SystemNamespace).FindSymbol("Void", null, SymbolFilter.Types);
+                Debug.Assert(boolType != null);
+
+                TypeSymbol stringType = (TypeSymbol)((ISymbolTable)_symbols.SystemNamespace).FindSymbol("String", null, SymbolFilter.Types);
+                Debug.Assert(boolType != null);
+
+                // Define Dictionary.Keys
+                MethodSymbol getKeysMethod = new MethodSymbol("GetKeys", classSymbol, _symbols.CreateArrayTypeSymbol(stringType), MemberVisibility.Public | MemberVisibility.Static);
+                getKeysMethod.SetTransformedName("keys");
+                classSymbol.AddMember(getKeysMethod);
+
+                // Define Dictionary.GetCount
+                MethodSymbol countMethod = new MethodSymbol("GetKeyCount", classSymbol, intType, MemberVisibility.Public | MemberVisibility.Static);
+                classSymbol.AddMember(countMethod);
+
+                // Define Dictionary.ClearKeys
+                MethodSymbol clearMethod = new MethodSymbol("ClearKeys", classSymbol, voidType, MemberVisibility.Public | MemberVisibility.Static);
+                classSymbol.AddMember(clearMethod);
+
+                // Define Dictionary.DeleteKey
+                MethodSymbol deleteMethod = new MethodSymbol("DeleteKey", classSymbol, voidType, MemberVisibility.Public | MemberVisibility.Static);
+                classSymbol.AddMember(deleteMethod);
+
+                // Define Dictionary.KeyExists
+                MethodSymbol existsMethod = new MethodSymbol("KeyExists", classSymbol, boolType, MemberVisibility.Public | MemberVisibility.Static);
+                classSymbol.AddMember(existsMethod);
+
+                return;
+            }
+
+            if (memberSet == PseudoClassMembers.String) {
+                // In script, String.replace replaces only the first occurrence of a string
+                // whereas in C# all occurrences are replaced.
+                // Replace becomes replaceAll (a method we add) in generated script
+                // ReplaceFirst becomes replace in generated script.
+                // ReplaceRegex also becomes replace in generated script. (We added ReplaceRegex so
+                //   it could be mapped to the native replace method, rather than out replaceAll
+                //   extension)
+
+                MethodSymbol replaceFirstMethod = (MethodSymbol)classSymbol.GetMember("ReplaceFirst");
+                Debug.Assert(replaceFirstMethod != null);
+                replaceFirstMethod.SetTransformedName("replace");
+
+                MethodSymbol replaceMethod = (MethodSymbol)classSymbol.GetMember("Replace");
+                Debug.Assert(replaceMethod != null);
+                replaceMethod.SetTransformedName("replaceAll");
+
+                MethodSymbol replaceRegexMethod = (MethodSymbol)classSymbol.GetMember("ReplaceRegex");
+                Debug.Assert(replaceRegexMethod != null);
+                replaceRegexMethod.SetTransformedName("replace");
+            }
+        }
+
+        private void ImportScriptAssembly(MetadataSource mdSource, string assemblyPath, bool coreAssembly) {
+            string scriptNamespace = null;
+            string scriptName = null;
+
+            AssemblyDefinition assembly;
+            if (coreAssembly) {
+                assembly = mdSource.CoreAssemblyMetadata;
+            }
+            else {
+                assembly = mdSource.GetMetadata(assemblyPath);
+                scriptNamespace = MetadataHelpers.GetScriptNamespace(assembly);
+            }
+
+            scriptName = MetadataHelpers.GetScriptAssemblyName(assembly);
+            if (String.IsNullOrEmpty(scriptName) == false) {
+                _options.AddReferencedDependency(scriptName);
+            }
+
+            if (coreAssembly) {
+                // Always add an execution reference to the core assembly, since
+                // it contains things like the type system, and other APIs assumed by the compiler
+                Debug.Assert(String.IsNullOrEmpty(scriptName) == false);
+                _options.AddExecutionDependency(scriptName);
+            }
+
+            foreach (TypeDefinition type in assembly.MainModule.Types) {
+                try {
+                    if (MetadataHelpers.IsCompilerGeneratedType(type)) {
+                        continue;
+                    }
+
+                    ImportType(mdSource, type, coreAssembly, scriptNamespace, scriptName);
+                }
+                catch (Exception e) {
+                    Debug.Fail(e.ToString());
+                }
+            }
+        }
+
+        private void ImportType(MetadataSource mdSource, TypeDefinition type, bool inScriptCoreAssembly, string assemblyScriptNamespace, string assemblyScriptName) {
+            if (type.IsPublic == false) {
+                return;
+            }
+            if (inScriptCoreAssembly && (MetadataHelpers.ShouldImportScriptCoreType(type) == false)) {
+                return;
+            }
+
+            string name = type.Name;
+            string namespaceName = type.Namespace;
+            string scriptNamespace = MetadataHelpers.GetScriptNamespace(type);
+            string scriptName = MetadataHelpers.GetScriptName(type);
+
+            if (String.IsNullOrEmpty(scriptNamespace) && (String.IsNullOrEmpty(assemblyScriptNamespace) == false)) {
+                scriptNamespace = assemblyScriptNamespace;
+            }
+
+            NamespaceSymbol namespaceSymbol = _symbols.GetNamespace(namespaceName);
+            TypeSymbol typeSymbol = null;
+
+            if (type.IsInterface) {
+                typeSymbol = new InterfaceSymbol(name, namespaceSymbol);
+            }
+            else if (MetadataHelpers.IsEnum(type)) {
+                // NOTE: We don't care about the flags bit on imported enums
+                //       because this is only consumed by the generation logic.
+                typeSymbol = new EnumerationSymbol(name, namespaceSymbol, /* flags */ false);
+                if (MetadataHelpers.ShouldUseEnumNames(type)) {
+                    ((EnumerationSymbol)typeSymbol).SetNamedValues();
+                }
+                else if (MetadataHelpers.ShouldUseEnumValues(type)) {
+                    ((EnumerationSymbol)typeSymbol).SetNumericValues();
+                }
+            }
+            else if (MetadataHelpers.IsDelegate(type)) {
+                typeSymbol = new DelegateSymbol(name, namespaceSymbol);
+                typeSymbol.SetTransformedName("Function");
+            }
+            else {
+                if (MetadataHelpers.ShouldTreatAsRecordType(type)) {
+                    typeSymbol = new RecordSymbol(name, namespaceSymbol);
+                }
+                else {
+                    typeSymbol = new ClassSymbol(name, namespaceSymbol);
+
+                    string mixinRoot;
+                    if (MetadataHelpers.ShouldGlobalizeMembers(type, out mixinRoot)) {
+                        ((ClassSymbol)typeSymbol).SetGlobalMethods(mixinRoot);
+                    }
+                }
+            }
+
+            if (typeSymbol != null) {
+                if (type.HasGenericParameters) {
+                    List<GenericParameterSymbol> genericArguments = new List<GenericParameterSymbol>();
+                    foreach (GenericParameter genericParameter in type.GenericParameters) {
+                        GenericParameterSymbol arg =
+                            new GenericParameterSymbol(genericParameter.Position, genericParameter.Name,
+                                                      /* typeArgument */ true,
+                                                      _symbols.GlobalNamespace);
+                        genericArguments.Add(arg);
+                    }
+
+                    typeSymbol.AddGenericParameters(genericArguments);
+                }
+
+                typeSymbol.SetImported(assemblyScriptName);
+                typeSymbol.SetMetadataToken(type, inScriptCoreAssembly);
+
+                bool ignoreNamespace = MetadataHelpers.ShouldIgnoreNamespace(type);
+                if (ignoreNamespace) {
+                    typeSymbol.SetIgnoreNamespace();
+                }
+                typeSymbol.SetPublic();
+
+                if (String.IsNullOrEmpty(scriptNamespace) == false) {
+                    typeSymbol.ScriptNamespace = scriptNamespace;  
+                }
+
+                if (String.IsNullOrEmpty(scriptName) == false) {
+                    typeSymbol.SetTransformedName(scriptName);
+                }
+
+                namespaceSymbol.AddType(typeSymbol);
+                _importedTypes.Add(typeSymbol);
+            }
+        }
+
+        private TypeSymbol ResolveType(TypeReference type) {
+            int arrayDimensions = 0;
+            while (type is ArrayType) {
+                arrayDimensions++;
+                type = ((ArrayType)type).ElementType;
+            }
+
+            GenericInstanceType genericType = type as GenericInstanceType;
+            if (genericType != null) {
+                type = genericType.ElementType;
+            }
+
+            string name = type.FullName;
+            if (String.CompareOrdinal(name, "System.ValueType") == 0) {
+                // Ignore this type - it is the base class for enums, and other primitive types
+                // but we don't import it since it is not useful in script
+                return null;
+            }
+
+            TypeSymbol typeSymbol;
+
+            GenericParameter genericParameter = type as GenericParameter;
+            if (genericParameter != null) {
+                typeSymbol = new GenericParameterSymbol(genericParameter.Position, genericParameter.Name,
+                                                       (genericParameter.Owner.GenericParameterType == GenericParameterType.Type),
+                                                       _symbols.GlobalNamespace);
+            }
+            else {
+                typeSymbol = (TypeSymbol)((ISymbolTable)_symbols).FindSymbol(name, null, SymbolFilter.Types);
+                if (typeSymbol == null) {
+                    _errorHandler.ReportError("Unable to resolve referenced type '" + name +
+                                              "'. Make sure all needed assemblies have been explicitly referenced.",
+                                              String.Empty);
+                    _resolveError = true;
+                }
+            }
+
+            if (genericType != null) {
+                List<TypeSymbol> typeArgs = new List<TypeSymbol>();
+
+                foreach (TypeReference argTypeRef in genericType.GenericArguments) {
+                    TypeSymbol argType = ResolveType(argTypeRef);
+                    typeArgs.Add(argType);
+                }
+
+                typeSymbol = _symbols.CreateGenericTypeSymbol(typeSymbol, typeArgs);
+                Debug.Assert(typeSymbol != null);
+            }
+
+            if (arrayDimensions != 0) {
+                for (int i = 0; i < arrayDimensions; i++) {
+                    typeSymbol = _symbols.CreateArrayTypeSymbol(typeSymbol);
+                }
+            }
+
+            return typeSymbol;
+        }
+
+
+        private enum PseudoClassMembers {
+
+            Type = 0,
+
+            Script = 1,
+
+            Dictionary = 2,
+
+            Arguments = 3,
+
+            Object = 4,
+
+            String = 5
+        }
+    }
+}
diff --git a/src/Core/Compiler/Importer/MetadataSource.cs b/src/Core/Compiler/Importer/MetadataSource.cs
new file mode 100644
index 000000000..ad076c647
--- /dev/null
+++ b/src/Core/Compiler/Importer/MetadataSource.cs
@@ -0,0 +1,245 @@
+// MetadataSource.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using ScriptSharp;
+using ScriptSharp.Importer.IL;
+
+namespace ScriptSharp.Importer {
+
+    internal sealed class MetadataSource {
+
+        private static readonly string CoreAssemblyName = "mscorlib";
+
+        private List<string> _assemblyPaths;
+        private string _coreAssemblyPath;
+
+        private Dictionary<string, AssemblyDefinition> _assemblyMap;
+        private AssemblyDefinition _coreAssembly;
+
+        public ICollection<string> Assemblies {
+            get {
+                return _assemblyPaths;
+            }
+        }
+
+        public string CoreAssemblyPath {
+            get {
+                return _coreAssemblyPath;
+            }
+        }
+
+        public AssemblyDefinition CoreAssemblyMetadata {
+            get {
+                return _coreAssembly;
+            }
+        }
+
+        public AssemblyDefinition GetMetadata(string assembly) {
+            return _assemblyMap[assembly];
+        }
+
+        public bool LoadReferences(ICollection<string> references, IErrorHandler errorHandler) {
+            bool hasLoadErrors = false;
+
+            AssemblySet assemblySet = new AssemblySet();
+
+            foreach (string referencePath in references) {
+                string assemblyFilePath = Path.GetFullPath(referencePath);
+                if (File.Exists(assemblyFilePath) == false) {
+                    errorHandler.ReportError("The referenced assembly '" + referencePath + "' could not be located.", String.Empty);
+                    hasLoadErrors = true;
+                    continue;
+                }
+
+                string referenceName = Path.GetFileNameWithoutExtension(assemblyFilePath);
+                if (assemblySet.IsReferenced(referenceName)) {
+                    errorHandler.ReportError("The referenced assembly '" + referencePath + "' is a duplicate reference.", String.Empty);
+                    hasLoadErrors = true;
+
+                    continue;
+                }
+
+                try {
+                    AssemblyDefinition assembly = AssemblyDefinition.ReadAssembly(assemblyFilePath);
+                    if (assembly == null) {
+                        errorHandler.ReportError("The referenced assembly '" + referencePath + "' could not be loaded as an assembly.", String.Empty);
+                        hasLoadErrors = true;
+                        continue;
+                    }
+
+                    if (referenceName.Equals(CoreAssemblyName, StringComparison.OrdinalIgnoreCase)) {
+                        if (_coreAssemblyPath != null) {
+                            errorHandler.ReportError("The core runtime assembly, mscorlib.dll must be referenced only once.", String.Empty);
+                            hasLoadErrors = true;
+
+                            continue;
+                        }
+                        else {
+                            _coreAssemblyPath = assemblyFilePath;
+                            _coreAssembly = assembly;
+                        }
+                    }
+                    else {
+                        assemblySet.AddAssembly(assemblyFilePath, referenceName, assembly);
+                    }
+                }
+                catch (Exception e) {
+                    Debug.Fail(e.ToString());
+
+                    errorHandler.ReportError("The referenced assembly '" + referencePath + "' could not be loaded as an assembly.", String.Empty);
+                    hasLoadErrors = true;
+                }
+            }
+
+            if (_coreAssembly == null) {
+                errorHandler.ReportError("The 'mscorlib' assembly must be referenced.", String.Empty);
+                hasLoadErrors = true;
+            }
+            else {
+                if (VerifyScriptAssembly(_coreAssembly) == false) {
+                    errorHandler.ReportError("The assembly '" + _coreAssemblyPath + "' is not a valid script assembly.", String.Empty);
+                    hasLoadErrors = true;
+                }
+            }
+
+            foreach (KeyValuePair<string, AssemblyDefinition> assemblyReference in assemblySet.Assemblies) {
+                if (VerifyScriptAssembly(assemblyReference.Value) == false) {
+                    errorHandler.ReportError("The assembly '" + assemblyReference.Key + "' is not a valid script assembly.", String.Empty);
+                    hasLoadErrors = true;
+                }
+            }
+
+            _assemblyMap = assemblySet.Assemblies;
+            _assemblyPaths = assemblySet.GetAssemblyPaths();
+
+            return hasLoadErrors;
+        }
+
+        private bool VerifyScriptAssembly(AssemblyDefinition assembly) {
+            foreach (CustomAttribute attribute in assembly.CustomAttributes) {
+                if (String.CompareOrdinal(attribute.Constructor.DeclaringType.FullName, "System.Runtime.CompilerServices.ScriptAssemblyAttribute") == 0) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+
+        private sealed class AssemblySet {
+
+            private Dictionary<string, AssemblyDefinition> _assemblies;
+            private HashSet<string> _assemblyNames;
+
+            public AssemblySet() {
+                _assemblies = new Dictionary<string, AssemblyDefinition>(StringComparer.Ordinal);
+                _assemblyNames = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            }
+
+            public Dictionary<string, AssemblyDefinition> Assemblies {
+                get {
+                    return _assemblies;
+                }
+            }
+
+            public void AddAssembly(string path, string referenceName, AssemblyDefinition assembly) {
+                _assemblies[path] = assembly;
+                _assemblyNames.Add(referenceName);
+            }
+
+            public List<string> GetAssemblyPaths() {
+                // Perform a topological sort to get the list of assemblies in order
+                // to cause loading of dependencies to happen before an assembly
+                // that references them.
+
+                List<AssemblyReference> references = new List<AssemblyReference>();
+                Dictionary<string, AssemblyReference> referenceMap =
+                    new Dictionary<string, AssemblyReference>(StringComparer.Ordinal);
+
+                foreach (KeyValuePair<string, AssemblyDefinition> assembly in _assemblies) {
+                    AssemblyReference reference = new AssemblyReference(assembly.Key, assembly.Value);
+                    references.Add(reference);
+                    referenceMap[reference.FullName] = reference;
+                }
+
+                List<AssemblyReference> sortedReferences = new List<AssemblyReference>();
+                references.ForEach(r => VisitReference(r, referenceMap, sortedReferences));
+
+                return sortedReferences.Select(r => r.Path).ToList();
+            }
+
+            public bool IsReferenced(string referenceName) {
+                return _assemblyNames.Contains(referenceName);
+            }
+
+            private void VisitReference(AssemblyReference reference, Dictionary<string, AssemblyReference> referenceMap, List<AssemblyReference> referenceList) {
+                if (reference.Visited) {
+                    return;
+                }
+
+                reference.Visit();
+                foreach (string dependencyName in reference.Dependencies) {
+                    AssemblyReference dependencyReference;
+                    if (referenceMap.TryGetValue(dependencyName, out dependencyReference)) {
+                        VisitReference(dependencyReference, referenceMap, referenceList);
+                    }
+                }
+
+                referenceList.Add(reference);
+            }
+        }
+
+        private sealed class AssemblyReference {
+
+            private string _path;
+            private List<string> _dependencies;
+            private AssemblyDefinition _assembly;
+
+            private bool _visited;
+
+            public AssemblyReference(string path, AssemblyDefinition assembly) {
+                _path = path;
+                _assembly = assembly;
+
+                _dependencies = assembly.MainModule.AssemblyReferences.Select(a => a.FullName).ToList();
+            }
+
+            public string FullName {
+                get {
+                    return _assembly.FullName;
+                }
+            }
+
+            public string Path {
+                get {
+                    return _path;
+                }
+            }
+
+            public IEnumerable<string> Dependencies {
+                get {
+                    return _dependencies;
+                }
+            }
+
+            public bool Visited {
+                get {
+                    return _visited;
+                }
+            }
+
+            public void Visit() {
+                _visited = true;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Importer/SignatureParser.cs b/src/Core/Compiler/Importer/SignatureParser.cs
new file mode 100644
index 000000000..aa77e5934
--- /dev/null
+++ b/src/Core/Compiler/Importer/SignatureParser.cs
@@ -0,0 +1,295 @@
+// SigatureParser.cs
+// Script#/Core/ScriptSharp
+// Copyright (c) Nikhil Kothari.
+// Copyright (c) Microsoft Corporation.
+// This source code is subject to terms and conditions of the Microsoft 
+// Public License. A copy of the license can be found in License.txt.
+//
+
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Text;
+using ScriptSharp;
+using ScriptSharp.ScriptModel;
+
+namespace ScriptSharp.Importer {
+
+    internal sealed class SignatureParser {
+
+        private SymbolSet _symbols;
+        private ICompilerErrorHandler _errorHandler;
+
+        private Interop.IMetadataImport _mdImport;
+        private IntPtr _signatureBytes;
+        private int _signatureLength;
+
+        private int _signatureIndex;
+
+        public SignatureParser(SymbolSet symbols, ICompilerErrorHandler errorHandler) {
+            _symbols = symbols;
+            _errorHandler = errorHandler;
+        }
+
+        private bool CanRead {
+            get {
+                return (_signatureIndex < _signatureLength);
+            }
+        }
+
+        public TypeSymbol Parse(Interop.IMetadataImport mdImport, IntPtr signatureBytes, int signatureLength) {
+            bool dummy;
+            return Parse(mdImport, signatureBytes, signatureLength, out dummy);
+        }
+
+        public TypeSymbol Parse(Interop.IMetadataImport mdImport, IntPtr signatureBytes, int signatureLength, out bool isIndexer) {
+            _mdImport = mdImport;
+            _signatureBytes = signatureBytes;
+            _signatureLength = signatureLength;
+            _signatureIndex = 0;
+
+            isIndexer = false;
+
+            byte signatureMarker = Read();
+            byte typeMarker = (byte)(signatureMarker & 0xF);
+            switch (typeMarker) {
+                case Interop.SIG_FIELD:
+                    return ParseField();
+                case Interop.SIG_PROPERTY:
+                    return ParseProperty(out isIndexer);
+                case Interop.SIG_METHOD_DEFAULT:
+                case Interop.SIG_METHOD_C:
+                case Interop.SIG_METHOD_THISCALL:
+                case Interop.SIG_METHOD_VARARG:
+                case Interop.SIG_METHOD_STDCALL:
+                case Interop.SIG_METHOD_FASTCALL:
+                    bool isGeneric = ((signatureMarker & Interop.SIG_GENERIC) != 0);
+                    return ParseMethod(isGeneric);
+                default:
+                    // TODO: Error
+                    Debug.Fail("Unexpected signature type");
+                    return null;
+            }
+        }
+
+        private TypeSymbol ParseField() {
+            return ReadType();
+        }
+
+        private TypeSymbol ParseMethod(bool isGeneric) {
+            if (isGeneric) {
+                int genericArguments = ReadNumber();
+            }
+
+            // Skip parameter count
+            ReadNumber();
+
+            byte typeMarker = Peek();
+            if (typeMarker == Interop.ELEMENT_TYPE_VOID) {
+                Read();
+
+                TypeSymbol typeSymbol =
+                    (TypeSymbol)((ISymbolTable)_symbols.SystemNamespace).FindSymbol("Void", null, SymbolFilter.Types);
+                Debug.Assert(typeSymbol != null);
+
+                return typeSymbol;
+            }
+
+            return ReadType();
+        }
+
+        private TypeSymbol ParseProperty(out bool isIndexer) {
+            int parameterCount = ReadNumber();
+            isIndexer = (parameterCount != 0);
+
+            return ReadType();
+        }
+
+        private byte Peek() {
+            return Marshal.ReadByte(_signatureBytes, _signatureIndex);
+        }
+
+        private byte Read() {
+            Debug.Assert(CanRead);
+
+            byte b = Marshal.ReadByte(_signatureBytes, _signatureIndex);
+            _signatureIndex++;
+
+            return b;
+        }
+
+        private TypeSymbol ReadArray() {
+            TypeSymbol itemTypeSymbol = ReadType();
+            if (itemTypeSymbol != null) {
+                return TypeSymbol.CreateArrayType(itemTypeSymbol, _symbols);
+            }
+
+            return null;
+        }
+
+        private TypeSymbol ReadClass() {
+            int encodedToken = ReadNumber();
+            byte tokenType = (byte)(encodedToken & 0x3);
+            int index = (encodedToken >> 2);
+
+            StringBuilder nameBuilder = null;
+
+            Debug.Assert((tokenType == Interop.SIG_INDEX_TYPE_TYPEDEF) ||
+                         (tokenType == Interop.SIG_INDEX_TYPE_TYPEREF));
+            if (tokenType == Interop.SIG_INDEX_TYPE_TYPEDEF) {
+                int typeNameLength;
+                int typeFlags;
+                int typeExtendsToken;
+
+                int token = index | (int)Interop.CorTokenType.mdtTypeDef;
+
+                _mdImport.GetTypeDefProps(token, null, 0, out typeNameLength,
+                                          out typeFlags, out typeExtendsToken);
+                nameBuilder = new StringBuilder(typeNameLength);
+                _mdImport.GetTypeDefProps(token,
+                                          nameBuilder, typeNameLength, out typeNameLength,
+                                          out typeFlags, out typeExtendsToken);
+            }
+            else if (tokenType == Interop.SIG_INDEX_TYPE_TYPEREF) {
+                int typeNameLength;
+                int scopeToken;
+
+                int token = index | (int)Interop.CorTokenType.mdtTypeRef;
+
+                _mdImport.GetTypeRefProps(token, out scopeToken, null, 0, out typeNameLength);
+                nameBuilder = new StringBuilder(typeNameLength);
+                _mdImport.GetTypeRefProps(token, out scopeToken,
+                                          nameBuilder, typeNameLength, out typeNameLength);
+            }
+
+            Debug.Assert(nameBuilder != null);
+
+            string typeName = nameBuilder.ToString();
+
+            TypeSymbol typeSymbol = (TypeSymbol)((ISymbolTable)_symbols).FindSymbol(typeName, null, SymbolFilter.Types);
+            Debug.Assert(typeSymbol != null);
+
+            return typeSymbol;
+        }
+
+        private int ReadNumber() {
+            byte b1 = Read();
+
+            if (b1 == 0xFF) {
+                // Special encoding of NULL
+                return 0;
+            }
+
+            if ((b1 & 0x80) == 0) {
+                // 1-byte encoding
+                return (int)b1;
+            }
+
+            byte b2 = Read();
+
+            if ((b1 & 0x40) == 0) {
+                // 2-byte encoding
+                return (((b1 & 0x3F) << 8) | b2);
+            }
+
+            // 4-byte encoding
+            Debug.Assert((b1 & 0x20) == 0);
+
+            byte b3 = Read();
+            byte b4 = Read();
+
+            return (((b1 & 0x1F) << 24) | (b2 << 16) | (b3 << 8) | b4);
+        }
+
+        private TypeSymbol ReadType() {
+            byte typeMarker = Read();
+            string typeName = null;
+
+            switch (typeMarker) {
+                case Interop.ELEMENT_TYPE_BOOLEAN:
+                    typeName = "Boolean";
+                    break;
+                case Interop.ELEMENT_TYPE_CHAR:
+                    typeName = "Char";
+                    break;
+                case Interop.ELEMENT_TYPE_I1:
+                    typeName = "SByte";
+                    break;
+                case Interop.ELEMENT_TYPE_U1:
+                    typeName = "Byte";
+                    break;
+                case Interop.ELEMENT_TYPE_I2:
+                    typeName = "Int16";
+                    break;
+                case Interop.ELEMENT_TYPE_U2:
+                    typeName = "UInt16";
+                    break;
+                case Interop.ELEMENT_TYPE_I4:
+                    typeName = "Int32";
+                    break;
+                case Interop.ELEMENT_TYPE_U4:
+                    typeName = "UInt32";
+                    break;
+                case Interop.ELEMENT_TYPE_I8:
+                    typeName = "Int64";
+                    break;
+                case Interop.ELEMENT_TYPE_U8:
+                    typeName = "UInt64";
+                    break;
+                case Interop.ELEMENT_TYPE_I:
+                    typeName = "IntPtr";
+                    break;
+                case Interop.ELEMENT_TYPE_U:
+                    typeName = "UIntPtr";
+                    break;
+                case Interop.ELEMENT_TYPE_R4:
+                    typeName = "Single";
+                    break;
+                case Interop.ELEMENT_TYPE_R8:
+                    typeName = "Double";
+                    break;
+                case Interop.ELEMENT_TYPE_STRING:
+                    typeName = "String";
+                    break;
+                case Interop.ELEMENT_TYPE_OBJECT:
+                    typeName = "Object";
+                    break;
+                case Interop.ELEMENT_TYPE_CLASS:
+                case Interop.ELEMENT_TYPE_VALUETYPE:
+                    return ReadClass();
+                case Interop.ELEMENT_TYPE_SZARRAY:
+                    return ReadArray();
+                case Interop.ELEMENT_TYPE_PTR:
+                case Interop.ELEMENT_TYPE_FNPTR:
+                case Interop.ELEMENT_TYPE_GENERICINST:
+                case Interop.ELEMENT_TYPE_VAR:
+                case Interop.ELEMENT_TYPE_ARRAY:
+                    // TODO: Error handler
+                    Debug.Fail("Unsupported types");
+                    break;
+                case Interop.ELEMENT_TYPE_MVAR:
+                    typeName = "Object";
+                    break;
+                default:
+                    Debug.Fail("Unexpected type");
+                    break;
+            }
+
+            if (typeName != null) {
+                TypeSymbol typeSymbol =
+                    (TypeSymbol)((ISymbolTable)_symbols.SystemNamespace).FindSymbol(typeName, null, SymbolFilter.Types);
+                Debug.Assert(typeSymbol != null);
+
+                if (typeMarker == Interop.ELEMENT_TYPE_MVAR) {
+                    int genericArgIndex = ReadNumber();
+                    typeSymbol = new GenericTypeSymbol(genericArgIndex, (NamespaceSymbol)typeSymbol.Parent);
+                }
+
+                return typeSymbol;
+            }
+
+            // TODO: Error handler
+            return null;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/BufferPosition.cs b/src/Core/Compiler/Parser/BufferPosition.cs
new file mode 100644
index 000000000..ac43b327c
--- /dev/null
+++ b/src/Core/Compiler/Parser/BufferPosition.cs
@@ -0,0 +1,133 @@
+// BufferPosition.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Parser {
+
+    /// <summary>
+    /// A line and column position in a source buffer.
+    /// </summary>
+    internal struct BufferPosition : IComparable {
+
+        private int _offset;
+        private int _line;
+        private int _column;
+
+        public BufferPosition(int line, int column, int offset) {
+            _line = line;
+            _column = column;
+            _offset = offset;
+        }
+
+        /// <summary>
+        /// The line number of the position (0 based).
+        /// </summary>
+        public int Line {
+            get {
+                return _line;
+            }
+            set {
+                _line = value;
+            }
+        }
+
+        /// <summary>
+        /// The column number of the position (0 based).
+        /// </summary>
+        public int Column {
+            get {
+                return _column;
+            }
+            set {
+                _column = value;
+            }
+        }
+
+        /// <summary>
+        /// The character offset of the position (0 based).
+        /// </summary>
+        public int Offset {
+            get {
+                return _offset;
+            }
+            set {
+                _offset = value;
+            }
+        }
+
+        public static bool operator ==(BufferPosition a, BufferPosition b) {
+            return (a._line == b._line) && (a._column == b._column) && (a._offset == b._offset);
+        }
+
+        public static bool operator !=(BufferPosition a, BufferPosition b) {
+            return !(a == b);
+        }
+
+        public static bool operator <(BufferPosition a, BufferPosition b) {
+            if (a._line < b._line) {
+                return true;
+            }
+            if (a._line == b._line) {
+                if (a._column < b._column) {
+                    return true;
+                }
+                if (a._column == b._column) {
+                    if (a._offset < b._offset) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+
+        public static bool operator >(BufferPosition a, BufferPosition b) {
+            return b < a;
+        }
+
+        public int CompareTo(BufferPosition pos) {
+            if (this < pos) {
+                return -1;
+            }
+            else if (this == pos) {
+                return 0;
+            }
+            else {
+                return 1;
+            }
+        }
+
+        public override bool Equals(object obj) {
+            if (!(obj is BufferPosition)) {
+                return false;
+            }
+
+            return this == (BufferPosition)obj;
+        }
+
+        public override int GetHashCode() {
+            return (_line * 64) + _column;
+        }
+
+        /// <summary>
+        /// Converts the position to a string suitable for display in an error _message
+        /// </summary>
+        public override string ToString() {
+            if ((_line == 0) && (_column == 0)) {
+                return String.Empty;
+            }
+            else {
+                // Add 1 to convert line/column indexes into numbers
+                return "(" + (_line + 1) + ", " + (_column + 1) + ")";
+            }
+        }
+
+        #region Implementation of IComparable
+        int IComparable.CompareTo(object o) {
+            return CompareTo((BufferPosition)o);
+        }
+        #endregion
+    }
+}
diff --git a/src/Core/Compiler/Parser/Error.cs b/src/Core/Compiler/Parser/Error.cs
new file mode 100644
index 000000000..03bf930b2
--- /dev/null
+++ b/src/Core/Compiler/Parser/Error.cs
@@ -0,0 +1,88 @@
+// Error.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.Parser {
+
+    internal sealed class Error {
+
+#if DEBUG
+        private static readonly Hashtable _errorTable = new Hashtable();
+#endif
+
+        private int _id;
+        private int _level;
+        private string _message;
+
+        public Error(int id, int level, string message) {
+            _id = id;
+            _level = level;
+            _message = message;
+
+#if DEBUG
+            // ensure that _errorTable are unique
+            Debug.Assert(_errorTable[id] == null);
+            _errorTable[id] = this;
+#endif
+        }
+
+        /// <summary>
+        /// Error number. Should be unique for a given component.
+        /// </summary>
+        public int ID {
+            get {
+                return _id;
+            }
+        }
+
+        /// <summary>
+        /// Warning Level of the _message. 0 means its an Error.
+        /// </summary>
+        public int Level {
+            get {
+                return _level;
+            }
+        }
+
+        /// <summary>
+        /// Message template.
+        /// </summary>
+        public string Message {
+            get {
+                return _message;
+            }
+        }
+
+        /// <summary>
+        /// Is this error fatal.
+        /// </summary>
+        public bool IsFatal {
+            get {
+                return _level < 0;
+            }
+        }
+
+        /// <summary>
+        /// Is this an error as opposed to a warning.
+        /// </summary>
+        public bool IsError {
+            get {
+                return _level <= 0;
+            }
+        }
+
+        /// <summary>
+        /// Is this a warning as opposed to an error.
+        /// </summary>
+        public bool IsWarning {
+            get {
+                return !IsError;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/ErrorEventArgs.cs b/src/Core/Compiler/Parser/ErrorEventArgs.cs
new file mode 100644
index 000000000..02bfd5a93
--- /dev/null
+++ b/src/Core/Compiler/Parser/ErrorEventArgs.cs
@@ -0,0 +1,42 @@
+// ErrorEventArgs.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.Parser {
+
+    internal sealed class ErrorEventArgs {
+
+        private Error _error;
+        private BufferPosition _position;
+        private object[] _args;
+
+        public ErrorEventArgs(Error error, BufferPosition position, params object[] args) {
+            _error = error;
+            _position = position;
+            _args = args;
+        }
+
+        public object[] Args {
+            get {
+                return _args;
+            }
+        }
+
+        public Error Error {
+            get {
+                return _error;
+            }
+        }
+
+        public BufferPosition Position {
+            get {
+                return _position;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/ErrorEventHandler.cs b/src/Core/Compiler/Parser/ErrorEventHandler.cs
new file mode 100644
index 000000000..8b6f9972f
--- /dev/null
+++ b/src/Core/Compiler/Parser/ErrorEventHandler.cs
@@ -0,0 +1,11 @@
+// ErrorEventHandler.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Parser {
+
+    internal delegate void ErrorEventHandler(object sender, ErrorEventArgs e);
+}
diff --git a/src/Core/Compiler/Parser/FileErrorEventArgs.cs b/src/Core/Compiler/Parser/FileErrorEventArgs.cs
new file mode 100644
index 000000000..e3e009678
--- /dev/null
+++ b/src/Core/Compiler/Parser/FileErrorEventArgs.cs
@@ -0,0 +1,46 @@
+// FileErrorEventArgs.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.Parser {
+
+    internal sealed class FileErrorEventArgs {
+
+        private Error _error;
+        private FilePosition _position;
+        private object[] _args;
+
+        internal FileErrorEventArgs(Error error, FilePosition position, params object[] args) {
+            _error = error;
+            _position = position;
+            _args = args;
+        }
+
+        internal FileErrorEventArgs(ErrorEventArgs e, LineMap lineMap)
+            : this(e.Error, lineMap.Map(e.Position), e.Args) {
+        }
+
+        public object[] Args {
+            get {
+                return _args;
+            }
+        }
+
+        public Error Error {
+            get {
+                return _error;
+            }
+        }
+
+        public FilePosition Position {
+            get {
+                return _position;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/FileErrorEventHandler.cs b/src/Core/Compiler/Parser/FileErrorEventHandler.cs
new file mode 100644
index 000000000..4b5b6be3e
--- /dev/null
+++ b/src/Core/Compiler/Parser/FileErrorEventHandler.cs
@@ -0,0 +1,11 @@
+// FileErrorEventHandler.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Parser {
+
+    internal delegate void FileErrorEventHandler(object sender, FileErrorEventArgs e);
+}
diff --git a/src/Core/Compiler/Parser/FileLexer.cs b/src/Core/Compiler/Parser/FileLexer.cs
new file mode 100644
index 000000000..bf4560db2
--- /dev/null
+++ b/src/Core/Compiler/Parser/FileLexer.cs
@@ -0,0 +1,367 @@
+// FileLexer.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Text;
+using System.Globalization;
+using System.Collections;
+using System.Diagnostics;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Parser {
+
+    /// <summary>
+    /// Preprocesses and Lexes a C# compilation Unit.
+    /// </summary>
+    internal sealed class FileLexer {
+
+        private TextBuffer _text;
+        private string _path;
+        private IDictionary _defines;
+        private LineMap _lineMap;
+        private Lexer _lexer;
+        private PreprocessorLineParser _parser;
+        private ArrayList _tokens;
+        private bool _includeComments;
+
+        public FileLexer(NameTable nameTable, string path) {
+            _lexer = new Lexer(nameTable, path);
+            _lexer.OnError += new ErrorEventHandler(ReportError);
+            _parser = new PreprocessorLineParser(nameTable);
+            _parser.OnError += new ErrorEventHandler(ReportError);
+
+            _path = path;
+        }
+
+        /// <summary>
+        /// Lexes a compilation unit.
+        /// </summary>
+        /// <param name="text"> The text to lex. </param>
+        /// <param name="defines"> The set of preprocessor symbols defined in source. 
+        /// Is modified to include results of #define/#undef found in this compilation unit. </param>
+        /// <param name="lineMap">The LineMap contains the source text to file/line mapping
+        /// as a result of #line directives. </param>
+        /// <param name="includeComments"> Should comment tokens be generated. </param>
+        /// <returns></returns>
+        public Token[] Lex(char[] text, IDictionary defines, LineMap lineMap, bool includeComments) {
+            // initialize
+            _text = new TextBuffer(text);
+            _defines = defines;
+            _lineMap = lineMap;
+            _includeComments = includeComments;
+
+            LexFile();
+
+            _text = null;
+            _defines = null;
+            _lineMap = null;
+            _includeComments = false;
+
+            return (Token[])_tokens.ToArray(typeof(Token));
+        }
+
+        public event FileErrorEventHandler OnError;
+
+        /// <summary>
+        /// Returns whether a character is a C# line separator.
+        /// </summary>
+        public static bool IsLineSeparator(char ch) {
+            return Lexer.IsLineSeparator(ch);
+        }
+
+        private void LexFile() {
+            _tokens = new ArrayList(_text.Length / 8);
+            _tokens.Add(new Token(TokenType.BOF, _path, _text.Position));
+
+            PreprocessorLine line;
+            do {
+                line = LexBlock();
+                if (line.Type != PreprocessorTokenType.EndOfLine) {
+                    ReportError(PreprocessorError.UnexpectedDirective);
+                }
+            } while (line.Type != PreprocessorTokenType.EndOfLine);
+
+            if (TokenType.EOF != ((Token)_tokens[_tokens.Count - 1]).Type) {
+                _tokens.Add(new Token(TokenType.EOF, _path, _text.Position));
+            }
+        }
+
+        private PreprocessorLine LexBlock() {
+            while (_lexer.LexBlock(_text, _tokens, _includeComments)) {
+                PreprocessorLine line = _parser.Parse(_text, _defines);
+
+                if (line != null) {
+                DoLine:
+                    switch (line.Type) {
+                        case PreprocessorTokenType.Define:
+                        case PreprocessorTokenType.Undef:
+                        case PreprocessorTokenType.Warning:
+                        case PreprocessorTokenType.Error:
+                        case PreprocessorTokenType.Line:
+                        case PreprocessorTokenType.Default:
+                        case PreprocessorTokenType.Hidden:
+                        case PreprocessorTokenType.Pragma:
+                            DoSimpleLine(line);
+                            break;
+
+                        case PreprocessorTokenType.Region:
+                            line = LexBlock();
+                            if (line.Type == PreprocessorTokenType.EndRegion) {
+                                break;
+                            }
+                            else {
+                                ReportError(PreprocessorError.EndRegionExpected);
+                                goto DoLine;
+                            }
+
+                        case PreprocessorTokenType.If:
+                            line = DoIf((PreprocessorIfLine)line);
+                            if (line != null) {
+                                goto DoLine;
+                            }
+                            break;
+
+                        case PreprocessorTokenType.EndRegion:
+                        case PreprocessorTokenType.Elif:
+                        case PreprocessorTokenType.Else:
+                        case PreprocessorTokenType.Endif:
+                        case PreprocessorTokenType.EndOfLine:
+                            return line;
+                    }
+                }
+            }
+
+            return new PreprocessorLine(PreprocessorTokenType.EndOfLine);
+        }
+
+        private void DoSimpleLine(PreprocessorLine line) {
+            switch (line.Type) {
+                case PreprocessorTokenType.Define:
+                case PreprocessorTokenType.Undef:
+                    if (FoundNonComment()) {
+                        // have more than BOF
+                        ReportError(PreprocessorError.DefineAfterToken);
+                    }
+                    else {
+                        PreprocessorDeclarationLine decl = (PreprocessorDeclarationLine)line;
+                        if (decl.Type == PreprocessorTokenType.Define) {
+                            _defines.Add(decl.Identifier.Text, null);
+                        }
+                        else {
+                            _defines.Remove(decl.Identifier.Text);
+                        }
+                    }
+                    break;
+
+                case PreprocessorTokenType.Warning:
+                    ReportFormattedError(PreprocessorError.PPWarning, ((PreprocessorControlLine)line).Message);
+                    break;
+
+                case PreprocessorTokenType.Error:
+                    ReportFormattedError(PreprocessorError.PPError, ((PreprocessorControlLine)line).Message);
+                    break;
+
+                case PreprocessorTokenType.Line: {
+                        PreprocessorLineNumberLine lineNumber = ((PreprocessorLineNumberLine)line);
+                        if (lineNumber.File != null) {
+                            _lineMap.AddEntry(_text.Line, lineNumber.Line, lineNumber.File);
+                        }
+                        else {
+                            _lineMap.AddEntry(_text.Line, lineNumber.Line);
+                        }
+                    }
+                    break;
+                case PreprocessorTokenType.Default:
+                    _lineMap.AddEntry(_text.Line, _text.Line, _lineMap.FileName);
+                    break;
+
+                case PreprocessorTokenType.Hidden:
+                    // #line hidden is for the weak
+                    break;
+                case PreprocessorTokenType.Pragma:
+                    // no pragma's suported yet
+                    break;
+                default:
+                    Debug.Fail("Bad preprocessor line");
+                    break;
+            }
+        }
+
+        private PreprocessorLine SkipBlock() {
+            PreprocessorLine line;
+            do {
+                line = _parser.ParseNextLine(_text, _defines);
+            DoLine:
+                switch (line.Type) {
+                    case PreprocessorTokenType.Define:
+                    case PreprocessorTokenType.Undef:
+                    case PreprocessorTokenType.Warning:
+                    case PreprocessorTokenType.Error:
+                    case PreprocessorTokenType.Line:
+                        line = null;
+                        break;
+
+                    case PreprocessorTokenType.Region:
+                        line = SkipBlock();
+                        if (line.Type != PreprocessorTokenType.EndRegion) {
+                            ReportError(PreprocessorError.EndRegionExpected);
+                            goto DoLine;
+                        }
+                        else {
+                            line = null;
+                            break;
+                        }
+
+                    case PreprocessorTokenType.If:
+                        line = SkipElifBlock();
+                        if (line != null) {
+                            goto DoLine;
+                        }
+                        break;
+
+                    case PreprocessorTokenType.EndRegion:
+                    case PreprocessorTokenType.Endif:
+                    case PreprocessorTokenType.Else:
+                    case PreprocessorTokenType.Elif:
+                    case PreprocessorTokenType.EndOfLine:
+                        break;
+                }
+            } while (line == null);
+
+            return line;
+        }
+
+        private PreprocessorLine DoIf(PreprocessorIfLine ifLine) {
+            PreprocessorLine line;
+
+            if (ifLine.Value) {
+                line = LexBlock();
+                switch (line.Type) {
+                    case PreprocessorTokenType.Endif:
+                        line = null;
+                        break;
+                    case PreprocessorTokenType.Elif:
+                        line = SkipElifBlock();
+                        break;
+
+                    case PreprocessorTokenType.Else:
+                        line = SkipElseBlock();
+                        break;
+
+                    case PreprocessorTokenType.EndOfLine:
+                        ReportError(PreprocessorError.UnexpectedEndOfFile);
+                        break;
+
+                    case PreprocessorTokenType.EndRegion:
+                    default:
+                        ReportError(PreprocessorError.UnexpectedDirective);
+                        break;
+                }
+            }
+            else {
+                line = SkipBlock();
+                switch (line.Type) {
+                    case PreprocessorTokenType.Else:
+                        line = DoElse();
+                        break;
+
+                    case PreprocessorTokenType.Elif:
+                        return DoIf((PreprocessorIfLine)line);
+
+                    case PreprocessorTokenType.Endif:
+                        line = null;
+                        break;
+
+                    case PreprocessorTokenType.EndOfLine:
+                        ReportError(PreprocessorError.UnexpectedEndOfFile);
+                        break;
+
+                    case PreprocessorTokenType.EndRegion:
+                    default:
+                        ReportError(PreprocessorError.UnexpectedDirective);
+                        break;
+                }
+            }
+
+            return line;
+        }
+
+        private PreprocessorLine DoElse() {
+            PreprocessorLine line = LexBlock();
+            if (line.Type == PreprocessorTokenType.Endif) {
+                line = null;
+            }
+            else {
+                ReportError(PreprocessorError.PPEndifExpected);
+            }
+
+            return line;
+        }
+
+        private PreprocessorLine SkipElseBlock() {
+            PreprocessorLine line = SkipBlock();
+            if (line.Type == PreprocessorTokenType.Endif) {
+                line = null;
+            }
+            else {
+                ReportError(PreprocessorError.PPEndifExpected);
+            }
+
+            return line;
+        }
+
+        private PreprocessorLine SkipElifBlock() {
+            PreprocessorLine line = SkipBlock();
+            if (line.Type == PreprocessorTokenType.Endif) {
+                line = null;
+            }
+            else if (line.Type == PreprocessorTokenType.Else) {
+                line = SkipElseBlock();
+            }
+            else if (line.Type == PreprocessorTokenType.Elif) {
+                line = SkipElifBlock();
+            }
+            else {
+                ReportError(PreprocessorError.PPEndifExpected);
+            }
+
+            return line;
+        }
+
+        private bool FoundNonComment() {
+            // first token is BOF
+            for (int i = 1; i < _tokens.Count; i += 1) {
+                if (((Token)_tokens[i]).Type != TokenType.Comment)
+                    return true;
+            }
+
+            return false;
+        }
+
+        private void ReportFormattedError(Error error, params object[] args) {
+            BufferPosition position = _text.Position;
+            position.Line -= 1;
+            ReportError(error, position, args);
+        }
+
+        private void ReportError(Error error) {
+            BufferPosition position = _text.Position;
+            position.Line -= 1;
+            ReportError(error, position);
+        }
+
+        private void ReportError(Error error, BufferPosition position, params object[] args) {
+            if (OnError != null) {
+                OnError(this, new FileErrorEventArgs(error, _lineMap.Map(position), args));
+            }
+        }
+
+        private void ReportError(object sender, ErrorEventArgs e) {
+            if (OnError != null) {
+                OnError(this, new FileErrorEventArgs(e, _lineMap));
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/FileParser.cs b/src/Core/Compiler/Parser/FileParser.cs
new file mode 100644
index 000000000..1da013d9e
--- /dev/null
+++ b/src/Core/Compiler/Parser/FileParser.cs
@@ -0,0 +1,58 @@
+// FileParser.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Diagnostics;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Parser {
+
+    /// <summary>
+    /// Preprocesses, Lexes and Parses a C# Compilation Unit
+    /// Uses a FileLexer and a Parser object.
+    /// </summary>
+    internal sealed class FileParser {
+
+        private LineMap _lineMap;
+        private Parser _parser;
+        private NameTable _nameTable;
+        private string _path;
+
+        public FileParser(NameTable nameTable, string path) {
+            _nameTable = nameTable;
+            _path = path;
+            _parser = new Parser(nameTable, path);
+            _parser.OnError += new ErrorEventHandler(OnParserError);
+        }
+
+        /// <summary>
+        /// Event to receive error notifications on. Subscribe to this event before calling Parse.
+        /// </summary>
+        public event FileErrorEventHandler OnError;
+
+        private void OnParserError(object sender, ErrorEventArgs e) {
+            if (OnError != null) {
+                OnError(this, new FileErrorEventArgs(e, _lineMap));
+            }
+        }
+
+        /// <summary>
+        /// Preprocesses, Lexes and Parses a C# compilation unit. Subscribe to the OnError
+        /// event before calling this method to receive error notifications.
+        /// After calling Parse, the Defines property contains the list of preprocessor
+        /// symbols defined as a result of #define and #undef directives in this
+        /// compilation unit.
+        /// </summary>
+        public CompilationUnitNode Parse(Token[] tokens, LineMap lineMap) {
+            _lineMap = lineMap;
+            CompilationUnitNode parseTree = _parser.Parse(tokens);
+            _lineMap = null;
+
+            return parseTree;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/FilePosition.cs b/src/Core/Compiler/Parser/FilePosition.cs
new file mode 100644
index 000000000..a41e83ea8
--- /dev/null
+++ b/src/Core/Compiler/Parser/FilePosition.cs
@@ -0,0 +1,48 @@
+// FilePosition.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Parser {
+
+    /// <summary>
+    /// A position in a source file.
+    /// </summary>
+    internal struct FilePosition {
+
+        private BufferPosition _position;
+        private string _fileName;
+
+        public FilePosition(BufferPosition position, string fileName) {
+            _position = position;
+            _fileName = fileName;
+        }
+
+        public BufferPosition Position {
+            get {
+                return _position;
+            }
+            set {
+                _position = value;
+            }
+        }
+
+        public string FileName {
+            get {
+                return _fileName;
+            }
+            set {
+                _fileName = value;
+            }
+        }
+
+        /// <summary>
+        /// Returns a string suitable for display in an error _message.
+        /// </summary>
+        public override string ToString() {
+            return _fileName + _position.ToString();
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/Keywords.cs b/src/Core/Compiler/Parser/Keywords.cs
new file mode 100644
index 000000000..c2b3142ee
--- /dev/null
+++ b/src/Core/Compiler/Parser/Keywords.cs
@@ -0,0 +1,44 @@
+// Keywords.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Parser {
+
+    /// <summary>
+    /// C# Keywords
+    /// </summary>
+    internal sealed class Keywords {
+
+        private Hashtable _keywords;
+        private NameTable _nameTable;
+
+        /// <summary>
+        /// Initializes Keywords object. Adds all keywords to _nameTable.
+        /// </summary>
+        public Keywords(NameTable nameTable) {
+            _keywords = new Hashtable((int)TokenType.Identifier);
+            _nameTable = nameTable;
+
+            for (TokenType token = 0; token < TokenType.Identifier; token += 1) {
+                _keywords.Add(_nameTable.Add(Token.GetString(token)), token);
+            }
+        }
+
+        /// <summary>
+        /// Returns true if name is a C# keyword
+        /// </summary>
+        public TokenType IsKeyword(Name name) {
+            object o = _keywords[name];
+            if (o != null) {
+                return (TokenType)o;
+            }
+            return TokenType.Invalid;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/LexError.cs b/src/Core/Compiler/Parser/LexError.cs
new file mode 100644
index 000000000..4eabbee12
--- /dev/null
+++ b/src/Core/Compiler/Parser/LexError.cs
@@ -0,0 +1,26 @@
+// LexError.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Parser {
+
+    internal sealed class LexError {
+
+        private LexError() {
+        }
+
+        public static readonly Error SyntaxError = new Error(101, 0, "Syntax Error");
+        public static readonly Error UnexpectedCharacter = new Error(102, 0, "Unexected character '{0}'");
+        public static readonly Error WhiteSpaceInConstant = new Error(103, 0, "Illegal whitespace in constant");
+        public static readonly Error BadEscapeSequence = new Error(104, 0, "Bad escape sequence");
+        public static readonly Error EmptyCharConstant = new Error(105, 0, "Empty char constant");
+        public static readonly Error BadCharConstant = new Error(106, 0, "Missing ' in char constant");
+        public static readonly Error IdentifierTooLong = new Error(108, 0, "Identifier too long");
+        public static readonly Error NumericConstantOverflow = new Error(109, 0, "Numeric constant overflow");
+        public static readonly Error UnexpectedEndOfFileStarSlash = new Error(110, 0, "Unexpected end of file found. '*/' expected.");
+        public static readonly Error UnexpectedEndOfFileString = new Error(111, 0, "Unexpected end of file found. '\"' expected.");
+    }
+}
diff --git a/src/Core/Compiler/Parser/Lexer.cs b/src/Core/Compiler/Parser/Lexer.cs
new file mode 100644
index 000000000..89e55ae7f
--- /dev/null
+++ b/src/Core/Compiler/Parser/Lexer.cs
@@ -0,0 +1,890 @@
+// Lexer.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Text;
+using System.Globalization;
+using System.Collections;
+using System.Diagnostics;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Parser {
+
+    /// <summary>
+    /// Lexes C# source code. Does not handle # preprocessor directives.
+    /// </summary>
+    internal sealed class Lexer {
+
+        private TextBuffer _text;
+        private string _path;
+        private BufferPosition _position;
+        private StringBuilder _value;
+        private IList _tokenList;
+        private int _lastLine;
+        private NameTable _nameTable;
+        private Keywords _keywords;
+        private bool _includeComments;
+
+        public Lexer(NameTable nameTable, string path) {
+            _nameTable = nameTable;
+            _path = path;
+            _keywords = new Keywords(nameTable);
+            _value = new StringBuilder(IdentifierToken.MaxIdentifierLength + 1);
+
+            _lastLine = -1;
+        }
+
+        /// <summary>
+        /// Lexes a block of C# text.
+        /// Does not handle preprocessor directives.
+        /// Will stop at EOF or before a # found as the first non-whitespace character
+        /// on a line. Does not include comment tokens.
+        /// </summary>
+        /// <param name="text"> Buffer containing the text to lex. </param>
+        /// <param name="tokenList"> List of tokens to add to. </param>
+        /// <returns> true if a preprocessor directive was found, or false on end of buffer. </returns>
+        public bool LexBlock(TextBuffer text, IList tokenList) {
+            return LexBlock(text, tokenList, false);
+        }
+
+        /// <summary>
+        /// Lexes a block of C# text.
+        /// Does not handle preprocessor directives.
+        /// Will stop at EOF or before a # found as the first non-whitespace character
+        /// on a line. 
+        /// </summary>
+        /// <param name="text"> Buffer containing the text to lex. </param>
+        /// <param name="tokenList"> List of tokens to add to. </param>
+        /// <param name="includeComments"> Should comment tokens be generated. </param>
+        /// <returns> true if a preprocessor directive was found, or false on end of buffer. </returns>
+        public bool LexBlock(TextBuffer text, IList tokenList, bool includeComments) {
+            Debug.Assert(_keywords != null);
+            Debug.Assert(_nameTable != null);
+
+            Debug.Assert(_text == null);
+            Debug.Assert(_tokenList == null);
+            Debug.Assert(_lastLine == -1);
+
+            _text = text;
+            _tokenList = tokenList;
+            _lastLine = text.Line - 1;
+            _includeComments = includeComments;
+
+            // get the tokens
+            Token next = null;
+            do {
+                next = NextToken();
+
+                if (next == null) {
+                    // pre-processor directive
+                    break;
+                }
+
+                if (next.Type != TokenType.Error && next.Type != TokenType.EOF) {
+                    tokenList.Add(next);
+                }
+            } while (next.Type != TokenType.EOF);
+
+            _tokenList = null;
+            _text = null;
+            _lastLine = -1;
+            _includeComments = false;
+            ClearPosition();
+
+            return next == null;
+        }
+
+
+        /// <summary>
+        /// Event to subscribe to for Lex errors.
+        /// </summary>
+        public event ErrorEventHandler OnError;
+
+        private static int IndexOfToken(Token[] tokens, Token token) {
+            return Array.BinarySearch(tokens, token);
+        }
+
+        private Token NextToken() {
+            SkipWhiteSpace();
+
+            StartToken();
+
+            bool atIdentifier = false;
+
+            char ch = PeekChar();
+            if (ch == '\0')
+                return NewToken(TokenType.EOF);
+
+            ch = NextChar();
+            switch (ch) {
+                case '\0':
+                    Debug.Fail("Checked for EOF above");
+                    return null;
+
+                case '#':
+                    if (_text.Line == _lastLine) {
+                        ReportError(LexError.UnexpectedCharacter, ch.ToString());
+                        return ErrorToken();
+                    }
+                    else {
+                        ClearPosition();
+                        _text.Reverse();
+                        return null;
+                    }
+
+                // operators
+                case '{': return NewToken(TokenType.OpenCurly);
+                case '}': return NewToken(TokenType.CloseCurly);
+                case '[': return NewToken(TokenType.OpenSquare);
+                case ']': return NewToken(TokenType.CloseSquare);
+                case '(': return NewToken(TokenType.OpenParen);
+                case ')': return NewToken(TokenType.CloseParen);
+                case ',': return NewToken(TokenType.Comma);
+                case ':':
+                    ch = PeekChar();
+                    if (ch == ':') {
+                        NextChar();
+                        return NewToken(TokenType.ColonColon);
+                    }
+                    return NewToken(TokenType.Colon);
+
+                case ';': return NewToken(TokenType.Semicolon);
+                case '~': return NewToken(TokenType.Tilde);
+
+                case '?':
+                    ch = PeekChar();
+                    if (ch == '?') {
+                        NextChar();
+                        return NewToken(TokenType.Coalesce);
+                    }
+                    return NewToken(TokenType.Question);
+
+                case '+':
+                    ch = PeekChar();
+                    if (ch == '+') {
+                        NextChar();
+                        return NewToken(TokenType.PlusPlus);
+                    }
+                    else if (ch == '=') {
+                        NextChar();
+                        return NewToken(TokenType.PlusEqual);
+                    }
+                    return NewToken(TokenType.Plus);
+
+                case '-':
+                    ch = PeekChar();
+                    if (ch == '-') {
+                        NextChar();
+                        return NewToken(TokenType.MinusMinus);
+                    }
+                    else if (ch == '=') {
+                        NextChar();
+                        return NewToken(TokenType.MinusEqual);
+                    }
+                    else if (ch == '>') {
+                        NextChar();
+                        return NewToken(TokenType.Arrow);
+                    }
+                    return NewToken(TokenType.Minus);
+
+                case '*':
+                    if (PeekChar() == '=') {
+                        NextChar();
+                        return NewToken(TokenType.StarEqual);
+                    }
+                    return NewToken(TokenType.Star);
+
+                case '/':
+                    ch = PeekChar();
+                    if (ch == '=') {
+                        NextChar();
+                        return NewToken(TokenType.SlashEqual);
+                    }
+                    else if (ch == '/') {
+                        NextChar();
+
+                        CommentTokenType commentType;
+                        if (!EOF && PeekChar() == '/') {
+                            commentType = CommentTokenType.TripleSlash;
+                            NextChar();
+                        }
+                        else {
+                            commentType = CommentTokenType.DoubleSlash;
+                        }
+
+                        _value.Length = 0;
+                        while (!EOF && !IsLineSeparator(PeekChar())) {
+                            _value.Append(NextChar());
+                        }
+
+                        if (_includeComments) {
+                            return new CommentToken(commentType, _value.ToString(), _path, TakePosition());
+                        }
+                        else {
+                            TakePosition();
+                            return NextToken();
+                        }
+                    }
+                    else if (ch == '*') {
+                        NextChar();
+
+                        _value.Length = 0;
+                        while (!EOF && (PeekChar() != '*' || PeekChar(1) != '/')) {
+                            _value.Append(NextChar());
+                        }
+                        if (EOF) {
+                            ReportError(LexError.UnexpectedEndOfFileStarSlash);
+                            return ErrorToken();
+                        }
+
+                        NextChar();
+                        NextChar();
+
+                        _lastLine = _text.Line;
+
+                        if (_includeComments) {
+                            return new CommentToken(CommentTokenType.SlashStar, _value.ToString(), _path, TakePosition());
+                        }
+                        else {
+                            TakePosition();
+                            return NextToken();
+                        }
+                    }
+
+                    return NewToken(TokenType.Slash);
+
+                case '%':
+                    if (PeekChar() == '=') {
+                        NextChar();
+                        return NewToken(TokenType.PercentEqual);
+                    }
+                    return NewToken(TokenType.Percent);
+
+                case '&':
+                    ch = PeekChar();
+                    if (ch == '&') {
+                        NextChar();
+                        return NewToken(TokenType.LogAnd);
+                    }
+                    else if (ch == '=') {
+                        NextChar();
+                        return NewToken(TokenType.AndEqual);
+                    }
+                    return NewToken(TokenType.Ampersand);
+
+                case '|':
+                    ch = PeekChar();
+                    if (ch == '|') {
+                        NextChar();
+                        return NewToken(TokenType.LogOr);
+                    }
+                    else if (ch == '=') {
+                        NextChar();
+                        return NewToken(TokenType.BarEqual);
+                    }
+                    return NewToken(TokenType.Bar);
+
+                case '^':
+                    if (PeekChar() == '=') {
+                        NextChar();
+                        return NewToken(TokenType.HatEqual);
+                    }
+                    return NewToken(TokenType.Hat);
+
+                case '!':
+                    if (PeekChar() == '=') {
+                        NextChar();
+                        return NewToken(TokenType.NotEqual);
+                    }
+                    return NewToken(TokenType.Bang);
+
+                case '=':
+                    if (PeekChar() == '=') {
+                        NextChar();
+                        return NewToken(TokenType.EqualEqual);
+                    }
+                    return NewToken(TokenType.Equal);
+
+                case '<':
+                    ch = PeekChar();
+                    if (ch == '=') {
+                        NextChar();
+                        return NewToken(TokenType.LessEqual);
+                    }
+                    else if (ch == '<') {
+                        NextChar();
+                        if (PeekChar() == '=') {
+                            NextChar();
+                            return NewToken(TokenType.ShiftLeftEqual);
+                        }
+                        return NewToken(TokenType.ShiftLeft);
+                    }
+                    return NewToken(TokenType.Less);
+
+                case '>':
+                    ch = PeekChar();
+                    if (ch == '=') {
+                        NextChar();
+                        return NewToken(TokenType.GreaterEqual);
+                    }
+                    return NewToken(TokenType.Greater);
+
+                // literals
+                case '\'':
+                    // char literal
+                    {
+                        char ch2;
+                        if (ScanCharValue('\'', false, out ch, out ch2)) {
+                            if (PeekChar() != '\'') {
+                                ReportError(LexError.BadCharConstant);
+                            }
+                            else {
+                                NextChar();
+                            }
+                            return new CharToken(ch, _path, TakePosition());
+                        }
+                        else {
+                            return ErrorToken();
+                        }
+                    }
+
+                case '"':
+                    // string literal
+                    {
+                        char ch2;
+                        _value.Length = 0;
+                        while (!EOF && ScanCharValue('"', true, out ch, out ch2)) {
+                            _value.Append(ch);
+                            if (ch2 != 0)
+                                _value.Append(ch2);
+                        }
+                        if (EOF) {
+                            ReportError(LexError.UnexpectedEndOfFileString);
+                            return ErrorToken();
+                        }
+                        return new StringToken(_value.ToString(), _path, TakePosition());
+                    }
+
+                case '@':
+                    ch = PeekChar();
+                    if (ch == '"') {
+                        // verbatim string literal
+                        NextChar();
+                        _value.Length = 0;
+                        while (!EOF && (PeekChar() != '"' || PeekChar(1) == '"')) {
+                            // this is the one place where a CR/LF pair is significant
+                            bool wasCRLF;
+                            ch = NextChar(out wasCRLF);
+                            _value.Append(ch);
+                            if (wasCRLF) {
+                                _value.Append('\xA');
+                            }
+                            else if (ch == '"') {
+                                NextChar();
+                            }
+                        }
+                        if (EOF) {
+                            ReportError(LexError.UnexpectedEndOfFileString);
+                            return ErrorToken();
+                        }
+                        NextChar();
+                        return new StringToken(_value.ToString(), _path, TakePosition());
+                    }
+                    atIdentifier = true;
+                    goto default;
+
+                case '0':
+                    if (PeekChar() == 'x' || PeekChar() == 'X') {
+                        NextChar();
+
+                        // hexadecimal constant
+                        ulong value = 0;
+                        while (IsHexDigit(PeekChar())) {
+                            if ((value & 0xF000000000000000) != 0) {
+                                ReportError(LexError.NumericConstantOverflow);
+                                return ErrorToken();
+                            }
+                            value = (value << 4) | (uint)HexValue(NextChar());
+                        }
+
+                        return CreateIntegerConstant(value, ScanIntegerSuffixOpt());
+                    }
+                    goto case '1';
+
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9':
+                DoNumber: {
+                        bool foundDecimalPoint = (ch == '.');
+                        bool foundExponent = false;
+                        NumericSuffix suffix = NumericSuffix.None;
+
+                        _value.Length = 0;
+                        _value.Append(ch);
+                        while (true) {
+                            ch = PeekChar();
+                            if (ch == '.') {
+                                if (foundDecimalPoint || !IsDigit(PeekChar(1))) {
+                                    break;
+                                }
+                                foundDecimalPoint = true;
+                            }
+                            else if (ch == 'e' || ch == 'E') {
+                                char nextChar = PeekChar(1);
+                                if (IsDigit(nextChar) || ((nextChar == '+' || nextChar == '-') && IsDigit(PeekChar(2)))) {
+                                    foundExponent = true;
+
+                                    _value.Append(NextChar());
+                                    _value.Append(NextChar());
+                                    while (IsDigit(PeekChar())) {
+                                        _value.Append(NextChar());
+                                    }
+                                }
+                                break;
+                            }
+                            else if (!IsDigit(ch)) {
+                                break;
+                            }
+                            _value.Append(NextChar());
+                        }
+
+                        if (!foundDecimalPoint && !foundExponent) {
+                            suffix = ScanIntegerSuffixOpt();
+                        }
+
+                        if (suffix == NumericSuffix.None) {
+                            suffix = ScanRealSuffixOpt();
+                        }
+
+                        if (suffix < NumericSuffix.F && !foundDecimalPoint && !foundExponent) {
+                            // decimal integer constant
+                            ulong numericValue = 0;
+                            foreach (char digit in _value.ToString().ToCharArray()) {
+                                ulong value10 = numericValue * 10;
+                                if (value10 < numericValue) {
+                                    ReportError(LexError.NumericConstantOverflow);
+                                    return ErrorToken();
+                                }
+                                numericValue = value10 + (uint)(digit - '0');
+                            }
+
+                            return CreateIntegerConstant(numericValue, suffix);
+                        }
+                        else {
+                            try {
+                                // real constant
+                                switch (suffix) {
+                                    case NumericSuffix.F: {
+                                            float f = float.Parse(_value.ToString(), NumberStyles.AllowDecimalPoint | NumberStyles.AllowExponent, CultureInfo.InvariantCulture);
+                                            return new FloatToken(f, _path, TakePosition());
+                                        }
+
+                                    case NumericSuffix.D:
+                                    case NumericSuffix.None: {
+                                            double d = double.Parse(_value.ToString(), NumberStyles.AllowDecimalPoint | NumberStyles.AllowExponent, CultureInfo.InvariantCulture);
+                                            return new DoubleToken(d, _path, TakePosition());
+                                        }
+
+                                    case NumericSuffix.M: {
+                                            decimal dec = decimal.Parse(_value.ToString(), NumberStyles.AllowDecimalPoint | NumberStyles.AllowExponent, CultureInfo.InvariantCulture);
+                                            return new DecimalToken(dec, _path, TakePosition());
+                                        }
+                                }
+                            }
+                            catch (Exception) {
+                                // catch overflow exceptions from the numeric parse
+                            }
+                            ReportError(LexError.NumericConstantOverflow);
+                            return ErrorToken();
+                        }
+                    }
+
+                case '.':
+                    if (IsDigit(PeekChar())) {
+                        goto DoNumber;
+                    }
+                    return NewToken(TokenType.Dot);
+
+                default: {
+                        _value.Length = 0;
+                        if (!IsIdentifierChar(ch)) {
+                            ReportError(LexError.UnexpectedCharacter, ch.ToString());
+                            return ErrorToken();
+                        }
+                        _value.Append(ch);
+
+                        while (ScanIdentifierChar(out ch)) {
+                            _value.Append(ch);
+                        }
+
+                        Debug.Assert(_value.Length > 0);
+
+                        if (_value.Length > IdentifierToken.MaxIdentifierLength) {
+                            ReportError(LexError.IdentifierTooLong);
+                            return ErrorToken();
+                        }
+
+                        Name name = _nameTable.Add(_value);
+                        if (!atIdentifier) {
+                            // check for keywords
+                            TokenType keyword = _keywords.IsKeyword(name);
+                            if (Token.IsKeyword(keyword)) {
+                                return new Token(keyword, _path, TakePosition());
+                            }
+                        }
+
+                        return new IdentifierToken(name, atIdentifier, _path, TakePosition());
+                    }
+            }
+        }
+
+        private void SkipWhiteSpace() {
+            while (IsWhiteSpace(PeekChar())) {
+                NextChar();
+            }
+        }
+
+        private enum NumericSuffix {
+            None,
+
+            // integer suffixes
+            U = 0x01,
+            L = 0x10,
+            UL = 0x11,
+
+            // floating point suffixes
+            F,
+            D,
+            M
+        }
+
+        private Token CreateIntegerConstant(ulong value, NumericSuffix suffix) {
+            switch (suffix) {
+                case NumericSuffix.None:
+                    if (value <= int.MaxValue) {
+                        return new IntToken((int)value, _path, TakePosition());
+                    }
+                    else if (value <= uint.MaxValue) {
+                        return new UIntToken((uint)value, _path, TakePosition());
+                    }
+                    else if (value <= long.MaxValue) {
+                        return new LongToken((long)value, _path, TakePosition());
+                    }
+                    goto case NumericSuffix.UL;
+                case NumericSuffix.U:
+                    if (value <= uint.MaxValue) {
+                        return new UIntToken((uint)value, _path, TakePosition());
+                    }
+                    goto case NumericSuffix.UL;
+                case NumericSuffix.L:
+                    if (value <= long.MaxValue) {
+                        return new LongToken((long)value, _path, TakePosition());
+                    }
+                    goto case NumericSuffix.UL;
+                case NumericSuffix.UL:
+                default:
+                    return new ULongToken(value, _path, TakePosition());
+            }
+        }
+
+        private NumericSuffix ScanIntegerSuffixOpt() {
+            NumericSuffix suffix = NumericSuffix.None;
+
+            while (true) {
+                char ch = PeekChar();
+                if (ch == 'U' || ch == 'u') {
+                    if ((suffix & NumericSuffix.U) != 0) {
+                        break;
+                    }
+                    suffix |= NumericSuffix.U;
+                }
+                else if (ch == 'l' || ch == 'L') {
+                    if ((suffix & NumericSuffix.L) != 0) {
+                        break;
+                    }
+                    suffix |= NumericSuffix.L;
+                }
+                else {
+                    break;
+                }
+                NextChar();
+            }
+
+            return suffix;
+        }
+
+        private NumericSuffix ScanRealSuffixOpt() {
+            NumericSuffix suffix = NumericSuffix.None;
+
+            switch (PeekChar()) {
+                case 'F':
+                case 'f':
+                    suffix = NumericSuffix.F;
+                    break;
+
+                case 'D':
+                case 'd':
+                    suffix = NumericSuffix.D;
+                    break;
+
+                case 'M':
+                case 'm':
+                    suffix = NumericSuffix.M;
+                    break;
+
+                default:
+                    return NumericSuffix.None;
+            }
+
+            NextChar();
+
+            return suffix;
+        }
+
+        private bool ScanIdentifierChar(out char ch) {
+            ch = '\0';
+
+            char value = PeekChar();
+            if (IsIdentifierChar(value)) {
+                ch = NextChar();
+                return true;
+            }
+            else if (value == '\\' && PeekChar(1) == 'u') {
+                // unicode esape
+                NextChar();
+                NextChar();
+                value = '\0';
+                int i = 0;
+                while (i < 4 && IsHexDigit(PeekChar())) {
+                    value = (char)(value << 4 + HexValue(NextChar()));
+                    i += 1;
+                }
+                if (i != 4) {
+                    ReportError(LexError.BadEscapeSequence);
+                    return false;
+                }
+                ch = value;
+                return true;
+            }
+            else {
+                return false;
+            }
+        }
+
+        private bool ScanCharValue(char terminator, bool allowSurrogates, out char ch, out char ch2) {
+            ch = '\0';
+            ch2 = '\0';
+            char value = PeekChar();
+            if ('\\' == value) {
+                NextChar();
+                switch (PeekChar()) {
+                    case '\'': value = '\''; break;
+                    case '\"': value = '\"'; break;
+                    case '\\': value = '\\'; break;
+                    case '0': value = '\0'; break;
+                    case 'a': value = '\a'; break;
+                    case 'b': value = '\b'; break;
+                    case 'f': value = '\f'; break;
+                    case 'n': value = '\n'; break;
+                    case 'r': value = '\r'; break;
+                    case 't': value = '\t'; break;
+                    case 'v': value = '\v'; break;
+                    case 'x':
+                    case 'u': {
+                            // hex digits
+                            NextChar();
+                            value = '\0';
+                            int i = 0;
+                            while (i < 4 && IsHexDigit(PeekChar())) {
+
+                                value = (char)((value << 4) + HexValue(NextChar()));
+                                i += 1;
+                            }
+                            if (i == 0 || (ch == 'u' && i != 4)) {
+                                ReportError(LexError.BadEscapeSequence);
+                                return false;
+                            }
+                            ch = value;
+                            return true;
+                        }
+
+                    case 'U': {
+                            // unicode surrogates
+                            NextChar();
+                            uint surrogateValue = 0;
+                            int i = 0;
+                            while (i < 8 && IsHexDigit(PeekChar())) {
+
+                                surrogateValue = (char)((surrogateValue << 4) + HexValue(NextChar()));
+                                i += 1;
+                            }
+                            if (i != 8 || (!allowSurrogates && surrogateValue > 0xFFFF) || surrogateValue > 0x10FFFF) {
+                                ReportError(LexError.BadEscapeSequence);
+                                return false;
+                            }
+                            if (surrogateValue < 0x10000) {
+                                ch = (char)surrogateValue;
+                                return true;
+                            }
+
+                            ch = (char)((surrogateValue - 0x10000) / 0x400 + 0xD800);
+                            ch2 = (char)((surrogateValue - 0x10000) % 0x400 + 0xDC00);
+
+                            return true;
+                        }
+
+                    default:
+                        ReportError(LexError.BadEscapeSequence);
+                        return false;
+                }
+                NextChar();
+                ch = value;
+                return true;
+            }
+            else if (value == terminator) {
+                NextChar();
+                if (terminator == '\'') {
+                    ReportError(LexError.EmptyCharConstant);
+                }
+
+                return false;
+            }
+            else if (IsLineSeparator(value)) {
+                ReportError(LexError.WhiteSpaceInConstant);
+                return false;
+            }
+            else {
+                NextChar();
+                ch = value;
+                return true;
+            }
+        }
+
+        private void ReportSyntaxError() {
+            ReportError(LexError.SyntaxError);
+        }
+
+        private void ReportError(Error error, params object[] args) {
+            if (OnError != null) {
+                OnError(this, new ErrorEventArgs(error, _text.Position, args));
+            }
+        }
+
+        /// <summary>
+        /// Tests if ch is a whitespace character
+        /// </summary>
+        public static bool IsWhiteSpace(char ch) {
+            switch (ch) {
+                // line separators are whitespace
+                case '\xD':
+                case '\xA':
+                case '\x2028':
+                case '\x2029':
+
+                // regular whitespace
+                case '\f':
+                case '\v':
+                case ' ':
+                case '\t':
+                    return true;
+
+                // handle odd unicode whitespace
+                default:
+                    return (ch > 127 && char.IsWhiteSpace(ch));
+            }
+        }
+
+        /// <summary>
+        /// Tests if ch is a line separator character.
+        /// </summary>
+        public static bool IsLineSeparator(char ch) {
+            switch (ch) {
+                case '\xD':
+                case '\xA':
+                case '\x2028':
+                case '\x2029':
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        /// <summary>
+        /// Tests if ch is a decimal digit.
+        /// </summary>
+        public static bool IsDigit(char ch) {
+            return (ch >= '0') && (ch <= '9');
+        }
+
+        /// <summary>
+        /// Tests if ch is any valid identifier character.
+        /// </summary>
+        public static bool IsIdentifierChar(char ch) {
+            return char.IsLetterOrDigit(ch) || (ch == '_');
+        }
+
+        /// <summary>
+        /// Tests if ch is a valid hexadecimal digit.
+        /// </summary>
+        public static bool IsHexDigit(char ch) {
+            return IsDigit(ch) || ((ch & 0xdf) >= 'A' && (ch & 0xdf) <= 'F');
+        }
+
+        private static int HexValue(char ch) {
+            return IsDigit(ch) ? ch - '0' : (ch & 0xdf) - 'A' + 10;
+        }
+
+        private Token ErrorToken() {
+            return NewToken(TokenType.Error);
+        }
+
+        private Token NewToken(TokenType type) {
+            return new Token(type, _path, TakePosition());
+        }
+
+        private BufferPosition TakePosition() {
+            _lastLine = _text.Line;
+            BufferPosition position = _position;
+            ClearPosition();
+            return position;
+        }
+
+        private void ClearPosition() {
+            _position = new BufferPosition();
+        }
+
+        private void StartToken() {
+            _position = _text.Position;
+        }
+
+        private char NextChar() {
+            return _text.NextChar();
+        }
+
+        private char NextChar(out bool wasCRLF) {
+            return _text.NextChar(out wasCRLF);
+        }
+
+        private char PeekChar() {
+            return PeekChar(0);
+        }
+
+        private char PeekChar(int index) {
+            return _text.PeekChar(index);
+        }
+
+        private bool EOF {
+            get {
+                return PeekChar() == '\0';
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/LineMap.cs b/src/Core/Compiler/Parser/LineMap.cs
new file mode 100644
index 000000000..b533043e1
--- /dev/null
+++ b/src/Core/Compiler/Parser/LineMap.cs
@@ -0,0 +1,91 @@
+// LineMap.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+
+namespace ScriptSharp.Parser {
+
+    /// <summary>
+    /// Container of #line directives for a single file.
+    /// Maps from a buffer TextBufferPosition to a FilePosition.
+    /// </summary>
+    internal sealed class LineMap {
+
+        private ArrayList _entries;
+
+        public LineMap(string filename) {
+            _entries = new ArrayList();
+            AddEntry(0, 1, filename);
+        }
+
+        public string FileName {
+            get {
+                return ((MapEntry)_entries[0]).fileName;
+            }
+        }
+
+        /// <summary>
+        /// Add a #line entry to the map.
+        /// </summary>
+        public void AddEntry(int from, int to) {
+            AddEntry(from, to, ((MapEntry)_entries[_entries.Count - 1]).fileName);
+        }
+
+        /// <summary>
+        /// Add a #line entry with a filename to the map.
+        /// </summary>
+        public void AddEntry(int from, int to, string filename) {
+            _entries.Add(new MapEntry(from, to, filename));
+        }
+
+        /// <summary>
+        /// Map a buffer position to a position in a file.
+        /// </summary>
+        public FilePosition Map(BufferPosition from) {
+            MapEntry entry = FindEntry(from.Line);
+            return new FilePosition(
+                new BufferPosition(
+                    entry.to + (from.Line - entry.from),
+                    from.Column + 1,
+                    from.Offset),
+                entry.fileName);
+        }
+
+        private MapEntry FindEntry(int from) {
+            int lowIndex = 0;
+            int highIndex = _entries.Count;
+
+            while (lowIndex < highIndex) {
+                int midIndex = (lowIndex + highIndex) / 2;
+                MapEntry midEntry = (MapEntry)_entries[midIndex];
+                if (midEntry.from < from) {
+                    lowIndex = midIndex + 1;
+                }
+                else if (midEntry.from == from) {
+                    return midEntry;
+                }
+                else {
+                    highIndex = midIndex;
+                }
+            }
+
+            return (MapEntry)_entries[lowIndex - 1];
+        }
+
+        private sealed class MapEntry {
+
+            public int from;
+            public int to;
+            public string fileName;
+
+            public MapEntry(int from, int to, string filename) {
+                this.from = from;
+                this.to = to;
+                this.fileName = filename;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/Name.cs b/src/Core/Compiler/Parser/Name.cs
new file mode 100644
index 000000000..5abd66624
--- /dev/null
+++ b/src/Core/Compiler/Parser/Name.cs
@@ -0,0 +1,53 @@
+// Name.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.Parser {
+
+    /// <summary>
+    /// An identifier or keyword. Symbols are stored in a shared NameTable
+    /// so there is only one instance of a given Name around at a time.
+    /// You can use the == operator to test if two names from the same
+    /// NameTable are equal.
+    /// </summary>
+    internal sealed class Name {
+
+        private string _value;
+        private int _hashValue;
+
+        internal Name(string value) {
+            _value = value;
+            _hashValue = NameTable.NameHasher.Hash(_value);
+        }
+
+        internal Name(StringBuilder value)
+            : this(value.ToString()) {
+        }
+
+        public int Length {
+            get {
+                return _value.Length;
+            }
+        }
+
+        public string Text {
+            get {
+                return _value;
+            }
+        }
+
+        public override int GetHashCode() {
+            return _hashValue;
+        }
+
+        public override string ToString() {
+            return _value;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/NameTable.cs b/src/Core/Compiler/Parser/NameTable.cs
new file mode 100644
index 000000000..c5e006384
--- /dev/null
+++ b/src/Core/Compiler/Parser/NameTable.cs
@@ -0,0 +1,236 @@
+// NameTable.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.Parser {
+
+    /// <summary>
+    /// A container for unique Names
+    /// </summary>
+    internal class NameTable : IEnumerable {
+
+        private Hashtable _values;
+
+        public NameTable() {
+            _values = new Hashtable(new NameHasher());
+        }
+
+        /// <summary>
+        /// The number of Names in the table
+        /// </summary>
+        public int Count {
+            get {
+                return _values.Count;
+            }
+        }
+
+        /// <summary>
+        /// Creates or returns the Name for a string.
+        /// </summary>
+        public Name Add(StringBuilder value) {
+            Name name = Find(value);
+            if (name == null) {
+                name = new Name(value);
+                _values.Add(name, name);
+            }
+            return name;
+        }
+
+        /// <summary>
+        /// Creates or returns the Name for a string.
+        /// </summary>
+        public Name Add(string value) {
+            Name name = Find(value);
+            if (name == null) {
+                name = new Name(value);
+                _values.Add(name, name);
+            }
+            return name;
+        }
+
+        /// <summary>
+        /// Returns a Name if it exists for value
+        /// or null if the NameTable doesn't contain value
+        /// </summary>
+        public Name Find(StringBuilder value) {
+            return (Name)_values[value];
+        }
+
+        /// <summary>
+        /// Returns a Name if it exists for value
+        /// or null if the NameTable doesn't contain value
+        /// </summary>
+        public Name Find(string value) {
+            return (Name)_values[value];
+        }
+
+        /// <summary>
+        /// Returns an iterator over the Names in the table
+        /// </summary>
+        public IEnumerator GetEnumerator() {
+            return _values.Keys.GetEnumerator();
+        }
+
+        /// <summary>
+        /// Returns true if a Name exists for the string.
+        /// </summary>
+        public bool IsName(string value) {
+            return _values[value] != null;
+        }
+
+        /// <summary>
+        /// Returns true if a Name exists for the string.
+        /// </summary>
+        public bool IsSymbol(StringBuilder value) {
+            return _values[value] != null;
+        }
+
+
+        /// <summary>
+        /// Provides a common Hash function for strings and Names
+        /// A Utility class for Name and NameTable classes
+        /// </summary>
+        internal sealed class NameHasher : IEqualityComparer {
+
+            /// <summary>
+            /// This must match with the string versino below.
+            /// </summary>
+            public static int Hash(StringBuilder value) {
+                const uint hashStart = 0xB16357FF;
+
+                uint hash = hashStart;
+
+                // Hash two characters/one dword at a time.
+                int length = value.Length;
+                int index = 0;
+                int length2 = length & ~1;
+                while (index < length2) {
+                    hash += (uint)(value[index + 1] << 16) | value[index];
+                    hash += (hash << 10);
+                    hash ^= (hash >> 6);
+                    index += 2;
+                }
+
+                // Hash the last character, if any.
+                if (index < length) {
+                    hash += value[index];
+                    hash += (hash << 10);
+                    hash ^= (hash >> 6);
+                }
+
+                hash += (hash << 3);
+                hash ^= (hash >> 11);
+                hash += (hash << 15);
+
+                return (int)HashUInt(hash);
+            }
+
+            /// <summary>
+            /// This must match with the StringBuilder version above.
+            /// </summary>
+            public static int Hash(string value) {
+                const uint hashStart = 0xB16357FF;
+
+                uint hash = hashStart;
+
+                // Hash two characters/one dword at a time.
+                int length = value.Length;
+                int index = 0;
+                int length2 = length & ~1;
+                while (index < length2) {
+                    hash += (uint)(value[index + 1] << 16) | value[index];
+                    hash += (hash << 10);
+                    hash ^= (hash >> 6);
+                    index += 2;
+                }
+
+                // Hash the last character, if any.
+                if (index < length) {
+                    hash += value[index];
+                    hash += (hash << 10);
+                    hash ^= (hash >> 6);
+                }
+
+                hash += (hash << 3);
+                hash ^= (hash >> 11);
+                hash += (hash << 15);
+
+                return (int)HashUInt(hash);
+            }
+
+            /// <summary>
+            /// A generally useful hashing function. Uses no state.
+            /// Hash a 32-bit value to get a much more randomized
+            /// 32-bit value.
+            /// </summary>
+            private static uint HashUInt(uint u) {
+                // Randomize the hash value further by multiplying by a large prime,
+                // then adding the hi and lo DWORDs of the 64-bit result together. This
+                // produces an excellent randomization very efficiently.
+
+                ulong l = (ulong)u * (ulong)0x7ff19519;  // this number is prime.
+                return (uint)l + (uint)(l >> 32);
+            }
+
+            #region IEqualityComparer Members
+            bool IEqualityComparer.Equals(object a, object b) {
+                Debug.Assert(a != null && b != null);
+                Debug.Assert(b is Name || a is Name);
+                Debug.Assert(a != b);
+
+                if (!(b is Name)) {
+                    object temp = b;
+                    b = a;
+                    a = temp;
+                }
+
+                StringBuilder sba = a as StringBuilder;
+                string sb = b.ToString();
+                if (sba != null) {
+
+                    int diff = sba.Length - sb.Length;
+                    for (int i = 0; diff == 0 && i < sb.Length; i += 1) {
+                        diff = sba[i] - sb[i];
+                        i += 1;
+                    }
+
+                    return (diff == 0);
+                }
+                else {
+                    string sa = a.ToString();
+
+                    int diff = sa.Length - sb.Length;
+                    for (int i = 0; diff == 0 && i < sb.Length; i += 1) {
+                        diff = sa[i] - sb[i];
+                        i += 1;
+                    }
+
+                    return (diff == 0);
+                }
+            }
+
+            int IEqualityComparer.GetHashCode(object obj) {
+                Name n = obj as Name;
+                if (n != null) {
+                    return n.GetHashCode();
+                }
+                else {
+                    StringBuilder sb = obj as StringBuilder;
+                    if (sb != null) {
+                        return Hash(sb);
+                    }
+                    else {
+                        return Hash((string)obj);
+                    }
+                }
+            }
+            #endregion
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/ParseError.cs b/src/Core/Compiler/Parser/ParseError.cs
new file mode 100644
index 000000000..655f5eb8f
--- /dev/null
+++ b/src/Core/Compiler/Parser/ParseError.cs
@@ -0,0 +1,51 @@
+// ParserError.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Parser {
+
+    internal sealed class ParseError {
+
+        private ParseError() {
+        }
+
+        public static readonly Error UnexpectedEndOfFile = new Error(300, 0, "Unexpected end of file found");
+        public static readonly Error TokenExpected = new Error(301, 0, "Syntax error: '{0}' expected");
+        public static readonly Error TypeQualifierExpected = new Error(302, 0, "'class', 'struct', 'interface' or 'delegate' expected");
+        public static readonly Error DuplicateModifier = new Error(303, 0, "Duplicate '{0}' flags");
+        public static readonly Error DuplicateParameterModifier = new Error(304, 0, "More than one parameter flags");
+        public static readonly Error TokenUnexpected = new Error(305, 0, "Syntax error: '{0}' unexpected");
+        public static readonly Error OverloadableOperatorExpected = new Error(306, 0, "Overloadable operator expected");
+        public static readonly Error DuplicateAccessor = new Error(307, 0, "Duplicate '{0}' accessor");
+        public static readonly Error GetOrSetExpected = new Error(308, 0, "'get' or 'set' expected");
+        public static readonly Error AddOrRemoveExpected = new Error(309, 0, "'add' or 'remove' expected");
+        public static readonly Error NeedAtLeastOneAccessor = new Error(310, 0, "Property or indexer declaration must contain at least one accessor");
+        public static readonly Error CaseOrDefaultExpected = new Error(311, 0, "'case' or 'default' expected");
+        public static readonly Error StatementExpected = new Error(312, 0, "statement expected");
+        public static readonly Error ExpressionExpected = new Error(313, 0, "expression expected");
+        public static readonly Error BadEnumBase = new Error(314, 0, "Type byte, short, int, long, sbyte, ushort, uint or ulong expected");
+        public static readonly Error ArrayOfVoidType = new Error(315, 0, "'void' is not a valid array element type");
+        public static readonly Error InvalidModifier = new Error(316, 0, "The flags '{0}' is not valid on this declaration");
+        public static readonly Error InvalidAttributeTarget = new Error(317, 0, "'{0}' is not a valid attribute target");
+        public static readonly Error FixedVariablesMustBeOfPointerType = new Error(318, 0, "Variables declared in a fixed statement must be of pointer type");
+        public static readonly Error FixedDeclaratorsMustHaveValue = new Error(319, 0, "Variables declared in a fixed statement must be initialized");
+        public static readonly Error UsingDeclaratorsMustHaveValue = new Error(320, 0, "Variables declared in a using statement must be initialized");
+        public static readonly Error ExpressionStatementMustDoWork = new Error(321, 0, "Expression statement must do work");
+        public static readonly Error VariableCannotBeInterfaceImpl = new Error(322, 0, "A variable may not be an explicit interface implementation");
+        public static readonly Error EventMissingAcessor = new Error(323, 0, "An event must have both an 'add' and a remove 'accessor'");
+        public static readonly Error ConversionMustHaveOneParam = new Error(324, 0, "A conversion operator must have exactly 1 formal parameter");
+        public static readonly Error WrongNumberOfArgsToUnaryOperator = new Error(325, 0, "Operator must have exactly 1 formal parameter");
+        public static readonly Error WrongNumberOfArgsToBinnaryOperator = new Error(326, 0, "Operator must have exactly 2 formal parameter");
+        public static readonly Error WrongNumberOfArgsToOperator = new Error(327, 0, "Operator must have exactly 1 or 2 formal parameter");
+        public static readonly Error BadBaseExpression = new Error(328, 0, "A 'base' expression must be the first element in either a member access expression or an element access expression");
+        public static readonly Error PartialMustBeLastModifier = new Error(329, 0, "'partial' must appear immediately before the 'class', 'struct' or 'interface' keyword.");
+        public static readonly Error DuplicateConstructorConstraint = new Error(330, 0, "Duplicate constructor constraint");
+        public static readonly Error ConstructorConstraintMustBeLast = new Error(331, 0, "Constructor constraint must be last");
+        public static readonly Error UseDotInsteadOfColonColon = new Error(332, 0, "Use '.' instead of '::' for member access");
+        public static readonly Error EventCannotBeGeneric = new Error(333, 0, "Event declarations cannot be generic");
+        public static readonly Error VoidNotType = new Error(334, 0, "'void' is not a valid type");
+    }
+}
diff --git a/src/Core/Compiler/Parser/Parser.cs b/src/Core/Compiler/Parser/Parser.cs
new file mode 100644
index 000000000..28c8badd0
--- /dev/null
+++ b/src/Core/Compiler/Parser/Parser.cs
@@ -0,0 +1,2694 @@
+// Parser.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.CodeModel;
+using AttributeTargets = ScriptSharp.CodeModel.AttributeTargets;
+
+namespace ScriptSharp.Parser {
+
+    internal sealed class Parser {
+
+        private Token[] tokens;
+        private int iToken;
+        private BufferPosition lastErrorPosition;
+        private NameTable symbolTable;
+        private string _path;
+
+        //
+        // some handy predefined names
+        //
+        private readonly Name assemblyName;
+        private readonly Name moduleName;
+        private readonly Name unknownName;
+        private readonly Name getName;
+        private readonly Name setName;
+        private readonly Name addName;
+        private readonly Name removeName;
+        private readonly Name partialName;
+        private readonly Name yieldName;
+        private readonly Name whereName;
+        private readonly Name aliasName;
+
+        public Parser(NameTable symbolTable, string path) {
+            this.symbolTable = symbolTable;
+            _path = path;
+
+            assemblyName = symbolTable.Add("assembly");
+            moduleName = symbolTable.Add("module");
+            unknownName = symbolTable.Add("__unknown");
+            getName = symbolTable.Add("get");
+            setName = symbolTable.Add("set");
+            addName = symbolTable.Add("add");
+            removeName = symbolTable.Add("remove");
+            partialName = symbolTable.Add("partial");
+            yieldName = symbolTable.Add("yield");
+            whereName = symbolTable.Add("where");
+            aliasName = symbolTable.Add("alias");
+        }
+
+        /// <summary>
+        /// Parses an array of C# tokens. Subscribe to the OnError event before
+        /// calling Parse to receive errors while Parsing.
+        /// </summary>
+        public CompilationUnitNode Parse(Token[] tokens) {
+            this.tokens = tokens;
+
+            iToken = 0;
+            lastErrorPosition.Column = -1;
+
+            return ParseCompilationUnit();
+        }
+
+        public event ErrorEventHandler OnError;
+
+        private void ReportError(Error error, Token token, params object[] args) {
+            BufferPosition newPosition = token.Position;
+            if (OnError != null && lastErrorPosition != newPosition) {
+                OnError(this, new ErrorEventArgs(error, newPosition, args));
+            }
+            lastErrorPosition = newPosition;
+        }
+
+        private void ReportError(Error error, params object[] args) {
+            ReportError(error, PeekToken(), args);
+        }
+
+        private void ReportTokenExpectedError(TokenType type) {
+            ReportError(ParseError.TokenExpected, Token.GetString(type));
+        }
+
+        private void ReportUnexpectedError(TokenType type) {
+            ReportError(ParseError.TokenUnexpected, Token.GetString(type));
+        }
+
+        private bool CheckType(TokenType type) {
+            if (PeekType() == type) {
+                return true;
+            }
+            else {
+                ReportTokenExpectedError(type);
+                return false;
+            }
+        }
+
+        private Token Eat(TokenType type) {
+            if (PeekType() == type) {
+                return NextToken();
+            }
+            else {
+                ReportTokenExpectedError(type);
+                return ErrorToken();
+            }
+        }
+
+        private Token EatOpt(TokenType type) {
+            if (PeekType() == type) {
+                return NextToken();
+            }
+            else {
+                return null;
+            }
+        }
+
+        private Token ErrorToken() {
+            return new Token(TokenType.Error, _path, PeekToken().Position);
+        }
+
+        private Token PeekToken() {
+            return PeekToken(0);
+        }
+
+        private Token PeekToken(int index) {
+            int skippedTokens = 0;
+            int i = 0;
+            while (skippedTokens < index) {
+                Debug.Assert(tokens[iToken + i].Type != TokenType.Comment);
+                i += 1;
+                while (tokens[iToken + i].Type == TokenType.Comment) {
+                    i += 1;
+                }
+                skippedTokens += 1;
+            }
+            Debug.Assert(tokens[iToken + i].Type != TokenType.Comment);
+
+            return tokens[iToken + i];
+        }
+
+        private TokenType PeekType() {
+            return PeekToken().Type;
+        }
+
+        private TokenType PeekType(int index) {
+            return PeekToken(index).Type;
+        }
+
+        private Token NextToken() {
+            Token token = tokens[iToken++];
+            Debug.Assert(token.Type != TokenType.Comment);
+            while (iToken < tokens.Length && tokens[iToken].Type == TokenType.Comment) {
+                iToken++;
+            }
+            return token;
+        }
+
+        private int Mark() {
+            return iToken;
+        }
+
+        private void Rewind(int mark) {
+            iToken = mark;
+        }
+
+        private CompilationUnitNode ParseCompilationUnit() {
+            CompilationUnitNode tree
+                = new CompilationUnitNode(
+                    Eat(TokenType.BOF),
+                    ParseExternAliases(),
+                    ParseUsingClauses(),
+                    ParseGlobalAttributes(),
+                    ParseNamespaceMembers()
+                    );
+            Eat(TokenType.EOF);
+
+            return tree;
+        }
+
+        private ParseNodeList ParseExternAliases() {
+            ParseNodeList list = new ParseNodeList();
+            Token token;
+            while (null != (token = EatOpt(TokenType.Extern))) {
+                EatContextualKeyword(aliasName);
+                list.Append(
+                        new ExternAliasNode(
+                            token,
+                            ParseIdentifier()));
+                Eat(TokenType.Semicolon);
+            }
+
+            return list;
+        }
+
+        // using-directives
+        private ParseNodeList ParseUsingClauses() {
+            ParseNodeList list = new ParseNodeList();
+            while (PeekType() == TokenType.Using) {
+                Token token = Eat(TokenType.Using);
+                if (PeekType() == TokenType.Identifier && PeekType(1) == TokenType.Equal) {
+                    // using-alias-directive
+                    AtomicNameNode name = ParseIdentifier();
+                    Eat(TokenType.Equal);
+                    list.Append(
+                            new UsingAliasNode(
+                                token,
+                                name,
+                                ParseNamespaceOrTypeName()));
+                }
+                else {
+                    // using-namespace-directive
+                    list.Append(
+                            new UsingNamespaceNode(
+                                token,
+                                ParseNamespaceOrTypeName()));
+                }
+                Eat(TokenType.Semicolon);
+            }
+
+            return list;
+        }
+
+        // identifier
+        private AtomicNameNode ParseIdentifier() {
+            if (CheckType(TokenType.Identifier)) {
+                return new AtomicNameNode((IdentifierToken)Eat(TokenType.Identifier));
+            }
+            else {
+                return new AtomicNameNode(new IdentifierToken(unknownName, false, _path, PeekToken().Position));
+            }
+        }
+
+        private NameNode ParseSimpleName(bool inExpression) {
+            if (CheckType(TokenType.Identifier)) {
+                IdentifierToken name = (IdentifierToken)Eat(TokenType.Identifier);
+
+                int mark = Mark();
+                TypeArgumentListScan scan = ScanTypeArgumentListOpt();
+                if (scan == TypeArgumentListScan.MayBeTypeArgumentList) {
+                    if (inExpression) {
+                        switch (PeekType()) {
+                            case TokenType.OpenParen:
+                            case TokenType.CloseParen:
+                            case TokenType.CloseSquare:
+                            case TokenType.CloseAngle:
+                            case TokenType.Colon:
+                            case TokenType.Comma:
+                            case TokenType.Semicolon:
+                            case TokenType.Dot:
+                            case TokenType.Question:
+                                scan = TypeArgumentListScan.MustBeTypeArgumentList;
+                                break;
+                            default:
+                                scan = TypeArgumentListScan.NotTypeArgumentList;
+                                break;
+                        }
+                    }
+                    else {
+                        scan = TypeArgumentListScan.MustBeTypeArgumentList;
+                    }
+                }
+                Rewind(mark);
+                if (scan == TypeArgumentListScan.MustBeTypeArgumentList)
+                    return new GenericNameNode(name, ParseTypeArgumentList());
+                else
+                    return new AtomicNameNode(name);
+            }
+            else {
+                return new AtomicNameNode(new IdentifierToken(unknownName, false, _path, PeekToken().Position));
+            }
+        }
+
+        private ParseNodeList ParseTypeArgumentList() {
+            ParseNodeList returnValue = new ParseNodeList();
+            Eat(TokenType.OpenAngle);
+            do {
+                returnValue.Append(ParseType());
+            } while (null != EatOpt(TokenType.Comma));
+            Eat(TokenType.CloseAngle);
+            return returnValue;
+        }
+
+        private enum TypeArgumentListScan {
+            MustBeTypeArgumentList,
+            MayBeTypeArgumentList,
+            TypeParameterList,
+            NotTypeArgumentList,
+        }
+
+        private TypeArgumentListScan ScanTypeArgumentListOpt() {
+            if (PeekType() != TokenType.OpenAngle)
+                return TypeArgumentListScan.NotTypeArgumentList;
+            NextToken();
+
+            Token token;
+            bool couldBeParamList = true;
+            do {
+                if (PeekType() == TokenType.OpenSquare)
+                    return TypeArgumentListScan.TypeParameterList;
+
+                if (PeekType() != TokenType.Identifier || (PeekType(1) != TokenType.Comma && PeekType(1) != TokenType.CloseAngle))
+                    couldBeParamList = false;
+
+                switch (ScanType()) {
+                    case SCAN.COULD_BE_TYPE:
+                    case SCAN.TYPE:
+                        break;
+                    case SCAN.NOTTYPE:
+                    case SCAN.POINTER_OR_MULT:
+                        return TypeArgumentListScan.NotTypeArgumentList;
+                    default:
+                        Debug.Fail("bad scan result");
+                        return TypeArgumentListScan.NotTypeArgumentList;
+                }
+            } while (null != (token = EatOpt(TokenType.Comma)));
+
+            if (PeekType() != TokenType.CloseAngle)
+                return TypeArgumentListScan.NotTypeArgumentList;
+            NextToken();
+
+            return couldBeParamList ? TypeArgumentListScan.MayBeTypeArgumentList : TypeArgumentListScan.MustBeTypeArgumentList;
+        }
+
+        // qualified-name
+        private NameNode ParseMultiPartName() {
+            Token token = PeekToken();
+            NameNode name = ParseIdentifier();
+            if (PeekType() == TokenType.Dot && PeekType(1) == TokenType.Identifier) {
+                ParseNodeList list = new ParseNodeList(name);
+                do {
+                    Eat(TokenType.Dot);
+                    list.Append(ParseIdentifier());
+                }
+                while (PeekType() == TokenType.Dot && PeekType(1) == TokenType.Identifier);
+
+                return new MultiPartNameNode(token, list);
+            }
+            else {
+                return name;
+            }
+        }
+
+        // alias-qualified-name
+        private NameNode ParseAliasQualifiedName(bool inExpression) {
+            NameNode name = ParseSimpleName(inExpression);
+
+            if (name.nodeType == ParseNodeType.Name && PeekType() == TokenType.ColonColon) {
+                NextToken();
+                name = new AliasQualifiedNameNode((AtomicNameNode)name, ParseSimpleName(inExpression));
+            }
+            return name;
+        }
+
+        private void EatDotOrColonColon() {
+            if (PeekType() == TokenType.ColonColon)
+                ReportError(ParseError.UseDotInsteadOfColonColon);
+            Eat(TokenType.Dot);
+        }
+
+        // namespace-or-type-name
+        private NameNode ParseNamespaceOrTypeName() {
+            Token token = PeekToken();
+            NameNode name = ParseAliasQualifiedName(false);
+
+            if ((PeekType() == TokenType.Dot || PeekType() == TokenType.ColonColon) && PeekType(1) == TokenType.Identifier) {
+                ParseNodeList list = new ParseNodeList(name);
+                do {
+                    EatDotOrColonColon();
+                    list.Append(ParseSimpleName(false));
+                }
+                while (PeekType() == TokenType.Dot && PeekType(1) == TokenType.Identifier);
+
+                return new MultiPartNameNode(token, list);
+            }
+            else {
+                return name;
+            }
+        }
+
+        // namespace-member-declarations
+        private ParseNodeList ParseNamespaceMembers() {
+            ParseNodeList list = new ParseNodeList();
+            while (true) {
+                TokenType type = PeekType();
+                switch (type) {
+                    case TokenType.Namespace:
+                        list.Append(ParseNamespace());
+                        break;
+
+                    case TokenType.Class:
+                    case TokenType.Interface:
+                    case TokenType.Enum:
+                    case TokenType.Delegate:
+                    case TokenType.Struct:
+
+                    case TokenType.Abstract:
+                    case TokenType.Sealed:
+
+                    case TokenType.Public:
+                    case TokenType.Internal:
+                    case TokenType.Private:
+                    case TokenType.Protected:
+
+                    case TokenType.New:
+                    case TokenType.Virtual:
+                    case TokenType.Static:
+                    case TokenType.Readonly:
+                    case TokenType.Extern:
+                    case TokenType.Override:
+                    case TokenType.Unsafe:
+
+                    case TokenType.OpenSquare:
+                        list.Append(ParseTypeDeclaration());
+                        break;
+
+                    case TokenType.Identifier:
+                        if (PeekPartial())
+                            goto case TokenType.Class;
+                        goto default;
+
+                    default:
+                        return list;
+                }
+            }
+        }
+
+        // namespace-declaration
+        private NamespaceNode ParseNamespace() {
+            Token token = Eat(TokenType.Namespace);
+            NameNode name = ParseMultiPartName();
+
+            // namespace-body
+            Eat(TokenType.OpenCurly);
+            ParseNodeList externAliases = ParseExternAliases();
+            ParseNodeList usingClauses = ParseUsingClauses();
+            ParseNodeList members = ParseNamespaceMembers();
+            Eat(TokenType.CloseCurly);
+
+            EatOpt(TokenType.Semicolon);
+
+            return new NamespaceNode(token, name, externAliases, usingClauses, members);
+        }
+
+        // type-declaration
+        private TypeNode ParseTypeDeclaration() {
+            Token token = PeekToken();
+            ParseNodeList attributes = ParseAttributes();
+            Modifiers modifiers = ParseTypeModifiers();
+            switch (PeekType()) {
+                case TokenType.Class:
+                    return ParseTypeDeclaration(token, attributes, CheckModifiers(Modifiers.ClassModifiers, modifiers));
+                case TokenType.Struct:
+                    return ParseTypeDeclaration(token, attributes, CheckModifiers(Modifiers.StructModifiers, modifiers));
+                case TokenType.Interface:
+                    return ParseTypeDeclaration(token, attributes, CheckModifiers(Modifiers.InterfaceModifiers, modifiers));
+                case TokenType.Enum:
+                    return ParseTypeDeclaration(token, attributes, CheckModifiers(Modifiers.EnumModifiers, modifiers));
+
+                case TokenType.Delegate:
+                    NextToken();
+                    return ParseDelegate(token, attributes, CheckModifiers(Modifiers.DelegateModifiers, modifiers));
+            }
+
+            ReportError(ParseError.TypeQualifierExpected);
+            return null;
+        }
+
+        private TypeNode ParseTypeDeclaration(Token token, ParseNodeList attributes, Modifiers modifiers) {
+            TokenType type = PeekType();
+            NextToken();
+            if (type == TokenType.Enum) {
+                return new CustomTypeNode(
+                                token,
+                                type,
+                                attributes,
+                                modifiers,
+                                ParseIdentifier(),
+                                new ParseNodeList(),
+                                ParseBaseList(true),
+                                new ParseNodeList(),
+                                ParseEnumBody());
+            }
+            else {
+                return new CustomTypeNode(
+                                token,
+                                type,
+                                attributes,
+                                modifiers,
+                                ParseIdentifier(),
+                                ParseTypeParametersOpt(),
+                                ParseBaseList(false),
+                                ParseConstraintClauses(),
+                                ParseClassOrStructBody());
+            }
+        }
+
+        private ParseNodeList ParseTypeParametersOpt() {
+            ParseNodeList returnValue = new ParseNodeList();
+            if (PeekType() == TokenType.OpenAngle) {
+                Eat(TokenType.OpenAngle);
+
+                do {
+                    returnValue.Append(ParseTypeParameter());
+                } while (null != EatOpt(TokenType.Comma));
+
+                Eat(TokenType.CloseAngle);
+            }
+            return returnValue;
+        }
+
+        private TypeParameterNode ParseTypeParameter() {
+            return new TypeParameterNode(ParseAttributes(), ParseIdentifier());
+        }
+
+        private TypeParameterConstraintNode ParseConstraintClause() {
+            EatWhere();
+            AtomicNameNode name = ParseIdentifier();
+            Eat(TokenType.Colon);
+
+            bool hasConstructorConstraint = false;
+            ParseNodeList typeConstraints = new ParseNodeList();
+            do {
+                if (PeekType() == TokenType.New) {
+                    if (hasConstructorConstraint)
+                        ReportError(ParseError.DuplicateConstructorConstraint);
+
+                    hasConstructorConstraint = true;
+
+                    Eat(TokenType.New);
+                    Eat(TokenType.OpenParen);
+                    Eat(TokenType.CloseParen);
+                }
+                else {
+                    if (hasConstructorConstraint)
+                        ReportError(ParseError.ConstructorConstraintMustBeLast);
+
+                    typeConstraints.Append(ParseNamespaceOrTypeName());
+                }
+
+            } while (null != EatOpt(TokenType.Comma));
+
+            return new TypeParameterConstraintNode(name, typeConstraints, hasConstructorConstraint);
+        }
+
+        private ParseNodeList ParseConstraintClauses() {
+            ParseNodeList returnValue = new ParseNodeList();
+            while (PeekWhere()) {
+                returnValue.Append(ParseConstraintClause());
+            }
+
+            return returnValue;
+        }
+
+        // UNDONE use an array of TID's here instead
+        private static string[] modifierNames =
+            new string[] {
+                "abstract",
+                "sealed",
+
+                "public",
+                "internal",
+                "private",
+                "protected",
+
+                "new",
+                "virtual",
+                "static",
+                "readonly",
+                "extern",
+                "override",
+                "unsafe",
+            };
+
+        private Modifiers CheckModifiers(Modifiers validModifiers, Modifiers modifiers) {
+            // check for invalidModifiers
+            Modifiers invalidModifiers = (modifiers & ~validModifiers);
+            if (invalidModifiers != 0) {
+                for (int index = 0; invalidModifiers != 0; index += 1, invalidModifiers = (Modifiers)(((int)invalidModifiers) >> 1)) {
+                    if ((1 & (int)invalidModifiers) != 0) {
+                        ReportError(ParseError.InvalidModifier, modifierNames[index]);
+                    }
+                }
+
+                modifiers &= validModifiers;
+            }
+
+            return modifiers;
+        }
+
+        private AttributeTargets CheckAttributeTargets(Token token) {
+            switch (token.ToString()) {
+                case "assembly": return AttributeTargets.Assembly;
+                case "field": return AttributeTargets.Field;
+                case "event": return AttributeTargets.Event;
+                case "method": return AttributeTargets.Method;
+                case "module": return AttributeTargets.Module;
+                case "param": return AttributeTargets.Param;
+                case "property": return AttributeTargets.Property;
+                case "return": return AttributeTargets.Return;
+                case "type": return AttributeTargets.Type;
+                default:
+                    ReportError(ParseError.InvalidAttributeTarget, token, token.ToString());
+                    return 0;
+            }
+        }
+
+        private bool PeekModifier(out Modifiers modifier) {
+            modifier = ToModifier(PeekType());
+            return modifier != Modifiers.None;
+        }
+
+        private bool PeekModifier() {
+            Modifiers modifier;
+            return PeekModifier(out modifier);
+        }
+
+        private Modifiers ParseModifiers() {
+            Modifiers modifiers = 0;
+            Modifiers newModifier;
+
+            while (PeekModifier(out newModifier)) {
+                if ((newModifier & modifiers) != 0) {
+                    ReportError(ParseError.DuplicateModifier, Token.GetString(PeekType()));
+                }
+                else {
+                    modifiers |= newModifier;
+                }
+                NextToken();
+            }
+
+            return modifiers;
+        }
+
+        private bool PeekPostPartial() {
+            switch (PeekType(1)) {
+                case TokenType.Class:
+                case TokenType.Struct:
+                case TokenType.Interface:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        private bool PeekPartial() {
+            return PeekContextualKeyword(partialName) && PeekPostPartial();
+        }
+
+        private bool PeekWhere() {
+            return PeekContextualKeyword(whereName);
+        }
+
+        private bool PeekYield() {
+            return PeekContextualKeyword(yieldName);
+        }
+
+        private IdentifierToken EatYield() {
+            return EatContextualKeyword(yieldName);
+        }
+
+        private bool PeekContextualKeyword(Name contextualKeyword) {
+            return PeekType() == TokenType.Identifier && ((IdentifierToken)PeekToken()).Symbol == contextualKeyword;
+        }
+
+        private IdentifierToken EatWhere() {
+            return EatContextualKeyword(whereName);
+        }
+
+        private IdentifierToken EatPartial() {
+            return EatContextualKeyword(partialName);
+        }
+
+        private IdentifierToken EatContextualKeyword(Name contextualKeyword) {
+            IdentifierToken token = (IdentifierToken)Eat(TokenType.Identifier);
+            Debug.Assert(token.Symbol == contextualKeyword);
+            return token;
+        }
+
+        private Modifiers ParseTypeModifiers() {
+            Modifiers modifiers = ParseModifiers();
+            if (PeekPartial()) {
+                EatPartial();
+                modifiers |= Modifiers.Partial;
+            }
+            return modifiers;
+        }
+
+        private static Modifiers ToModifier(TokenType type) {
+            switch (type) {
+                case TokenType.Abstract: return Modifiers.Abstract;
+                case TokenType.Sealed: return Modifiers.Sealed;
+
+                case TokenType.Public: return Modifiers.Public;
+                case TokenType.Internal: return Modifiers.Internal;
+                case TokenType.Private: return Modifiers.Private;
+                case TokenType.Protected: return Modifiers.Protected;
+
+                case TokenType.New: return Modifiers.New;
+                case TokenType.Virtual: return Modifiers.Virtual;
+                case TokenType.Static: return Modifiers.Static;
+                case TokenType.Readonly: return Modifiers.Readonly;
+                case TokenType.Extern: return Modifiers.Extern;
+                case TokenType.Override: return Modifiers.Override;
+                case TokenType.Unsafe: return Modifiers.Unsafe;
+                case TokenType.Volatile: return Modifiers.Volatile;
+
+                default: return Modifiers.None;
+            }
+        }
+
+        private ParseNodeList ParseBaseList(bool isEnum) {
+            ParseNodeList list = new ParseNodeList();
+            if (PeekType() == TokenType.Colon) {
+                NextToken();
+                if (isEnum) {
+                    switch (PeekType()) {
+                        case TokenType.SByte:
+                        case TokenType.Short:
+                        case TokenType.Int:
+                        case TokenType.Long:
+                        case TokenType.Byte:
+                        case TokenType.UShort:
+                        case TokenType.UInt:
+                        case TokenType.ULong:
+                            list = new ParseNodeList(ParsePredefinedType());
+                            break;
+                        default:
+                            this.ReportError(ParseError.BadEnumBase);
+                            break;
+                    }
+                }
+                else {
+                    switch (PeekType()) {
+                        case TokenType.Object:
+                        case TokenType.String:
+                            list.Append(ParsePredefinedType());
+                            if (null == EatOpt(TokenType.Comma)) {
+                                return list;
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+
+                    do {
+                        list.Append(ParseNamespaceOrTypeName());
+                    } while (null != EatOpt(TokenType.Comma));
+                }
+            }
+
+            return list;
+        }
+
+        private ParseNode ParseBaseType() {
+            ParseNode tree = ParsePredefinedType();
+            if (tree == null) {
+                tree = ParseNamespaceOrTypeName();
+            }
+            return tree;
+        }
+
+        private ParseNode ParsePredefinedType() {
+            if (Token.IsPredefinedType(PeekType())) {
+                IntrinsicTypeNode typeNode = new IntrinsicTypeNode(NextToken());
+
+                // NOTE: We aren't supporting Nullable<T> for arbitrary T types
+                //       since users can't create their own value types...
+                //       So handling here for predefined types takes care of
+                //       Nullable<T> scenarios
+
+                Token t = PeekToken();
+                if (t.Type == TokenType.Question) {
+                    NextToken();
+                    typeNode.AddNullability();
+                }
+
+                return typeNode;
+            }
+            else {
+                return null;
+            }
+        }
+
+        private ParseNodeList ParseGlobalAttributes() {
+            ParseNodeList list = new ParseNodeList();
+
+            while (PeekType() == TokenType.OpenSquare &&
+                   PeekType(1) == TokenType.Identifier &&
+                   PeekType(2) == TokenType.Colon &&
+                   (((IdentifierToken)PeekToken(1)).Symbol == assemblyName ||
+                    ((IdentifierToken)PeekToken(1)).Symbol == moduleName)) {
+                list.Append(ParseAttributeBlock());
+            }
+
+            return list;
+        }
+
+        private ParseNodeList ParseAttributes() {
+            ParseNodeList list = new ParseNodeList();
+
+            while (PeekType() == TokenType.OpenSquare) {
+                list.Append(ParseAttributeBlock());
+            }
+
+            return list;
+        }
+
+        private ParseNode ParseAttributeBlock() {
+            Token token = Eat(TokenType.OpenSquare);
+            AttributeTargets location;
+            if (PeekType() <= TokenType.Identifier && PeekType(1) == TokenType.Colon) {
+                location = CheckAttributeTargets(NextToken());
+                Eat(TokenType.Colon);
+            }
+            else {
+                location = 0;
+            }
+
+            ParseNodeList list = new ParseNodeList();
+            do {
+                list.Append(ParseAttribute());
+            } while ((null != EatOpt(TokenType.Comma)) && (PeekType() != TokenType.CloseSquare));
+            Eat(TokenType.CloseSquare);
+
+            return new AttributeBlockNode(
+                        token,
+                        location,
+                        list);
+        }
+
+        private ParseNode ParseAttribute() {
+            NameNode name = ParseNamespaceOrTypeName();
+            ParseNode arguments;
+
+            if (PeekType() == TokenType.OpenParen) {
+                Eat(TokenType.OpenParen);
+                arguments = ParseExpressionList(TokenType.CloseParen);
+                Eat(TokenType.CloseParen);
+            }
+            else {
+                arguments = null;
+            }
+
+            return new AttributeNode(name, arguments);
+        }
+
+        private ParseNodeList ParseClassOrStructMembers() {
+            ParseNodeList list = new ParseNodeList();
+            TokenType type = PeekType();
+            while (type != TokenType.CloseCurly && type != TokenType.EOF) {
+                int mark = Mark();
+                list.Append(ParseClassOrStructMember());
+                if (mark == Mark()) {
+                    // didn't consume any tokens!
+                    // ensure we make some progress
+                    NextToken();
+                }
+                type = PeekType();
+            }
+            return list;
+        }
+
+        private ParseNodeList ParseClassOrStructBody() {
+            Eat(TokenType.OpenCurly);
+            ParseNodeList members = ParseClassOrStructMembers();
+            Eat(TokenType.CloseCurly);
+            EatOpt(TokenType.Semicolon);
+
+            return members;
+        }
+
+        private TypeNode ParseNestedType(Token token, ParseNodeList attributes, Modifiers modifiers) {
+            switch (PeekType()) {
+                case TokenType.Delegate:
+                    NextToken();
+                    return ParseDelegate(token, attributes, CheckModifiers(Modifiers.DelegateModifiers, modifiers));
+                case TokenType.Class:
+                    return ParseTypeDeclaration(token, attributes, CheckModifiers(Modifiers.ClassModifiers, modifiers));
+                case TokenType.Struct:
+                    return ParseTypeDeclaration(token, attributes, CheckModifiers(Modifiers.StructModifiers, modifiers));
+                case TokenType.Enum:
+                    return ParseTypeDeclaration(token, attributes, CheckModifiers(Modifiers.EnumModifiers, modifiers));
+                case TokenType.Interface:
+                    return ParseTypeDeclaration(token, attributes, CheckModifiers(Modifiers.InterfaceModifiers, modifiers));
+                default:
+                    Debug.Fail("Bad token type");
+                    return null;
+            }
+        }
+
+        private ParseNode ParseClassOrStructMember() {
+            Token token = PeekToken();
+            ParseNodeList attributes = ParseAttributes();
+            Modifiers modifiers = ParseModifiers();
+            switch (PeekType()) {
+                case TokenType.Const:
+                    NextToken();
+                    return new ConstantFieldDeclarationNode(
+                                token,
+                                attributes,
+                                CheckModifiers(Modifiers.ConstantModifiers, modifiers),
+                                ParseType(),
+                                ParseFieldInitializersStatement(false));
+
+                case TokenType.Delegate:
+                case TokenType.Class:
+                case TokenType.Struct:
+                case TokenType.Enum:
+                case TokenType.Interface:
+                    return ParseNestedType(token, attributes, modifiers);
+
+                case TokenType.Event:
+                    return ParseEvent(token, attributes, CheckModifiers(Modifiers.EventModifiers, modifiers));
+
+                case TokenType.Tilde:
+                    return ParseDestructor(token, attributes, CheckModifiers(Modifiers.DestructorModifiers, modifiers));
+
+                case TokenType.Implicit:
+                case TokenType.Explicit:
+                    return ParseConversionOperator(token, attributes, CheckModifiers(Modifiers.OperatorModifiers, modifiers));
+
+                case TokenType.Identifier:
+                    if (PeekType(1) == TokenType.OpenParen) {
+                        return ParseConstructor(token, attributes, CheckModifiers(0 != (modifiers & Modifiers.Static) ? Modifiers.StaticConstructorModifiers : Modifiers.ConstructorModifiers, modifiers));
+                    }
+                    else if (PeekPartial()) {
+                        EatPartial();
+                        modifiers |= Modifiers.Partial;
+                        goto case TokenType.Class;
+                    }
+                    goto default;
+
+                case TokenType.Fixed:
+                    Eat(TokenType.Fixed);
+                    return new FieldDeclarationNode(
+                        token,
+                        attributes,
+                        CheckModifiers(Modifiers.FieldModifiers, modifiers),
+                        CheckIsType(ParseReturnType(), false),
+                        ParseFieldInitializersStatement(true),
+                        true);
+
+                default: {
+                        ParseNode type = ParseReturnType();
+                        NameNode interfaceType;
+                        switch (ParseMemberName(out interfaceType)) {
+                            case ScanMemberNameKind.Operator:
+                                return ParseOperator(token, attributes, CheckModifiers(Modifiers.OperatorModifiers, modifiers), CheckIsType(type, false));
+
+                            case ScanMemberNameKind.Indexer:
+                                return ParseIndexer(token, attributes, CheckModifiers(Modifiers.IndexerModifiers, modifiers), CheckIsType(type, false), interfaceType);
+
+                            case ScanMemberNameKind.Field:
+                                ReportInterfaceVariable(interfaceType);
+                                return new FieldDeclarationNode(
+                                    token,
+                                    attributes,
+                                    CheckModifiers(Modifiers.FieldModifiers, modifiers),
+                                    CheckIsType(type, false),
+                                    ParseFieldInitializersStatement(false),
+                                    false);
+                            case ScanMemberNameKind.Method:
+                                return ParseMethod(token, attributes, CheckModifiers(Modifiers.MethodModifiers, modifiers), type, interfaceType);
+                            case ScanMemberNameKind.Property:
+                                return ParseProperty(token, attributes, CheckModifiers(Modifiers.PropertyModifiers, modifiers), CheckIsType(type, false), interfaceType, false);
+                            default:
+                                Debug.Fail("Invalid Member name kind");
+                                return null;
+                        }
+                    }
+            }
+        }
+
+        private void ReportInterfaceVariable(NameNode interfaceType) {
+            if (interfaceType != null) {
+                ReportError(ParseError.VariableCannotBeInterfaceImpl, interfaceType.token);
+            }
+        }
+
+        enum ScanMemberNameKind {
+            Invalid,
+            Method,
+            Property,
+            Indexer,
+            Field,
+            Operator,
+        }
+
+        // this
+        // type-name.this
+        // methodName (
+        // methodName<T> (
+        // typename.methodName (
+        // propertyName {
+        // typename.propertyName {
+        // typename.methodName<[Attr]T> (
+        // fieldName
+        private ScanMemberNameKind ParseMemberName(out NameNode interfaceType) {
+            if (PeekType() == TokenType.Operator) {
+                interfaceType = null;
+                return ScanMemberNameKind.Operator;
+            }
+
+            Token token = PeekToken();
+            ParseNodeList list = new ParseNodeList();
+            if (PeekType() == TokenType.Identifier && PeekType(1) == TokenType.ColonColon) {
+                interfaceType = ParseAliasQualifiedName(false);
+                list.Append(interfaceType);
+                EatDotOrColonColon();
+            }
+            else {
+                interfaceType = null;
+            }
+
+            ScanMemberNameKind result = ScanMemberNameKind.Invalid;
+            do {
+                if (PeekType() == TokenType.This)
+                    result = ScanMemberNameKind.Indexer;
+                else if (PeekType() != TokenType.Identifier)
+                    result = ScanMemberNameKind.Field;
+                else {
+                    switch (PeekType(1)) {
+                        case TokenType.OpenCurly:
+                            result = ScanMemberNameKind.Property;
+                            break;
+                        case TokenType.OpenParen:
+                            result = ScanMemberNameKind.Method;
+                            break;
+                        case TokenType.OpenAngle:
+                            int mark = Mark();
+                            NextToken();        // _id
+                            TypeArgumentListScan scan = ScanTypeArgumentListOpt();
+                            if (scan == TypeArgumentListScan.MayBeTypeArgumentList) {
+                                switch (PeekType()) {
+                                    case TokenType.Dot:
+                                    case TokenType.ColonColon:
+                                        scan = TypeArgumentListScan.MustBeTypeArgumentList;
+                                        break;
+                                    default:
+                                        scan = TypeArgumentListScan.TypeParameterList;
+                                        break;
+                                }
+                            }
+                            Rewind(mark);
+
+                            if (scan == TypeArgumentListScan.TypeParameterList || scan == TypeArgumentListScan.NotTypeArgumentList) {
+                                result = ScanMemberNameKind.Method;
+                                break;
+                            }
+
+                            list.Append(ParseSimpleName(false));
+                            EatDotOrColonColon();
+                            break;
+                        case TokenType.ColonColon:
+                        case TokenType.Dot:
+                            list.Append(ParseSimpleName(false));
+                            EatDotOrColonColon();
+                            break;
+                        default:
+                            result = ScanMemberNameKind.Field;
+                            break;
+                    }
+                }
+            } while (ScanMemberNameKind.Invalid == result);
+
+            if (list.Count > 1)
+                interfaceType = new MultiPartNameNode(token, list);
+
+            return result;
+        }
+
+        private DestructorDeclarationNode ParseDestructor(Token token, ParseNodeList attributes, Modifiers modifiers) {
+            NextToken();    // ~
+            AtomicNameNode name = ParseIdentifier();
+            Eat(TokenType.OpenParen);
+            Eat(TokenType.CloseParen);
+            return new DestructorDeclarationNode(
+                token,
+                attributes,
+                modifiers,
+                name,
+                ParseBlockOpt());
+        }
+
+        private ConstructorDeclarationNode ParseConstructor(Token token, ParseNodeList attributes, Modifiers modifiers) {
+            AtomicNameNode name = ParseIdentifier();
+            ParseNodeList formals = ParseParensFormalParameterList();
+            ParseNode initializer;
+            bool thisCall;
+            if (PeekType() == TokenType.Colon) {
+                Eat(TokenType.Colon);
+                if (PeekType() == TokenType.This) {
+                    thisCall = true;
+                    Eat(TokenType.This);
+                }
+                else {
+                    thisCall = false;
+                    Eat(TokenType.Base);
+                }
+
+                initializer = ParseParenArgumentList();
+            }
+            else {
+                thisCall = false;
+                initializer = null;
+            }
+            BlockStatementNode body = ParseBlockOpt();
+            return new ConstructorDeclarationNode(
+                token,
+                attributes,
+                modifiers,
+                name,
+                formals,
+                thisCall,
+                initializer,
+                body);
+        }
+
+        private OperatorDeclarationNode ParseConversionOperator(Token token, ParseNodeList attributes, Modifiers modifiers) {
+            TokenType implicitExplicit = NextToken().Type;   // implicit/explicit
+            Eat(TokenType.Operator);
+            OperatorDeclarationNode tree = new OperatorDeclarationNode(
+                token,
+                attributes,
+                modifiers,
+                implicitExplicit,
+                ParseType(),
+                ParseParensFormalParameterList(),
+                ParseBlockOpt());
+
+            if (tree.Parameters.Count != 1) {
+                ReportError(ParseError.ConversionMustHaveOneParam, tree.token);
+            }
+
+            return tree;
+        }
+
+        private OperatorDeclarationNode ParseOperator(Token token, ParseNodeList attributes, Modifiers modifiers, ParseNode type) {
+            NextToken();        // operator
+            TokenType operatorKind = EatOverloadableOperator();
+
+            OperatorDeclarationNode tree = new OperatorDeclarationNode(
+                token,
+                attributes,
+                modifiers,
+                operatorKind,
+                type,
+                ParseParensFormalParameterList(),
+                ParseBlockOpt());
+
+            switch (tree.operatorTokenType) {
+                // unary or binary operators
+                case TokenType.Plus:
+                case TokenType.Minus:
+                    if (tree.Parameters.Count != 1 && tree.Parameters.Count != 2) {
+                        ReportError(ParseError.WrongNumberOfArgsToOperator, tree.token);
+                    }
+                    break;
+
+                // unary operators
+                case TokenType.Bang:
+                case TokenType.Tilde:
+                case TokenType.PlusPlus:
+                case TokenType.MinusMinus:
+                case TokenType.True:
+                case TokenType.False:
+                    if (tree.Parameters.Count != 1) {
+                        ReportError(ParseError.WrongNumberOfArgsToUnaryOperator, tree.token);
+                    }
+                    break;
+
+                // binary operators
+                case TokenType.Star:
+                case TokenType.Slash:
+                case TokenType.Percent:
+                case TokenType.Ampersand:
+                case TokenType.Bar:
+                case TokenType.Hat:
+                case TokenType.ShiftLeft:
+                case TokenType.ShiftRight:
+                case TokenType.EqualEqual:
+                case TokenType.NotEqual:
+                case TokenType.Greater:
+                case TokenType.GreaterEqual:
+                case TokenType.Less:
+                case TokenType.LessEqual:
+                    if (tree.Parameters.Count != 2) {
+                        ReportError(ParseError.WrongNumberOfArgsToBinnaryOperator, tree.token);
+                    }
+                    break;
+
+                default:
+                    break;
+            }
+
+            return tree;
+        }
+
+        private MethodDeclarationNode ParseMethod(
+                                            Token token,
+                                            ParseNodeList attributes,
+                                            Modifiers modifiers,
+                                            ParseNode type,
+                                            NameNode interfaceType) {
+            return new MethodDeclarationNode(
+                token,
+                attributes,
+                modifiers,
+                type,
+                interfaceType,
+                ParseIdentifier(),
+                ParseTypeParametersOpt(),
+                ParseParensFormalParameterList(),
+                ParseConstraintClauses(),
+                ParseBlockOpt());
+        }
+
+        private IndexerDeclarationNode ParseIndexer(
+                                            Token token,
+                                            ParseNodeList attributes,
+                                            Modifiers modifiers,
+                                            ParseNode type,
+                                            NameNode interfaceType) {
+            Eat(TokenType.This);
+            Eat(TokenType.OpenSquare);
+            ParseNodeList formals = ParseFormalParameterList(TokenType.CloseSquare);
+            Eat(TokenType.CloseSquare);
+
+            AccessorNode get;
+            AccessorNode set;
+
+            ParseAccessors(false, out get, out set);
+
+            return new IndexerDeclarationNode(
+                        token,
+                        attributes,
+                        modifiers,
+                        type,
+                        interfaceType,
+                        formals,
+                        get,
+                        set);
+        }
+
+        private PropertyDeclarationNode ParseProperty(
+                                            Token token,
+                                            ParseNodeList attributes,
+                                            Modifiers modifiers,
+                                            ParseNode type,
+                                            NameNode interfaceType,
+                                            bool isEvent) {
+            AtomicNameNode name = ParseIdentifier();
+
+            AccessorNode get;
+            AccessorNode set;
+
+            ParseAccessors(isEvent, out get, out set);
+
+            return new PropertyDeclarationNode(
+                        token,
+                        attributes,
+                        modifiers,
+                        type,
+                        interfaceType,
+                        name,
+                        get,
+                        set);
+        }
+
+        private void ParseAccessors(bool isEvent, out AccessorNode get, out AccessorNode set) {
+            get = null;
+            set = null;
+
+            Eat(TokenType.OpenCurly);
+
+            // first accessor
+            Token token = PeekToken();
+            ParseNodeList attributes = ParseAttributes();
+            while (attributes.Count != 0 || PeekType() == TokenType.Identifier || (!isEvent && PeekModifier())) {
+                Modifiers modifiers = 0;
+                if (!isEvent) {
+                    modifiers = ParseModifiers();
+                }
+                AtomicNameNode name = ParseIdentifier();
+                BlockStatementNode body = ParseBlockOpt();
+                if ((name.Identifier.Symbol == getName && !isEvent) ||
+                    (name.Identifier.Symbol == removeName && isEvent)) {
+                    if (get != null) {
+                        ReportError(ParseError.DuplicateAccessor, name.Identifier.Symbol);
+                    }
+                    else {
+                        get = new AccessorNode(token, attributes, name, body, modifiers);
+                    }
+                }
+                else if ((name.Identifier.Symbol == setName && !isEvent) ||
+                         (name.Identifier.Symbol == addName && isEvent)) {
+                    if (set != null) {
+                        ReportError(ParseError.DuplicateAccessor, name.Identifier.Symbol, modifiers);
+                    }
+                    else {
+                        set = new AccessorNode(token, attributes, name, body, modifiers);
+                    }
+                }
+                else {
+                    if (!isEvent)
+                        ReportError(ParseError.GetOrSetExpected);
+                    else
+                        ReportError(ParseError.AddOrRemoveExpected);
+                }
+
+                // next accessor
+                token = PeekToken();
+                attributes = ParseAttributes();
+            }
+
+            if (get == null && set == null) {
+                ReportError(ParseError.NeedAtLeastOneAccessor);
+            }
+            else if (isEvent && (get == null || set == null)) {
+                ReportError(ParseError.EventMissingAcessor);
+            }
+            Eat(TokenType.CloseCurly);
+        }
+
+        private ParseNode ParseEvent(Token token, ParseNodeList attributes, Modifiers modifiers) {
+            ParseNode backingMember;
+            NextToken();    // event
+            ParseNode type = ParseType();
+            NameNode interfaceType;
+            switch (ParseMemberName(out interfaceType)) {
+                case ScanMemberNameKind.Property:
+
+                    backingMember = ParseProperty(token, new ParseNodeList(), modifiers, type, interfaceType, true);
+                    break;
+                case ScanMemberNameKind.Field:
+                default:
+                    ReportInterfaceVariable(interfaceType);
+                    backingMember = new VariableDeclarationNode(
+                                token,
+                                new ParseNodeList(),
+                                modifiers,
+                                type,
+                                ParseFieldInitializersStatement(false),
+                                false);
+                    break;
+            }
+
+            return new EventDeclarationNode(
+                        token,
+                        attributes,
+                        backingMember);
+        }
+
+        private ParseNodeList ParseFieldInitializers(bool isFixed) {
+            ParseNodeList list = new ParseNodeList();
+            do {
+                if (!isFixed)
+                    list.Append(new VariableInitializerNode(ParseIdentifier(), ParseVariableInitializer()));
+                else
+                    list.Append(new VariableInitializerNode(ParseIdentifier(), ParseFixedArrayDimension()));
+            } while (EatOpt(TokenType.Comma) != null);
+
+            return list;
+        }
+
+        private ParseNode ParseFixedArrayDimension() {
+            Eat(TokenType.OpenSquare);
+            ParseNode returnValue = ParseExpression();
+            Eat(TokenType.CloseSquare);
+
+            return returnValue;
+        }
+
+        private ParseNodeList ParseFieldInitializersStatement(bool isFixed) {
+            ParseNodeList returnValue = ParseFieldInitializers(isFixed);
+            Eat(TokenType.Semicolon);
+            return returnValue;
+        }
+
+        private ParseNodeList ParseEnumMembers() {
+            ParseNodeList list = new ParseNodeList();
+
+            while (PeekType() == TokenType.Identifier || PeekType() == TokenType.OpenSquare) {
+                list.Append(ParseEnumerationField());
+                if (null == EatOpt(TokenType.Comma)) {
+                    break;
+                }
+            }
+            return list;
+        }
+
+        private ParseNodeList ParseEnumBody() {
+            Eat(TokenType.OpenCurly);
+            ParseNodeList members = ParseEnumMembers();
+            Eat(TokenType.CloseCurly);
+            EatOpt(TokenType.Semicolon);
+            return members;
+        }
+
+        private ParseNode ParseEnumerationField() {
+            return new EnumerationFieldNode(
+                    ParseAttributes(),
+                    ParseIdentifier(),
+                    ParseVariableInitializer());
+        }
+
+        private ParseNode ParseVariableInitializer() {
+            if (PeekType() == TokenType.Equal) {
+                NextToken();
+                if (PeekType() == TokenType.OpenCurly) {
+                    return ParseArrayInitializer();
+                }
+                else if (PeekType() == TokenType.Stackalloc) {
+                    return ParseStackAlloc();
+                }
+                else {
+                    return ParseExpression();
+                }
+            }
+            else {
+                return null;
+            }
+        }
+
+        private StackAllocNode ParseStackAlloc() {
+            Token token = Eat(TokenType.Stackalloc);
+            ParseNode type = ParseType();
+            Eat(TokenType.OpenSquare);
+            ParseNode numberOfElements = ParseExpression();
+            Eat(TokenType.CloseSquare);
+            return new StackAllocNode(token, type, numberOfElements);
+        }
+
+        private DelegateTypeNode ParseDelegate(Token token, ParseNodeList attributes, Modifiers modifiers) {
+            ParseNode returnType = ParseReturnType();
+            AtomicNameNode name = ParseIdentifier();
+            ParseNodeList typeParameters = ParseTypeParametersOpt();
+            ParseNodeList formals = ParseParensFormalParameterList();
+            ParseNodeList constraints = ParseConstraintClauses();
+            Eat(TokenType.Semicolon);
+            return new DelegateTypeNode(
+                        token,
+                        attributes,
+                        modifiers,
+                        returnType,
+                        name,
+                        typeParameters,
+                        formals,
+                        constraints);
+        }
+
+        private ParseNode ParseNonArrayType() {
+            ParseNode type = ParseBaseType();
+
+            while (PeekType() == TokenType.Star) {
+                NextToken();
+                type = new PointerTypeNode(type);
+            }
+
+            return type;
+        }
+
+        private ParseNode ParseArrayRanks(ParseNode type) {
+            if (PeekType() == TokenType.OpenSquare && (PeekType(1) == TokenType.Comma || PeekType(1) == TokenType.CloseSquare)) {
+                CheckIsType(type, true);
+
+                do {
+                    NextToken();
+                    int rank = 1;
+                    while (null != EatOpt(TokenType.Comma)) {
+                        rank += 1;
+                    }
+                    type = new ArrayTypeNode(type, rank);
+                    Eat(TokenType.CloseSquare);
+                } while (PeekType() == TokenType.OpenSquare && (PeekType(1) == TokenType.Comma || PeekType(1) == TokenType.CloseSquare));
+            }
+            return type;
+        }
+
+        private ParseNode ParseReturnType() {
+            return ParseArrayRanks(ParseNonArrayType());
+        }
+
+        private ParseNode CheckIsType(ParseNode type, bool isArray) {
+            if (type.nodeType == ParseNodeType.PredefinedType && ((IntrinsicTypeNode)type).token.Type == TokenType.Void) {
+                ReportError(isArray ? ParseError.ArrayOfVoidType : ParseError.VoidNotType);
+            }
+
+            return type;
+        }
+
+        private ParseNode ParseType() {
+            return CheckIsType(ParseReturnType(), false);
+        }
+
+        private ParseNodeList ParseParensFormalParameterList() {
+            return ParseParensFormalParameterList(true);
+        }
+
+        private ParseNodeList ParseParensFormalParameterList(bool allowAttributes) {
+            Eat(TokenType.OpenParen);
+            ParseNodeList tree = ParseFormalParameterList(TokenType.CloseParen, allowAttributes);
+            Eat(TokenType.CloseParen);
+
+            return tree;
+        }
+
+        private ParseNodeList ParseFormalParameterList(TokenType endType) {
+            return ParseFormalParameterList(endType, true);
+        }
+
+        private ParseNodeList ParseFormalParameterList(TokenType endType, bool allowAttributes) {
+            ParseNodeList list = new ParseNodeList();
+
+            if (PeekType() != endType) {
+                ParameterNode lastParam;
+                do {
+                    lastParam = ParseFormalParameter(allowAttributes);
+                    list.Append(lastParam);
+                } while (null != EatOpt(TokenType.Comma) && lastParam.Flags != ParameterFlags.Params);
+            }
+
+            return list;
+        }
+
+        private ParameterNode ParseFormalParameter() {
+            return ParseFormalParameter(true);
+        }
+
+        private ParameterNode ParseFormalParameter(bool allowAttributes) {
+            return new ParameterNode(
+                        PeekToken(),
+                        allowAttributes ? ParseAttributes() : new ParseNodeList(),
+                        ParseParameterFlags(),
+                        ParseType(),
+                        ParseIdentifier());
+        }
+
+        private ParameterFlags ParseParameterFlags() {
+            ParameterFlags flags = ParameterFlags.None;
+            TokenType type = PeekType();
+            while (type == TokenType.Ref || type == TokenType.Out || type == TokenType.Params) {
+                if (flags != ParameterFlags.None) {
+                    ReportError(ParseError.DuplicateParameterModifier);
+                }
+                else {
+                    if (type == TokenType.Ref) {
+                        flags = ParameterFlags.Ref;
+                    }
+                    else if (type == TokenType.Out) {
+                        flags = ParameterFlags.Out;
+                    }
+                    else {
+                        flags = ParameterFlags.Params;
+                    }
+
+                }
+                NextToken();
+                type = PeekType();
+            }
+
+            return flags;
+        }
+
+        private BlockStatementNode ParseBlockOpt() {
+            if (PeekType() == TokenType.Semicolon) {
+                Eat(TokenType.Semicolon);
+                return null;
+            }
+
+            return ParseBlock();
+        }
+
+        private BlockStatementNode ParseBlock() {
+            Token token = PeekToken();
+
+            ParseNodeList statements = new ParseNodeList();
+            Eat(TokenType.OpenCurly);
+
+            TokenType type = PeekType();
+            while (type != TokenType.CloseCurly && type != TokenType.EOF) {
+                int mark = Mark();
+                statements.Append(ParseStatement());
+
+                // ensure we make progress in an error case
+                if (mark == Mark()) {
+                    NextToken();
+                }
+
+                type = PeekType();
+            }
+            Eat(TokenType.CloseCurly);
+
+            return new BlockStatementNode(token, statements);
+        }
+
+        private StatementNode ParseStatement() {
+            return ParseStatement(false);
+        }
+
+        private StatementNode ParseEmbeddedStatement() {
+            return ParseStatement(true);
+        }
+
+        private StatementNode ParseStatement(bool embeddedOnly) {
+            switch (PeekType()) {
+                // block
+                case TokenType.OpenCurly: return ParseBlock();
+
+                // empty
+                case TokenType.Semicolon: return ParseEmptyStatement();
+
+                // local const
+                case TokenType.Const:
+                    if (!embeddedOnly) {
+                        return new ConstantDeclarationNode(
+                                        NextToken(),
+                                        new ParseNodeList(),
+                                        Modifiers.None,
+                                        ParseType(),
+                                        ParseFieldInitializersStatement(false));
+                    }
+                    goto default;
+
+                // selection statements
+                case TokenType.If: return ParseIf();
+                case TokenType.Switch: return ParseSwitch();
+
+                // iteration statements
+                case TokenType.While: return ParseWhile();
+                case TokenType.For: return ParseFor();
+                case TokenType.Do: return ParseDo();
+                case TokenType.Foreach: return ParseForeach();
+
+                // labelled statement
+                case TokenType.Identifier: {
+                        TokenType peek = PeekType(1);
+                        if (peek == TokenType.Colon && !embeddedOnly) {
+                            return ParseLabeledStatement();
+                        }
+                        else if (PeekYield() && peek == TokenType.Break) {
+                            return ParseYieldBreak();
+                        }
+                        else if (PeekYield() && peek == TokenType.Return) {
+                            return ParseYieldReturn();
+                        }
+                        goto default;
+                    }
+
+                // jump statements
+                case TokenType.Break: return ParseBreak();
+                case TokenType.Continue: return ParseContinue();
+                case TokenType.Goto: return ParseGoto();
+                case TokenType.Return: return ParseReturn();
+                case TokenType.Throw: return ParseThrow();
+
+                // try
+                case TokenType.Try: return ParseTry();
+
+                // checked
+                case TokenType.Checked: return ParseChecked();
+                case TokenType.Unchecked: return ParseUnchecked();
+                case TokenType.Using: return ParseUsing();
+
+                // lock
+                case TokenType.Lock: return ParseLock();
+
+                // fixed
+                case TokenType.Fixed: return ParseFixed();
+
+                case TokenType.Unsafe: return ParseUnsafeStatement();
+
+                default: {
+                        if (!embeddedOnly && ScanLocalVariableDeclaration()) {
+                            return ParseDeclarationStatement();
+                        }
+                        else {
+                            return ParseExpressionStatement();
+                        }
+                    }
+            }
+        }
+
+        private EmptyStatementNode ParseEmptyStatement() {
+            return new EmptyStatementNode(Eat(TokenType.Semicolon));
+        }
+
+        private IfElseNode ParseIf() {
+            Token token = Eat(TokenType.If);
+            ParseNode condition = ParseParenExpression();
+            ParseNode ifBlock = ParseEmbeddedStatement();
+            ParseNode elseBlock;
+            if (PeekType() == TokenType.Else) {
+                NextToken();
+                elseBlock = ParseEmbeddedStatement();
+            }
+            else {
+                elseBlock = null;
+            }
+
+            return new IfElseNode(token, condition, ifBlock, elseBlock);
+        }
+
+        private ParseNode ParseParenExpression() {
+            Eat(TokenType.OpenParen);
+            ParseNode expr = ParseExpression();
+            Eat(TokenType.CloseParen);
+
+            return expr;
+        }
+
+        private SwitchNode ParseSwitch() {
+            Token token = Eat(TokenType.Switch);
+            ParseNode condition = ParseParenExpression();
+            ParseNodeList cases = new ParseNodeList();
+            Eat(TokenType.OpenCurly);
+
+            TokenType type = PeekType();
+            while (type != TokenType.CloseCurly && type != TokenType.EOF) {
+                Token sectionToken = PeekToken();
+
+                // parse case labels
+                ParseNodeList labels = new ParseNodeList();
+                ParseNode label;
+                while ((label = ParseSwitchLabel()) != null) {
+                    Eat(TokenType.Colon);
+                    labels.Append(label);
+                }
+                if (labels.Count == 0) {
+                    ReportError(ParseError.CaseOrDefaultExpected);
+                }
+
+                // parse statements
+                ParseNodeList statements = new ParseNodeList();
+                type = PeekType();
+                while (type != TokenType.Case && type != TokenType.Default && type != TokenType.CloseCurly && type != TokenType.EOF) {
+                    int mark = Mark();
+
+                    statements.Append(ParseStatement());
+
+                    // ensure we make progress in an error case
+                    if (mark == Mark()) {
+                        NextToken();
+                    }
+
+                    type = PeekType();
+                }
+                if (statements.Count == 0) {
+                    ReportError(ParseError.StatementExpected);
+                }
+                cases.Append(new SwitchSectionNode(
+                                    sectionToken,
+                                    labels,
+                                    statements));
+            }
+
+            Eat(TokenType.CloseCurly);
+
+            return new SwitchNode(token, condition, cases);
+        }
+
+        private ParseNode ParseSwitchLabel() {
+            ParseNode tree;
+            if (PeekType() == TokenType.Case) {
+                tree = new CaseLabelNode(Eat(TokenType.Case), ParseExpression());
+            }
+            else if (PeekType() == TokenType.Default) {
+                tree = new DefaultLabelNode(Eat(TokenType.Default));
+            }
+            else {
+                return null;
+            }
+
+            return tree;
+        }
+
+        private WhileNode ParseWhile() {
+            return new WhileNode(
+                        Eat(TokenType.While),
+                        ParseParenExpression(),
+                        ParseEmbeddedStatement());
+        }
+
+        private DoWhileNode ParseDo() {
+            Token token = Eat(TokenType.Do);
+            ParseNode body = ParseEmbeddedStatement();
+            Eat(TokenType.While);
+            ParseNode condition = ParseParenExpression();
+            Eat(TokenType.Semicolon);
+
+            return new DoWhileNode(token, body, condition);
+        }
+
+        private ForNode ParseFor() {
+            Token token = Eat(TokenType.For);
+            Eat(TokenType.OpenParen);
+
+            // local vardecl or statement list
+            ParseNode initializer;
+            if (ScanLocalVariableDeclaration()) {
+                initializer = ParseDeclarationStatement();
+            }
+            else {
+                initializer = ParseStatementExpressionList(TokenType.Semicolon);
+                Eat(TokenType.Semicolon);
+            }
+
+            ParseNode condition;
+            if (PeekType() == TokenType.Semicolon) {
+                condition = null;
+            }
+            else {
+                condition = ParseExpression();
+            }
+            Eat(TokenType.Semicolon);
+
+            ParseNode increment;
+            if (PeekType() == TokenType.CloseParen) {
+                increment = null;
+            }
+            else {
+                increment = ParseStatementExpressionList(TokenType.CloseParen);
+            }
+            Eat(TokenType.CloseParen);
+
+            return new ForNode(
+                            token,
+                            initializer,
+                            condition,
+                            increment,
+                            ParseEmbeddedStatement());
+        }
+
+        private ExpressionListNode ParseStatementExpressionList(TokenType terminator) {
+            Token token = PeekToken();
+            ParseNodeList list = new ParseNodeList();
+            if (PeekType() != terminator) {
+                do {
+                    list.Append(ParseStatementExpression());
+                } while (null != EatOpt(TokenType.Comma));
+            }
+            return new ExpressionListNode(token, list);
+        }
+
+        private ExpressionListNode ParseExpressionList(TokenType terminator) {
+            Token token = PeekToken();
+            ParseNodeList list = new ParseNodeList();
+            if (PeekType() != terminator) {
+                do {
+                    list.Append(ParseExpression());
+                } while (null != EatOpt(TokenType.Comma));
+            }
+            return new ExpressionListNode(token, list);
+        }
+
+        private ForeachNode ParseForeach() {
+            Token token = Eat(TokenType.Foreach);
+            Eat(TokenType.OpenParen);
+            ParseNode type = ParseType();
+            AtomicNameNode identifier = ParseIdentifier();
+            Eat(TokenType.In);
+            ParseNode container = ParseExpression();
+            Eat(TokenType.CloseParen);
+            return new ForeachNode(
+                            token,
+                            type,
+                            identifier,
+                            container,
+                            ParseEmbeddedStatement());
+        }
+
+        private BreakNode ParseBreak() {
+            Token token = Eat(TokenType.Break);
+            Eat(TokenType.Semicolon);
+            return new BreakNode(token);
+        }
+
+        private ContinueNode ParseContinue() {
+            Token token = Eat(TokenType.Continue);
+            Eat(TokenType.Semicolon);
+            return new ContinueNode(token);
+        }
+
+        private GotoNode ParseGoto() {
+            Token token = Eat(TokenType.Goto);
+            ParseNode destination;
+            destination = ParseSwitchLabel();
+            if (null == destination) {
+                destination = ParseIdentifier();
+            }
+            Eat(TokenType.Semicolon);
+
+            return new GotoNode(token, destination);
+        }
+
+        private ThrowNode ParseThrow() {
+            Token token = Eat(TokenType.Throw);
+
+            ParseNode value;
+            if (PeekType() != TokenType.Semicolon) {
+                value = ParseExpression();
+            }
+            else {
+                value = null;
+            }
+            Eat(TokenType.Semicolon);
+
+            return new ThrowNode(token, value);
+        }
+
+        private ReturnNode ParseReturn() {
+            Token token = Eat(TokenType.Return);
+
+            ParseNode value;
+            if (PeekType() != TokenType.Semicolon) {
+                value = ParseExpression();
+            }
+            else {
+                value = null;
+            }
+            Eat(TokenType.Semicolon);
+
+            return new ReturnNode(token, value);
+        }
+
+        private YieldReturnNode ParseYieldReturn() {
+            IdentifierToken token = EatYield();
+            Eat(TokenType.Return);
+
+            ParseNode value = ParseExpression();
+            Eat(TokenType.Semicolon);
+
+            return new YieldReturnNode(token, value);
+        }
+
+        private YieldBreakNode ParseYieldBreak() {
+            IdentifierToken token = EatYield();
+            Eat(TokenType.Break);
+            Eat(TokenType.Semicolon);
+            return new YieldBreakNode(token);
+        }
+
+        private TryNode ParseTry() {
+            Token token = Eat(TokenType.Try);
+            ParseNode body = ParseBlock();
+
+            ParseNodeList catchClauses = new ParseNodeList();
+            while (PeekType() == TokenType.Catch) {
+                Token catchToken = Eat(TokenType.Catch);
+                ParseNode type;
+                AtomicNameNode name;
+
+                if (PeekType() == TokenType.OpenParen) {
+                    Eat(TokenType.OpenParen);
+                    type = ParseType();
+                    if (PeekType() == TokenType.Identifier) {
+                        name = ParseIdentifier();
+                    }
+                    else {
+                        name = null;
+                    }
+                    Eat(TokenType.CloseParen);
+                }
+                else {
+                    type = null;
+                    name = null;
+                }
+
+                catchClauses.Append(new CatchNode(
+                                        catchToken,
+                                        type,
+                                        name,
+                                        ParseBlock()));
+            }
+
+            ParseNode finallyClause;
+            if (PeekType() == TokenType.Finally) {
+                Eat(TokenType.Finally);
+                finallyClause = ParseBlock();
+            }
+            else {
+                finallyClause = null;
+            }
+
+            return new TryNode(
+                            token,
+                            body,
+                            catchClauses,
+                            finallyClause);
+        }
+
+        private CheckedNode ParseChecked() {
+            return new CheckedNode(Eat(TokenType.Checked), ParseBlock());
+        }
+
+        private UncheckedNode ParseUnchecked() {
+            return new UncheckedNode(Eat(TokenType.Unchecked), ParseBlock());
+        }
+
+        private UsingNode ParseUsing() {
+            Token token = Eat(TokenType.Using);
+            Eat(TokenType.OpenParen);
+            ParseNode guard;
+            if (ScanLocalVariableDeclaration()) {
+                guard = ParseDeclaration();
+                foreach (VariableInitializerNode i in ((VariableDeclarationNode)guard).Initializers) {
+                    if (i.Value == null) {
+                        ReportError(ParseError.UsingDeclaratorsMustHaveValue, i.token);
+                    }
+                }
+            }
+            else {
+                guard = ParseExpression();
+            }
+            Eat(TokenType.CloseParen);
+
+            return new UsingNode(token, guard, ParseEmbeddedStatement());
+        }
+
+        private LockNode ParseLock() {
+            return new LockNode(
+                            Eat(TokenType.Lock),
+                            ParseParenExpression(),
+                            ParseEmbeddedStatement());
+        }
+
+        private FixedNode ParseFixed() {
+            Token token = Eat(TokenType.Fixed);
+            Eat(TokenType.OpenParen);
+            VariableDeclarationNode declaration = ParseDeclaration();
+            if (declaration.Type.nodeType != ParseNodeType.PointerType) {
+                ReportError(ParseError.FixedVariablesMustBeOfPointerType, token);
+            }
+            foreach (VariableInitializerNode i in declaration.Initializers) {
+                if (i.Value == null) {
+                    ReportError(ParseError.FixedDeclaratorsMustHaveValue, i.token);
+                }
+            }
+            Eat(TokenType.CloseParen);
+            return new FixedNode(token, declaration, ParseEmbeddedStatement());
+        }
+
+        private UnsafeNode ParseUnsafeStatement() {
+            return new UnsafeNode(Eat(TokenType.Unsafe), ParseBlock());
+        }
+
+        private ExpressionStatementNode ParseExpressionStatement() {
+            ParseNode expression = ParseStatementExpression();
+            Eat(TokenType.Semicolon);
+            return new ExpressionStatementNode(expression);
+        }
+
+        private ParseNode ParseStatementExpression() {
+            ParseNode expression = ParseExpression();
+            if (expression != null) {
+                switch (expression.nodeType) {
+                    case ParseNodeType.BinaryExpression:
+                        // postincrment, postdecrement
+                        // method call
+                        // assignment
+                        switch (((BinaryExpressionNode)expression).Operator) {
+                            case TokenType.PlusPlus:
+                            case TokenType.MinusMinus:
+                            case TokenType.OpenParen:
+                                break;
+                            default:
+                                if (Token.IsAssignmentOperator(((BinaryExpressionNode)expression).Operator)) {
+                                    break;
+                                }
+                                ReportError(ParseError.ExpressionStatementMustDoWork, expression.token);
+                                break;
+                        }
+                        break;
+                    case ParseNodeType.New:
+                    case ParseNodeType.ArrayNew:
+                        break;
+                    case ParseNodeType.UnaryExpression:
+                        // preincrement, predecrement
+                        switch (((UnaryExpressionNode)expression).token.Type) {
+                            case TokenType.PlusPlus:
+                            case TokenType.MinusMinus:
+                                break;
+                            default:
+                                ReportError(ParseError.ExpressionStatementMustDoWork, expression.token);
+                                break;
+                        }
+                        break;
+                    default:
+                        ReportError(ParseError.ExpressionStatementMustDoWork, expression.token);
+                        break;
+                }
+            }
+            return expression;
+        }
+
+        private LabeledStatementNode ParseLabeledStatement() {
+            AtomicNameNode label = ParseIdentifier();
+            Eat(TokenType.Colon);
+
+            return new LabeledStatementNode(label, ParseStatement());
+        }
+
+        private enum SCAN {
+            TYPE,
+            COULD_BE_TYPE,
+            POINTER_OR_MULT,
+            NOTTYPE,
+        }
+
+        private bool ScanLocalVariableDeclaration() {
+            int mark = Mark();
+            bool returnValue = (ScanType() != SCAN.NOTTYPE) && (PeekType() == TokenType.Identifier);
+            Rewind(mark);
+            return returnValue;
+        }
+
+        private SCAN ScanTypeNamePart() {
+            if (PeekType() == TokenType.Identifier) {
+                NextToken();
+                if (PeekType() == TokenType.OpenAngle) {
+                    switch (ScanTypeArgumentListOpt()) {
+                        case TypeArgumentListScan.TypeParameterList:
+                        case TypeArgumentListScan.NotTypeArgumentList:
+                            return SCAN.NOTTYPE;
+                        case TypeArgumentListScan.MustBeTypeArgumentList:
+                        case TypeArgumentListScan.MayBeTypeArgumentList:
+                            return SCAN.COULD_BE_TYPE;
+                        default:
+                            Debug.Fail("Invalid scan result");
+                            break;
+                    }
+
+                    return SCAN.NOTTYPE;
+                }
+                return SCAN.COULD_BE_TYPE;
+            }
+            return SCAN.NOTTYPE;
+        }
+
+        private SCAN ScanBaseType() {
+            // scan a base type
+            if (PeekType() == TokenType.Identifier) {
+                do {
+                    SCAN result = SCAN.COULD_BE_TYPE;
+                    switch (ScanTypeNamePart()) {
+                        case SCAN.NOTTYPE:
+                            return SCAN.NOTTYPE;
+                        case SCAN.COULD_BE_TYPE:
+                            break;
+                        case SCAN.TYPE:
+                            result = SCAN.TYPE;
+                            break;
+                        default:
+                            Debug.Fail("Invalid scan result");
+                            break;
+                    }
+
+                    TokenType peek = PeekType();
+                    if ((peek = PeekType()) == TokenType.Dot || peek == TokenType.ColonColon) {
+                        if (peek == TokenType.Dot)
+                            result = SCAN.COULD_BE_TYPE;
+                        else
+                            result = SCAN.TYPE;
+
+                        NextToken();
+                        if (PeekType() != TokenType.Identifier)
+                            return SCAN.NOTTYPE;
+                    }
+                    else {
+                        return result;
+                    }
+                } while (true);
+            }
+            else if (Token.IsPredefinedType(PeekType())) {
+                NextToken();
+                return SCAN.TYPE;
+            }
+            else {
+                return SCAN.NOTTYPE;
+            }
+        }
+
+        private SCAN ScanType() {
+            SCAN result = ScanBaseType();
+            if (result == SCAN.NOTTYPE)
+                return SCAN.NOTTYPE;
+
+            // scan pointer flags
+            int numberOfStars = 0;
+            while (null != EatOpt(TokenType.Star)) {
+                numberOfStars += 1;
+                if ((result == SCAN.COULD_BE_TYPE) && (numberOfStars == 1)) {
+                    result = SCAN.POINTER_OR_MULT;
+                }
+                else if ((result == SCAN.POINTER_OR_MULT) && (numberOfStars > 1)) {
+                    result = SCAN.TYPE;
+                }
+            }
+
+            // scan nullable flags
+            while (null != EatOpt(TokenType.Question)) {
+                result = SCAN.TYPE;
+            }
+
+            // scan array flags
+            while (null != EatOpt(TokenType.OpenSquare)) {
+                while (null != EatOpt(TokenType.Comma)) { }
+
+                if (null == EatOpt(TokenType.CloseSquare)) {
+                    return SCAN.NOTTYPE;
+                }
+                result = SCAN.TYPE;
+            }
+
+            return result;
+        }
+
+        private VariableDeclarationNode ParseDeclaration() {
+            return new VariableDeclarationNode(
+                PeekToken(),
+                new ParseNodeList(),       // _attributes
+                Modifiers.None,
+                ParseType(),
+                ParseFieldInitializers(false),
+                false);
+        }
+
+        private VariableDeclarationNode ParseDeclarationStatement() {
+            return new VariableDeclarationNode(
+                PeekToken(),
+                new ParseNodeList(),       // _attributes
+                Modifiers.None,
+                ParseType(),
+                ParseFieldInitializersStatement(false),
+                false);
+        }
+
+        private ParseNode ParseExpression() {
+            return ParseAssignment();
+        }
+
+        private ParseNode ParseConditional() {
+            ParseNode condition = ParseBinaryExpression();
+            if (null != EatOpt(TokenType.Question)) {
+                ParseNode left = ParseExpression();
+                Eat(TokenType.Colon);
+                ParseNode right = ParseExpression();
+                return new ConditionalNode(condition, left, right);
+            }
+
+            return condition;
+        }
+
+        private TokenType PeekAssignmentOperator() {
+            if (Token.IsAssignmentOperator(PeekType()))
+                return PeekType();
+            else if (PeekType() == TokenType.Greater &&
+                     PeekType(1) == TokenType.GreaterEqual &&
+                     PeekToken().IsAdjacent(PeekToken(1)))
+                return TokenType.ShiftRightEqual;
+            else
+                return TokenType.Invalid;
+        }
+
+        private TokenType EatAssignmentOperator() {
+            if (Token.IsAssignmentOperator(PeekType()))
+                return NextToken().Type;
+            else {
+                Debug.Assert(PeekType() == TokenType.Greater &&
+                                PeekType(1) == TokenType.GreaterEqual &&
+                                PeekToken().IsAdjacent(PeekToken(1)));
+
+                Eat(TokenType.Greater);
+                Eat(TokenType.GreaterEqual);
+
+                return TokenType.ShiftRightEqual;
+            }
+        }
+
+        private ParseNode ParseAssignment() {
+            ParseNode left = ParseConditional();
+            if (PeekAssignmentOperator() != TokenType.Invalid) {
+                left = new BinaryExpressionNode(left, EatAssignmentOperator(), ParseAssignment());
+            }
+
+            return left;
+        }
+
+        private TokenType PeekOverloadableOperator() {
+            TokenType result = PeekBinaryOperator();
+            if (result == TokenType.Invalid) {
+                if (Token.IsOverloadableOperator(PeekType()))
+                    result = PeekType();
+            }
+
+            return result;
+        }
+
+        private TokenType EatOverloadableOperator() {
+            TokenType operatorKind = PeekType();
+            if (operatorKind == TokenType.Greater)
+                operatorKind = EatBinaryOperator();
+            else {
+                if (Token.IsOverloadableOperator(operatorKind)) {
+                    NextToken();
+                }
+                else {
+                    ReportError(ParseError.OverloadableOperatorExpected);
+                    switch (operatorKind) {
+                        case TokenType.OpenParen:
+                        case TokenType.OpenCurly:
+                            break;
+
+                        default:
+                            NextToken();
+                            break;
+                    }
+                }
+            }
+
+            return operatorKind;
+        }
+
+        private TokenType PeekBinaryOperator() {
+            if (Token.IsBinaryOperator(PeekType()))
+                if (PeekType() == TokenType.Greater &&
+                    PeekType(1) == TokenType.Greater &&
+                    PeekToken().IsAdjacent(PeekToken(1)))
+                    return TokenType.ShiftRight;
+                else if (PeekType() == TokenType.Greater &&
+                    PeekType(1) == TokenType.GreaterEqual &&
+                    PeekToken().IsAdjacent(PeekToken(1)))
+                    return TokenType.ShiftRightEqual;
+                else
+                    return PeekType();
+            else
+                return TokenType.Invalid;
+        }
+
+        private int PeekBinaryOperatorPrecedence() {
+            return Token.GetTokenPrecedence(PeekBinaryOperator());
+        }
+
+        private TokenType EatBinaryOperator() {
+            Debug.Assert(Token.IsBinaryOperator(PeekType()));
+
+            if (PeekType() == TokenType.Greater &&
+                PeekType(1) == TokenType.Greater &&
+                PeekToken().IsAdjacent(PeekToken(1))) {
+                Eat(TokenType.Greater);
+                Eat(TokenType.Greater);
+
+                return TokenType.ShiftRight;
+            }
+            else if (PeekType() == TokenType.Greater &&
+                PeekType(1) == TokenType.GreaterEqual &&
+                PeekToken().IsAdjacent(PeekToken(1))) {
+                Eat(TokenType.Greater);
+                Eat(TokenType.GreaterEqual);
+
+                return TokenType.ShiftRightEqual;
+            }
+            else
+                return NextToken().Type;
+        }
+
+        private ParseNode ParseBinaryExpression() {
+            return ParseBinaryExpression(int.MaxValue - 1);
+        }
+
+        private ParseNode ParseBinaryExpression(int precedence) {
+            return ParseBinaryExpression(precedence, ParseUnaryExpression());
+        }
+
+        private ParseNode ParseBinaryExpression(int precedence, ParseNode left) {
+            int newPrecedence;
+            while ((newPrecedence = PeekBinaryOperatorPrecedence()) <= precedence) {
+                TokenType op = EatBinaryOperator();
+                ParseNode right;
+                if (op == TokenType.Is || op == TokenType.As) {
+                    right = ParseType();
+                }
+                else {
+                    right = ParseBinaryExpression(newPrecedence - 1);
+                }
+                left = new BinaryExpressionNode(
+                                left,
+                                op,
+                                right);
+            }
+
+            return left;
+        }
+
+        private ParseNode ParseUnaryExpression() {
+            switch (PeekType()) {
+                case TokenType.Plus:
+                case TokenType.Minus:
+                case TokenType.Bang:
+                case TokenType.Tilde:
+                case TokenType.PlusPlus:
+                case TokenType.MinusMinus:
+                case TokenType.Star:
+                case TokenType.Ampersand:
+                    return new UnaryExpressionNode(NextToken(), ParseUnaryExpression());
+
+                case TokenType.OpenParen:
+                    // check for cast expression
+                    if (ScanCast()) {
+                        return ParseCastExpression();
+                    }
+                    break;
+            }
+
+            // must be a primary expression
+            return ParsePrimaryExpression();
+        }
+
+        private bool ScanCast() {
+            int mark = Mark();
+            bool returnValue;
+
+            NextToken();
+            SCAN scan = ScanType();
+
+            if (scan == SCAN.NOTTYPE) {
+                returnValue = false;
+            }
+            else if (PeekType() != TokenType.CloseParen) {
+                returnValue = false;
+            }
+            else {
+                switch (scan) {
+                    case SCAN.TYPE:
+                    case SCAN.POINTER_OR_MULT:
+                        returnValue = true;
+                        break;
+
+                    case SCAN.COULD_BE_TYPE:
+                    default:
+                        TokenType type = PeekType(1);
+                        switch (type) {
+                            case TokenType.Tilde:
+                            case TokenType.Bang:
+                            case TokenType.OpenParen:
+                            case TokenType.Identifier:
+                            case TokenType.Literal:
+                                returnValue = true;
+                                break;
+
+                            case TokenType.Is:
+                            case TokenType.As:
+                                returnValue = false;
+                                break;
+
+                            default:
+                                returnValue = Token.IsKeyword(type);
+                                break;
+                        }
+                        break;
+                }
+            }
+            Rewind(mark);
+
+            return returnValue;
+        }
+
+        private ParseNode ParseCastExpression() {
+            Token token = Eat(TokenType.OpenParen);
+            ParseNode type = ParseType();
+            Eat(TokenType.CloseParen);
+
+            return new CastNode(token, type, ParseUnaryExpression());
+        }
+
+        private ParseNode ParsePrimaryExpression() {
+            ParseNode expr;
+            switch (PeekType()) {
+                case TokenType.Null:
+                case TokenType.True:
+                case TokenType.False:
+                case TokenType.Literal:
+                    expr = new LiteralNode(NextToken());
+                    break;
+
+                case TokenType.OpenParen:
+                    Eat(TokenType.OpenParen);
+                    expr = ParseExpression();
+                    if (expr is ExpressionNode) {
+                        ((ExpressionNode)expr).AddParenthesisHint();
+                    }
+                    Eat(TokenType.CloseParen);
+                    break;
+
+                case TokenType.New:
+                    expr = ParseNew();
+                    break;
+
+                case TokenType.Typeof: {
+                        Token token = NextToken();
+                        Eat(TokenType.OpenParen);
+                        expr = new TypeofNode(token, ParseReturnType());
+                        Eat(TokenType.CloseParen);
+                        break;
+                    }
+
+                case TokenType.Sizeof: {
+                        Token token = NextToken();
+                        Eat(TokenType.OpenParen);
+                        expr = new SizeofNode(token, ParseType());
+                        Eat(TokenType.CloseParen);
+                        break;
+                    }
+
+                case TokenType.Checked:
+                case TokenType.Unchecked: {
+                        Token token = NextToken();
+                        Eat(TokenType.OpenParen);
+                        expr = new UnaryExpressionNode(token, ParseExpression());
+                        Eat(TokenType.CloseParen);
+                        break;
+                    }
+
+                case TokenType.This:
+                    expr = new ThisNode(NextToken());
+                    break;
+
+                case TokenType.Base:
+                    expr = new BaseNode(NextToken());
+                    if (PeekType() != TokenType.Dot && PeekType() != TokenType.OpenSquare) {
+                        this.ReportError(ParseError.BadBaseExpression);
+                    }
+                    break;
+
+                case TokenType.Identifier:
+                    expr = ParseAliasQualifiedName(true);
+                    break;
+
+                case TokenType.Delegate:
+                    expr = ParseAnonymousMethod();
+                    break;
+
+                default:
+                    if (Token.IsPredefinedType(PeekType()) && PeekType() != TokenType.Void) {
+                        expr = ParsePredefinedType();
+                        CheckType(TokenType.Dot);
+                    }
+                    else {
+                        ReportError(ParseError.ExpressionExpected);
+                        expr = ParseIdentifier();
+                    }
+                    break;
+            }
+
+            // postfix operators
+            bool foundPostfix = true;
+            do {
+                Token token = PeekToken();
+                switch (PeekType()) {
+                    case TokenType.Dot:
+                        if (PeekType(1) == TokenType.Default) {
+                            expr = new DefaultValueNode(expr);
+                            Eat(TokenType.Dot);
+                            Eat(TokenType.Default);
+                        }
+                        else
+                            expr = new BinaryExpressionNode(expr, NextToken().Type, ParseSimpleName(true));
+                        break;
+
+                    case TokenType.OpenParen:
+                        expr = new BinaryExpressionNode(expr, token.Type, ParseParenArgumentList());
+                        break;
+
+                    case TokenType.PlusPlus:
+                    case TokenType.MinusMinus:
+                        expr = new BinaryExpressionNode(expr, NextToken().Type, null);
+                        break;
+
+                    case TokenType.OpenSquare:
+                        expr = new BinaryExpressionNode(expr, NextToken().Type, ParseExpressionList(TokenType.CloseSquare));
+                        Eat(TokenType.CloseSquare);
+                        break;
+
+                    case TokenType.Arrow:
+                        expr = new BinaryExpressionNode(expr, NextToken().Type, ParseIdentifier());
+                        break;
+
+                    default:
+                        foundPostfix = false;
+                        break;
+                }
+            } while (foundPostfix);
+
+            return expr;
+        }
+
+        private ParseNode ParseNew() {
+            Token token = Eat(TokenType.New);
+            ParseNode type = ParseNonArrayType();
+            if (TokenType.OpenSquare == PeekType()) {
+                bool needArrayInit;
+                ParseNode exprList;
+                if (PeekType(1) == TokenType.CloseSquare || PeekType(1) == TokenType.Comma) {
+                    type = ParseArrayRanks(type);
+                    needArrayInit = true;
+                    exprList = null;
+                }
+                else {
+                    Eat(TokenType.OpenSquare);
+                    exprList = ParseExpressionList(TokenType.CloseSquare);
+                    Eat(TokenType.CloseSquare);
+
+                    if (TokenType.OpenSquare == PeekType() && (PeekType(1) == TokenType.CloseSquare || PeekType(1) == TokenType.Comma)) {
+                        type = ParseArrayRanks(type);
+                    }
+
+                    needArrayInit = false;
+                }
+
+                ParseNode initExpr;
+                if (needArrayInit || PeekType() == TokenType.OpenCurly) {
+                    initExpr = ParseArrayInitializer();
+                }
+                else {
+                    initExpr = null;
+                }
+
+                return new ArrayNewNode(token, type, exprList, initExpr);
+            }
+            else {
+                return new NewNode(
+                    token,
+                    type,
+                    ParseParenArgumentList());
+            }
+        }
+
+        private ArrayInitializerNode ParseArrayInitializer() {
+            Token token = Eat(TokenType.OpenCurly);
+
+            ParseNodeList list = new ParseNodeList();
+            while (PeekType() != TokenType.CloseCurly && PeekType() != TokenType.EOF) {
+                if (PeekType() == TokenType.OpenCurly) {
+                    list.Append(ParseArrayInitializer());
+                }
+                else {
+                    list.Append(ParseExpression());
+                }
+                if (null == EatOpt(TokenType.Comma)) {
+                    break;
+                }
+            }
+            Eat(TokenType.CloseCurly);
+
+            return new ArrayInitializerNode(token, list);
+        }
+
+        private ExpressionListNode ParseParenArgumentList() {
+            Token token = PeekToken();
+
+            Eat(TokenType.OpenParen);
+            ParseNodeList list = new ParseNodeList();
+
+            while (PeekType() != TokenType.CloseParen) {
+                list.Append(ParseArgument());
+                if (null == EatOpt(TokenType.Comma)) {
+                    break;
+                }
+            }
+
+            Eat(TokenType.CloseParen);
+
+            return new ExpressionListNode(token, list);
+        }
+
+        private ParseNode ParseArgument() {
+            if (PeekType() == TokenType.Ref || PeekType() == TokenType.Out) {
+                return new UnaryExpressionNode(NextToken(), ParseExpression());
+            }
+            else {
+                return ParseExpression();
+            }
+        }
+
+        private AnonymousMethodNode ParseAnonymousMethod() {
+            return new AnonymousMethodNode(
+                                    Eat(TokenType.Delegate),
+                                    PeekType() == TokenType.OpenParen ?
+                                        ParseParensFormalParameterList(false) :
+                                        new ParseNodeList(),
+                                    ParseBlock());
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorControlLine.cs b/src/Core/Compiler/Parser/PreprocessorControlLine.cs
new file mode 100644
index 000000000..49a41e66c
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorControlLine.cs
@@ -0,0 +1,26 @@
+// PreprocessorControlLine.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Parser {
+
+    // #error/#warning
+    internal sealed class PreprocessorControlLine : PreprocessorLine {
+
+        private string _message;
+
+        public PreprocessorControlLine(PreprocessorTokenType type, string message)
+            : base(type) {
+            _message = message.Trim();
+        }
+
+        public string Message {
+            get {
+                return _message;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorDeclarationLine.cs b/src/Core/Compiler/Parser/PreprocessorDeclarationLine.cs
new file mode 100644
index 000000000..c06e777cb
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorDeclarationLine.cs
@@ -0,0 +1,26 @@
+// PreprocessorDeclarationLine.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Parser {
+
+    // #define/#undef
+    internal sealed class PreprocessorDeclarationLine : PreprocessorLine {
+
+        private Name _identifier;
+
+        public PreprocessorDeclarationLine(PreprocessorTokenType type, Name identifier)
+            : base(type) {
+            _identifier = identifier;
+        }
+
+        public Name Identifier {
+            get {
+                return _identifier;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorError.cs b/src/Core/Compiler/Parser/PreprocessorError.cs
new file mode 100644
index 000000000..a606aabca
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorError.cs
@@ -0,0 +1,26 @@
+// PreprocessorError.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Parser {
+
+    internal sealed class PreprocessorError {
+
+        private PreprocessorError() {
+        }
+
+        public static readonly Error UnexpectedEndOfFile = new Error(200, 0, "Unexpected end of file found in preprocessor directive");
+        public static readonly Error TokenExpected = new Error(201, 0, "Syntax error in preprocessor directive: '{0}' expected");
+        public static readonly Error PPAfterSource = new Error(202, 0, "Preprocessing directive must be first non-whitespace character on a line");
+        public static readonly Error PPError = new Error(203, 0, "#error: '{0}'");
+        public static readonly Error PPWarning = new Error(204, 1, "#warning: '{0}'");
+        public static readonly Error UnexpectedDirective = new Error(205, 0, "Unexpected pre-processor directive");
+        public static readonly Error MisingPPExpression = new Error(206, 0, "Missing pre-processor expression");
+        public static readonly Error EndRegionExpected = new Error(207, 0, "#endregion expected");
+        public static readonly Error DefineAfterToken = new Error(208, 0, "#define and #undef must occur before any other tokens in a file");
+        public static readonly Error PPEndifExpected = new Error(209, 0, "#endif expected");
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorIdentifierToken.cs b/src/Core/Compiler/Parser/PreprocessorIdentifierToken.cs
new file mode 100644
index 000000000..55a74f47d
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorIdentifierToken.cs
@@ -0,0 +1,26 @@
+// PreprocessorIdentifierToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.Parser {
+
+    internal sealed class PreprocessorIdentifierToken : PreprocessorToken {
+
+        private Name _value;
+
+        public PreprocessorIdentifierToken(Name value, BufferPosition position)
+            : base(PreprocessorTokenType.Identifier, position) {
+            _value = value;
+        }
+
+        public Name Value {
+            get {
+                return _value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorIfLine.cs b/src/Core/Compiler/Parser/PreprocessorIfLine.cs
new file mode 100644
index 000000000..d4c46b0bc
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorIfLine.cs
@@ -0,0 +1,26 @@
+// PreprocessorIfLine.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Parser {
+
+    // #if/#elif
+    internal sealed class PreprocessorIfLine : PreprocessorLine {
+
+        private bool _value;
+
+        public PreprocessorIfLine(PreprocessorTokenType type, bool value)
+            : base(type) {
+            _value = value;
+        }
+
+        public bool Value {
+            get {
+                return _value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorIntToken.cs b/src/Core/Compiler/Parser/PreprocessorIntToken.cs
new file mode 100644
index 000000000..09857af76
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorIntToken.cs
@@ -0,0 +1,26 @@
+// PreprocessorIntToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.Parser {
+
+    internal sealed class PreprocessorIntToken : PreprocessorToken {
+
+        private int _value;
+
+        public PreprocessorIntToken(int value, BufferPosition position)
+            : base(PreprocessorTokenType.Int, position) {
+            _value = value;
+        }
+
+        public int Value {
+            get {
+                return _value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorKeywords.cs b/src/Core/Compiler/Parser/PreprocessorKeywords.cs
new file mode 100644
index 000000000..69790e09d
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorKeywords.cs
@@ -0,0 +1,32 @@
+// PreprocessorKeywords.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+
+namespace ScriptSharp.Parser {
+
+    internal sealed class PreprocessorKeywords {
+
+        private Hashtable keywords;
+
+        public PreprocessorKeywords(NameTable symbolTable) {
+            keywords = new Hashtable();
+
+            for (PreprocessorTokenType token = 0; token < PreprocessorTokenType.Identifier; token += 1) {
+                keywords.Add(symbolTable.Add(PreprocessorToken.TypeString(token)), token);
+            }
+        }
+
+        public PreprocessorTokenType IsKeyword(Name value) {
+            object o = keywords[value];
+            if (o != null) {
+                return (PreprocessorTokenType)o;
+            }
+
+            return PreprocessorTokenType.Invalid;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorLexer.cs b/src/Core/Compiler/Parser/PreprocessorLexer.cs
new file mode 100644
index 000000000..96bf5b1c4
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorLexer.cs
@@ -0,0 +1,218 @@
+// PreprocessorLexer.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Text;
+
+namespace ScriptSharp.Parser {
+
+    internal sealed class PreprocessorLexer {
+
+        private TextBuffer _text;
+        private NameTable _nameTable;
+        private PreprocessorKeywords _keywords;
+        private StringBuilder _value;
+
+        public PreprocessorLexer(NameTable symbolTable) {
+            _value = new StringBuilder();
+            _nameTable = symbolTable;
+            _keywords = new PreprocessorKeywords(symbolTable);
+        }
+
+        public event ErrorEventHandler OnError;
+
+        public PreprocessorToken NextToken(TextBuffer text) {
+            _text = text;
+
+            SkipWhiteSpace();
+            BufferPosition position = text.Position;
+
+            char ch = PeekChar();
+            if (ch == '\0' || IsLineSeparator(ch)) {
+                return NewPPToken(PreprocessorTokenType.EndOfLine, position);
+            }
+
+            ch = NextChar();
+            switch (ch) {
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                case '4':
+                case '5':
+                case '6':
+                case '7':
+                case '8':
+                case '9': {
+                        int intValue = (ch - '0');
+                        while (IsDigit(PeekChar())) {
+                            int value10 = intValue * 10;
+                            if (value10 < intValue) {
+                                ReportError(LexError.NumericConstantOverflow);
+                            }
+                            else {
+                                intValue = value10 + (NextChar() - '0');
+                            }
+                        }
+
+                        return new PreprocessorIntToken(intValue, position);
+                    }
+
+                case '=':
+                    if (PeekChar() == '=') {
+                        NextChar();
+                        return NewPPToken(PreprocessorTokenType.EqualEqual, position);
+                    }
+                    break;
+
+                case '!':
+                    if (PeekChar() == '=') {
+                        NextChar();
+                        return NewPPToken(PreprocessorTokenType.NotEqual, position);
+                    }
+                    else {
+                        return NewPPToken(PreprocessorTokenType.Not, position);
+                    }
+
+                case '&':
+                    if (PeekChar() == '&') {
+                        NextChar();
+                        return NewPPToken(PreprocessorTokenType.And, position);
+                    }
+                    break;
+
+                case '|':
+                    if (PeekChar() == '|') {
+                        NextChar();
+                        return NewPPToken(PreprocessorTokenType.Or, position);
+                    }
+                    break;
+
+                case '(':
+                    return NewPPToken(PreprocessorTokenType.OpenParen, position);
+
+                case ')':
+                    return NewPPToken(PreprocessorTokenType.CloseParen, position);
+
+                case '"':
+                    _value.Length = 0;
+                    while ((ch = PeekChar()) != '"') {
+                        if (EOF) {
+                            ReportError(LexError.UnexpectedEndOfFileString);
+                            break;
+                        }
+                        else if (IsLineSeparator(ch)) {
+                            ReportError(LexError.WhiteSpaceInConstant);
+                            break;
+                        }
+                        _value.Append(ch);
+                        NextChar();
+                    }
+                    NextChar();
+                    return new PreprocessorStringToken(_value.ToString(), position);
+
+                case '/':
+                    if (PeekChar() == '/') {
+                        IgnoreRestOfLine();
+                        return NewPPToken(PreprocessorTokenType.EndOfLine, position);
+                    }
+                    break;
+
+                default:
+                    if (IsLineSeparator(ch)) {
+                        return NewPPToken(PreprocessorTokenType.EndOfLine, position);
+                    }
+
+                    if (!IsIdentifierChar(ch)) {
+                        break;
+                    }
+
+                    _value.Length = 0;
+                    _value.Append(ch);
+                    while (IsIdentifierChar(PeekChar())) {
+                        _value.Append(NextChar());
+                    }
+                    Name id = _nameTable.Add(_value);
+                    PreprocessorTokenType type = _keywords.IsKeyword(id);
+                    if (type != PreprocessorTokenType.Invalid) {
+                        return NewPPToken(type, position);
+                    }
+                    else {
+                        return new PreprocessorIdentifierToken(id, position);
+                    }
+            }
+
+            return NewPPToken(PreprocessorTokenType.Unknown, position);
+        }
+
+        public void SkipWhiteSpace() {
+            while (!EOF && IsWhiteSpace(PeekChar()) && !IsLineSeparator(PeekChar())) {
+                NextChar();
+            }
+        }
+
+        public string GetRestOfLine() {
+            _value.Length = 0;
+
+            while (!EOF && !IsLineSeparator(PeekChar())) {
+                _value.Append(NextChar());
+            }
+            if (!EOF) {
+                NextChar();
+            }
+
+            return _value.ToString();
+        }
+
+        public void IgnoreRestOfLine() {
+            while (!EOF && !IsLineSeparator(NextChar())) {
+            }
+        }
+
+        private PreprocessorToken NewPPToken(PreprocessorTokenType type, BufferPosition position) {
+            return new PreprocessorToken(type, position);
+        }
+
+        private void ReportError(Error error, params object[] args) {
+            if (OnError != null) {
+                OnError(this, new ErrorEventArgs(error, _text.Position, args));
+            }
+        }
+
+        public bool EOF {
+            get {
+                return PeekChar() == '\0';
+            }
+        }
+
+        private bool IsLineSeparator(char ch) {
+            return Lexer.IsLineSeparator(ch);
+        }
+
+        private bool IsWhiteSpace(char ch) {
+            return Lexer.IsWhiteSpace(ch);
+        }
+
+        private bool IsDigit(char ch) {
+            return Lexer.IsDigit(ch);
+        }
+
+        private bool IsIdentifierChar(char ch) {
+            return Lexer.IsIdentifierChar(ch);
+        }
+
+        private char NextChar() {
+            return _text.NextChar();
+        }
+
+        private char PeekChar() {
+            return _text.PeekChar();
+        }
+
+        private char PeekChar(int index) {
+            return _text.PeekChar(index);
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorLine.cs b/src/Core/Compiler/Parser/PreprocessorLine.cs
new file mode 100644
index 000000000..e9ed74541
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorLine.cs
@@ -0,0 +1,25 @@
+// PreprocessorLine.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Parser {
+
+    // #else/#endif/EOL
+    internal class PreprocessorLine {
+
+        private PreprocessorTokenType _type;
+
+        public PreprocessorLine(PreprocessorTokenType type) {
+            _type = type;
+        }
+
+        public PreprocessorTokenType Type {
+            get {
+                return _type;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorLineNumberLine.cs b/src/Core/Compiler/Parser/PreprocessorLineNumberLine.cs
new file mode 100644
index 000000000..8ac8a2b76
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorLineNumberLine.cs
@@ -0,0 +1,38 @@
+// PreprocessorLineNumberLine.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Parser {
+
+    // #line
+    internal sealed class PreprocessorLineNumberLine : PreprocessorLine {
+
+        private int _line;
+        private string _file;
+
+        public PreprocessorLineNumberLine(int line)
+            : base(PreprocessorTokenType.Line) {
+            _line = line;
+        }
+
+        public PreprocessorLineNumberLine(int line, string file)
+            : this(line) {
+            _file = file;
+        }
+
+        public string File {
+            get {
+                return _file;
+            }
+        }
+
+        public int Line {
+            get {
+                return _line;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorLineParser.cs b/src/Core/Compiler/Parser/PreprocessorLineParser.cs
new file mode 100644
index 000000000..8558c3d7a
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorLineParser.cs
@@ -0,0 +1,251 @@
+// PreprocessorLineParser.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace ScriptSharp.Parser {
+
+    internal sealed class PreprocessorLineParser {
+
+        private PreprocessorLexer lexer;
+        private TextBuffer text;
+        private IDictionary defines;
+        private PreprocessorToken token;
+
+        public PreprocessorLineParser(NameTable symbolTable) {
+            lexer = new PreprocessorLexer(symbolTable);
+            lexer.OnError += new ErrorEventHandler(this.ReportError);
+        }
+
+        public event ErrorEventHandler OnError;
+
+        public PreprocessorLine ParseNextLine(TextBuffer text, IDictionary defines) {
+            PreprocessorLine line = null;
+
+            do {
+                lexer.SkipWhiteSpace();
+                if (lexer.EOF) {
+                    line = new PreprocessorLine(PreprocessorTokenType.EndOfLine);
+                }
+                else if (text.PeekChar() != '#') {
+                    lexer.IgnoreRestOfLine();
+                }
+                else {
+                    line = Parse(text, defines);
+                }
+            } while (line == null);
+
+            return line;
+        }
+
+        public PreprocessorLine Parse(TextBuffer text, IDictionary defines) {
+            this.text = text;
+            this.defines = defines;
+
+            Debug.Assert(text.PeekChar() == '#');
+            text.NextChar();
+
+            PreprocessorToken token = NextToken();
+            PreprocessorTokenType type = token.Type;
+            switch (type) {
+                case PreprocessorTokenType.Define:
+                case PreprocessorTokenType.Undef:
+                    token = Eat(PreprocessorTokenType.Identifier);
+                    EatEndOfLine();
+                    if (token != null) {
+                        return new PreprocessorDeclarationLine(type, ((PreprocessorIdentifierToken)token).Value);
+                    }
+                    else {
+                        return null;
+                    }
+
+                case PreprocessorTokenType.Warning:
+                case PreprocessorTokenType.Error:
+                    return new PreprocessorControlLine(type, lexer.GetRestOfLine());
+
+                case PreprocessorTokenType.Line:
+                    // hidden, default
+                    type = PeekType();
+                    if (type == PreprocessorTokenType.Default || type == PreprocessorTokenType.Hidden) {
+                        NextToken();
+                        EatEndOfLine();
+                        return new PreprocessorLine(type);
+                    }
+
+                    token = Eat(PreprocessorTokenType.Int);
+                    if (token != null) {
+                        int line = ((PreprocessorIntToken)token).Value;
+                        string file = null;
+                        if (PeekType() == PreprocessorTokenType.String) {
+                            file = ((PreprocessorStringToken)NextToken()).Value;
+                        }
+                        EatEndOfLine();
+
+                        return new PreprocessorLineNumberLine(line, file);
+                    }
+                    else {
+                        lexer.IgnoreRestOfLine();
+                        return null;
+                    }
+
+                case PreprocessorTokenType.If:
+                case PreprocessorTokenType.Elif:
+                    return new PreprocessorIfLine(type, EvalExpression());
+
+                case PreprocessorTokenType.Else:
+                case PreprocessorTokenType.Endif:
+                    return new PreprocessorLine(type);
+
+                case PreprocessorTokenType.Region:
+                case PreprocessorTokenType.EndRegion:
+                    lexer.IgnoreRestOfLine();
+                    return new PreprocessorLine(type);
+
+                case PreprocessorTokenType.Pragma:
+                    lexer.IgnoreRestOfLine();
+                    return new PreprocessorLine(type);
+                default:
+                    ReportError(PreprocessorError.UnexpectedDirective, token.Position);
+                    return null;
+            }
+        }
+
+        private bool EvalExpression() {
+            bool value = EvalEqualsExpression();
+            EatEndOfLine();
+            return value;
+        }
+
+        private bool EvalEqualsExpression() {
+            bool value = EvalOrExpression();
+            PreprocessorTokenType type = PeekType();
+            while (type == PreprocessorTokenType.EqualEqual || type == PreprocessorTokenType.NotEqual) {
+                NextToken();
+                value = (value == EvalOrExpression());
+                if (type == PreprocessorTokenType.NotEqual) {
+                    value = !value;
+                }
+            }
+            return value;
+        }
+
+        private bool EvalOrExpression() {
+            bool value = EvalAndExpression();
+            while (PeekType() == PreprocessorTokenType.Or) {
+                NextToken();
+                bool rightValue = EvalAndExpression();
+                value = (value || rightValue);
+            }
+            return value;
+        }
+
+        private bool EvalAndExpression() {
+            bool value = EvalUnaryExpression();
+            while (PeekType() == PreprocessorTokenType.And) {
+                NextToken();
+                bool rightValue = EvalUnaryExpression();
+                value = (value && rightValue);
+            }
+            return value;
+        }
+
+        private bool EvalUnaryExpression() {
+            if (PeekType() == PreprocessorTokenType.Not) {
+                NextToken();
+                return !EvalUnaryExpression();
+            }
+            else {
+                return EvalPrimaryExpression();
+            }
+        }
+
+        private bool EvalPrimaryExpression() {
+            bool value;
+            switch (PeekType()) {
+                case PreprocessorTokenType.OpenParen:
+                    NextToken();
+                    value = EvalEqualsExpression();
+                    Eat(PreprocessorTokenType.CloseParen);
+                    break;
+
+                case PreprocessorTokenType.True:
+                    value = true;
+                    NextToken();
+                    break;
+
+                case PreprocessorTokenType.False:
+                    value = false;
+                    NextToken();
+                    break;
+
+                case PreprocessorTokenType.Identifier:
+                    value = this.defines.Contains(((PreprocessorIdentifierToken)NextToken()).Value.Text);
+                    break;
+
+                case PreprocessorTokenType.CloseParen:
+                case PreprocessorTokenType.EndOfLine:
+                default:
+                    ReportError(PreprocessorError.MisingPPExpression);
+                    value = true;
+                    break;
+            }
+            return value;
+        }
+
+        private void EatEndOfLine() {
+            if (Eat(PreprocessorTokenType.EndOfLine) == null) {
+                lexer.IgnoreRestOfLine();
+            }
+        }
+
+        private PreprocessorTokenType PeekType() {
+            if (token == null) {
+                token = NextToken();
+            }
+            return token.Type;
+        }
+
+        private PreprocessorToken NextToken() {
+            if (this.token == null) {
+                return lexer.NextToken(text);
+            }
+            else {
+                PreprocessorToken token = this.token;
+                this.token = null;
+                return token;
+            }
+        }
+
+        private PreprocessorToken Eat(PreprocessorTokenType type) {
+            if (PeekType() != type) {
+                ReportFormattedError(PreprocessorError.TokenExpected, PreprocessorToken.TypeString(type));
+                return null;
+            }
+            return NextToken();
+        }
+
+        private void ReportError(Error error) {
+            ReportError(error, token.Position);
+        }
+
+        private void ReportFormattedError(Error error, params object[] args) {
+            ReportError(error, token.Position, args);
+        }
+
+        private void ReportError(Error error, BufferPosition position, params object[] args) {
+            if (OnError != null) {
+                OnError(this, new ErrorEventArgs(error, position, args));
+            }
+        }
+
+        private void ReportError(object sender, ErrorEventArgs e) {
+            if (OnError != null) {
+                OnError(this, e);
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorStringToken.cs b/src/Core/Compiler/Parser/PreprocessorStringToken.cs
new file mode 100644
index 000000000..73ca04f1b
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorStringToken.cs
@@ -0,0 +1,26 @@
+// PreprocessorStringToken.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.Parser {
+
+    internal sealed class PreprocessorStringToken : PreprocessorToken {
+
+        private string _value;
+
+        public PreprocessorStringToken(string value, BufferPosition position)
+            : base(PreprocessorTokenType.String, position) {
+            _value = value;
+        }
+
+        public string Value {
+            get {
+                return _value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorTokenType.cs b/src/Core/Compiler/Parser/PreprocessorTokenType.cs
new file mode 100644
index 000000000..c9b251d4d
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorTokenType.cs
@@ -0,0 +1,45 @@
+// PreprocessorTokenType.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Parser {
+
+    internal enum PreprocessorTokenType {
+        Define,
+        Undef,
+        If,
+        Elif,
+        Else,
+        Endif,
+        Error,
+        Warning,
+        Line,
+        Default,
+        Hidden,
+        True,
+        False,
+        Region,
+        EndRegion,
+        Pragma,
+
+        Identifier,
+
+        Int,
+        String,
+        Not,
+        EqualEqual,
+        NotEqual,
+        And,
+        Or,
+        OpenParen,
+        CloseParen,
+        EndOfLine,
+        Unknown,
+        Invalid,
+
+        Last,       // Must be last
+    }
+}
diff --git a/src/Core/Compiler/Parser/PreprocessorTokens.cs b/src/Core/Compiler/Parser/PreprocessorTokens.cs
new file mode 100644
index 000000000..84f05476f
--- /dev/null
+++ b/src/Core/Compiler/Parser/PreprocessorTokens.cs
@@ -0,0 +1,72 @@
+// PreprocessorTokens.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.Parser {
+
+    internal class PreprocessorToken {
+
+        private static readonly string[] strings = new string[] {
+            "define",
+            "undef",
+            "if",
+            "elif",
+            "else",
+            "endif",
+            "error",
+            "warning",
+            "line",
+            "default",
+            "hidden",
+            "true",
+            "false",
+            "region",
+            "endregion",
+            "pragma",
+
+            "identifier",
+
+            "integer constant",
+            "string constant",
+            "!",
+            "==",
+            "!=",
+            "&&",
+            "||",
+            "(",
+            ")",
+            "end of line",
+            "unknown",
+            "invalid",
+        };
+
+        private PreprocessorTokenType _type;
+        private BufferPosition _position;
+
+        public PreprocessorToken(PreprocessorTokenType type, BufferPosition position) {
+            _type = type;
+            _position = position;
+        }
+
+        public BufferPosition Position {
+            get {
+                return _position;
+            }
+        }
+
+        public PreprocessorTokenType Type {
+            get {
+                return _type;
+            }
+        }
+
+        public static string TypeString(PreprocessorTokenType type) {
+            Debug.Assert(strings.Length == (int)PreprocessorTokenType.Last);
+            return strings[(int)type];
+        }
+    }
+}
diff --git a/src/Core/Compiler/Parser/TextBuffer.cs b/src/Core/Compiler/Parser/TextBuffer.cs
new file mode 100644
index 000000000..e22f5ec7d
--- /dev/null
+++ b/src/Core/Compiler/Parser/TextBuffer.cs
@@ -0,0 +1,155 @@
+// TextBuffer.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.Globalization;
+
+namespace ScriptSharp.Parser {
+
+    /// <summary>
+    /// A text buffer which tracks current line and column.
+    /// </summary>
+    internal sealed class TextBuffer {
+
+        private char[] text;
+        private int ich;
+        private int line;
+        private int column;
+
+        public TextBuffer(char[] text) {
+            this.text = text;
+        }
+
+        /// <summary>
+        /// Returns the current character.
+        /// </summary>
+        public char PeekChar() {
+            return PeekChar(0);
+        }
+
+        /// <summary>
+        /// Peeks ahead index chars from the current position.
+        /// </summary>
+        public char PeekChar(int index) {
+            Debug.Assert(ich >= 0);
+            Debug.Assert(index >= 0);
+
+            if (ich + index >= text.Length) {
+                Debug.Assert(ich + index == text.Length);
+                return '\0';
+            }
+            return text[ich + index];
+        }
+
+        /// <summary>
+        /// Advances the current position and returns the current character.
+        /// </summary>
+        public char NextChar() {
+            bool wasCRLF;
+            return NextChar(out wasCRLF);
+        }
+
+        /// <summary>
+        /// Advances the current position and returns the current character.
+        /// </summary>
+        public char NextChar(out bool wasCRLF) {
+            Debug.Assert(ich >= 0);
+            Debug.Assert(ich < text.Length);
+
+            wasCRLF = false;
+            char ch = PeekChar();
+            ich += 1;
+            column += 1;
+            if (Lexer.IsLineSeparator(ch)) {
+                column = 0;
+                line += 1;
+
+                // carriage return followed by a line feed is considered one line break
+                if (ch == '\xD' && ich < text.Length && PeekChar() == '\xA') {
+                    ich += 1;
+                    wasCRLF = true;
+                }
+            }
+
+            Debug.Assert(ich <= text.Length);
+
+            return ch;
+        }
+
+        /// <summary>
+        /// The line number of the current position.
+        /// </summary>
+        public int Line {
+            get {
+                return line;
+            }
+        }
+
+        /// <summary>
+        /// The column number of the current postiion.
+        /// Note that tabs are treated as a single column.
+        /// </summary>
+        public int Column {
+            get {
+                return column;
+            }
+        }
+
+        /// <summary>
+        /// The current position.
+        /// </summary>
+        public BufferPosition Position {
+            get {
+                return new BufferPosition(line, column, ich);
+            }
+        }
+
+        /// <summary>
+        /// The total number of characters in the buffer.
+        /// </summary>
+        public int Length {
+            get {
+                return text.Length;
+            }
+        }
+
+        /// <summary>
+        /// The number of characters remaining in the buffer.
+        /// </summary>
+        public int RemainingLength {
+            get {
+                return text.Length - ich;
+            }
+        }
+
+        /// <summary>
+        /// Is the current position at the end of the buffer.
+        /// </summary>
+        public bool EOF {
+            get {
+                return RemainingLength == 0;
+            }
+        }
+
+        /// <summary>
+        /// Move the current position backwards one character.
+        /// </summary>
+        public void Reverse() {
+            Reverse(1);
+        }
+
+        /// <summary>
+        /// Moves the current position backwards.
+        /// </summary>
+        public void Reverse(int numberOfCharacters) {
+            Debug.Assert(numberOfCharacters >= 0 && numberOfCharacters <= ich);
+            Debug.Assert(numberOfCharacters <= column, "Can't reverse over a line separator");
+
+            ich -= numberOfCharacters;
+            column -= numberOfCharacters;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Preprocessor/CondenserTextReader.cs b/src/Core/Compiler/Preprocessor/CondenserTextReader.cs
new file mode 100644
index 000000000..89fcdffac
--- /dev/null
+++ b/src/Core/Compiler/Preprocessor/CondenserTextReader.cs
@@ -0,0 +1,210 @@
+// CondenserTextReader.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+
+namespace ScriptSharp.Preprocessor {
+
+    internal sealed class CondenserTextReader : TextReader {
+
+        private PreprocessorTextReader _sourceTextReader;
+        private bool _stripCommentsOnly;
+
+        private int _peekedCharacter;
+        private int _lastCharacter;
+
+        private bool _inDoubleQuotedString;
+        private bool _inSingleQuotedString;
+        private bool _inStringEscape;
+        private bool _inRegex;
+        private bool _inRegexEscape;
+        private bool _inSignificantComment;
+        private bool _inSignificantCommentStart;
+
+        public CondenserTextReader(PreprocessorTextReader sourceTextReader, bool stripCommentsOnly) {
+            Debug.Assert(sourceTextReader != null);
+            _sourceTextReader = sourceTextReader;
+            _stripCommentsOnly = stripCommentsOnly;
+
+            _peekedCharacter = -1;
+            _lastCharacter = ' ';
+        }
+
+        private int GetNextCharacter() {
+            int ch = -1;
+
+            while (ch == -1) {
+                ch = _sourceTextReader.Read();
+
+                if (ch == -1) {
+                    break;
+                }
+
+                if (_inStringEscape) {
+                    _inStringEscape = false;
+                }
+                else if (_inRegexEscape) {
+                    _inRegexEscape = false;
+                }
+                else if (_inDoubleQuotedString) {
+                    if (ch == '"') {
+                        _inDoubleQuotedString = false;
+                    }
+                    else if (ch == '\\') {
+                        _inStringEscape = true;
+                    }
+                }
+                else if (_inSingleQuotedString) {
+                    if (ch == '\'') {
+                        _inSingleQuotedString = false;
+                    }
+                    else if (ch == '\\') {
+                        _inStringEscape = true;
+                    }
+                }
+                else if (_inRegex) {
+                    if (ch == '/') {
+                        _inRegex = false;
+                    }
+                    else if (ch == '\\') {
+                        _inRegexEscape = true;
+                    }
+                }
+                else if (_inSignificantComment) {
+                    if (_inSignificantCommentStart) {
+                        Debug.Assert(ch == '!');
+                        ch = '/';
+
+                        _inSignificantCommentStart = false;
+                    }
+                    if (ch == '\n') {
+                        _inSignificantComment = false;
+                    }
+                }
+                else {
+                    if ((_stripCommentsOnly == false) && ((ch == ' ') || (ch == '\t') || (ch == '\n'))) {
+                        if (ch == '\t') {
+                            ch = ' ';
+                        }
+                        if ((_lastCharacter == ' ') || (_lastCharacter == '\n') ||
+                            (IsSpaceSignificantAfter(_lastCharacter) == false) ||
+                            (IsSpaceSignificantBefore(_sourceTextReader.Peek()) == false)) {
+                            ch = -1;
+                        }
+                    }
+                    else if (ch == '\'') {
+                        _inSingleQuotedString = true;
+                    }
+                    else if (ch == '"') {
+                        _inDoubleQuotedString = true;
+                    }
+                    else if (ch == '/') {
+                        int nextChar = _sourceTextReader.Peek();
+                        if (nextChar == '/') {
+                            // Process single line comment to strip it out, unless the
+                            // comment is significant, i.e., //!
+
+                            // First consume the peeked '/', and then read until we see a new line
+                            // or end of input itself.
+                            _sourceTextReader.Read();
+
+                            nextChar = _sourceTextReader.Peek();
+                            if (nextChar == '!') {
+                                _inSignificantComment = true;
+                                _inSignificantCommentStart = true;
+                            }
+                            else {
+                                for (; ; ) {
+                                    ch = _sourceTextReader.Read();
+                                    if ((ch == '\n') || (ch == -1)) {
+                                        ch = -1;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                        else if (nextChar == '*') {
+                            // Process multiline comment to strip it out.
+
+                            // First consume the peeked '*', and then read until we see the
+                            // */ comment terminator.
+                            _sourceTextReader.Read();
+                            for (; ; ) {
+                                ch = _sourceTextReader.Read();
+                                if (ch == '*') {
+                                    if (_sourceTextReader.Peek() == '/') {
+                                        _sourceTextReader.Read();
+
+                                        ch = -1;
+                                        break;
+                                    }
+                                }
+                                else if (ch == -1) {
+                                    RaiseError("Unterminated multiline comment.");
+                                }
+                            }
+                        }
+                        else {
+                            if ((_lastCharacter == '=') || (_lastCharacter == ':') ||
+                                (_lastCharacter == '(') || (_lastCharacter == ',')) {
+                                _inRegex = true;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return ch;
+        }
+
+        private bool IsIdentifierCharacter(int ch) {
+            return ((ch == '_') || (ch == '$') || (ch > 127) ||
+                    ((ch >= 'a') && (ch <= 'z')) ||
+                    ((ch >= 'A') && (ch <= 'Z')) ||
+                    ((ch >= '0') && (ch <= '9')));
+        }
+
+        private bool IsSpaceSignificantAfter(int ch) {
+            return IsIdentifierCharacter(ch) || (ch == '\\') || (ch == '}');
+        }
+
+        private bool IsSpaceSignificantBefore(int ch) {
+            return IsIdentifierCharacter(ch);
+        }
+
+        public override int Peek() {
+            if (_peekedCharacter == -1) {
+                _peekedCharacter = GetNextCharacter();
+            }
+
+            return _peekedCharacter;
+        }
+
+        private void RaiseError(string errorMessage) {
+            throw new PreprocessorException(errorMessage, _sourceTextReader.CurrentLine, _sourceTextReader.CurrentFile, _sourceTextReader.CurrentLineNumber);
+        }
+
+        public override int Read() {
+            if (_peekedCharacter != -1) {
+                _lastCharacter = _peekedCharacter;
+                _peekedCharacter = -1;
+                return _lastCharacter;
+            }
+
+            _lastCharacter = GetNextCharacter();
+
+            if ((_lastCharacter == -1) && 
+                (_inDoubleQuotedString || _inSingleQuotedString)) {
+                RaiseError("Unterminated string.");
+            }
+
+            return _lastCharacter;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Preprocessor/PreprocessorException.cs b/src/Core/Compiler/Preprocessor/PreprocessorException.cs
new file mode 100644
index 000000000..9c655cf29
--- /dev/null
+++ b/src/Core/Compiler/Preprocessor/PreprocessorException.cs
@@ -0,0 +1,48 @@
+// PreprocessorException.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Preprocessor {
+
+    internal sealed class PreprocessorException : Exception {
+
+        private int _line;
+        private string _sourceFile;
+        private string _sourceCode;
+
+        public PreprocessorException(string message, string sourceCode, string sourceFile, int line)
+            : base(message) {
+            _sourceFile = sourceFile;
+            _line = line;
+            _sourceCode = sourceCode;
+        }
+
+        public PreprocessorException(string message, Exception innerException, string sourceCode, string sourceFile, int line)
+            : base(message, innerException) {
+            _sourceFile = sourceFile;
+            _line = line;
+            _sourceCode = sourceCode;
+        }
+
+        public int Line {
+            get {
+                return _line;
+            }
+        }
+
+        public string SourceCode {
+            get {
+                return _sourceCode;
+            }
+        }
+
+        public string SourceFile {
+            get {
+                return _sourceFile;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Preprocessor/PreprocessorTextReader.cs b/src/Core/Compiler/Preprocessor/PreprocessorTextReader.cs
new file mode 100644
index 000000000..fd4c2fd67
--- /dev/null
+++ b/src/Core/Compiler/Preprocessor/PreprocessorTextReader.cs
@@ -0,0 +1,614 @@
+// PreprocessorTextReader.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using ScriptSharp;
+
+namespace ScriptSharp.Preprocessor {
+
+    internal sealed class PreprocessorTextReader : TextReader {
+
+        private TextWriter _skipPreprocessingWriter;
+
+        private IStreamSource _source;
+        private IStreamResolver _includeResolver;
+        private IScriptInfo _scriptInfo;
+
+        private Dictionary<string, string> _definedVariables;
+        private Stack<Instruction> _activeInstructions;
+
+        private string _currentLine;
+        private int _currentLinePosition;
+
+        private int _lineCounter;
+
+        private Stream _sourceStream;
+        private TextReader _sourceTextReader;
+
+        private IStreamSource _include;
+        private Stream _includeStream;
+        private TextReader _includeTextReader;
+        private int _includeLineCounter;
+
+        public PreprocessorTextReader(IStreamSource source, ICollection<string> predefinedVariables, IStreamResolver includeResolver, IScriptInfo scriptInfo) {
+            Debug.Assert(source != null);
+
+            _source = source;
+            _includeResolver = includeResolver;
+            _scriptInfo = scriptInfo;
+
+            _definedVariables = new Dictionary<string, string>();
+            _activeInstructions = new Stack<Instruction>();
+
+            if ((predefinedVariables != null) && (predefinedVariables.Count != 0)) {
+                foreach (string s in predefinedVariables) {
+                    _definedVariables[s] = String.Empty;
+                }
+            }
+
+            _currentLinePosition = -1;
+        }
+
+        internal string CurrentFile {
+            get {
+                if (_includeTextReader != null) {
+                    return _include.FullName;
+                }
+                return _source.FullName;
+            }
+        }
+
+        internal string CurrentLine {
+            get {
+                return _currentLine;
+            }
+        }
+
+        internal int CurrentLineNumber {
+            get {
+                if (_includeTextReader != null) {
+                    return _includeLineCounter;
+                }
+                return _lineCounter;
+            }
+        }
+
+        private void ClearLine() {
+            _currentLinePosition = -1;
+            _currentLine = null;
+        }
+
+        public override void Close() {
+            if (_includeStream != null) {
+                _include.CloseStream(_includeStream);
+                _includeStream = null;
+            }
+            if (_sourceStream != null) {
+                _source.CloseStream(_sourceStream);
+                _sourceStream = null;
+            }
+
+            base.Close();
+        }
+
+        private bool EnsureLine() {
+            if (_currentLine == null) {
+                Debug.Assert(_currentLinePosition == -1);
+
+                _currentLine = GetNextLine();
+                if (_currentLine != null) {
+                    _currentLinePosition = 0;
+                    return true;
+                }
+                else {
+                    if (_activeInstructions.Count != 0) {
+                        RaiseError("Unterminated '#if' instruction was detected.");
+                    }
+
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private string GetNextLine() {
+            string line = null;
+
+            while (line == null) {
+                if (_includeTextReader != null) {
+                    line = _includeTextReader.ReadLine();
+                    _includeLineCounter++;
+
+                    if (line == null) {
+                        _includeTextReader = null;
+                        _includeLineCounter = 0;
+
+                        _include.CloseStream(_includeStream);
+                        _includeStream = null;
+                        _include = null;
+                    }
+                }
+                if (line == null) {
+                    line = _sourceTextReader.ReadLine();
+                    _lineCounter++;
+                }
+
+                if (line == null) {
+                    break;
+                }
+
+                string trimmedLine = line.TrimStart(' ', '\t');
+
+                bool isActive = true;
+                if (_activeInstructions.Count != 0) {
+                    Instruction currentInstruction = _activeInstructions.Peek();
+                    isActive = currentInstruction.IsActive;
+                }
+
+                if (trimmedLine.StartsWith("##")) {
+                    if (isActive == false) {
+                        line = null;
+                    }
+                    if (line != null) {
+                        line = ProcessSingleLineInstruction(trimmedLine);
+                    }
+                }
+                else if (trimmedLine.StartsWith("#include[as-is] ")) {
+                    if (isActive == false) {
+                        line = null;
+                    }
+
+                    if (line != null) {
+                        _currentLine = line;
+                        if (_includeResolver != null) {
+                            ProcessIncludeInstruction(trimmedLine, /* skipPreprocessing */ true);
+                            line = null;
+                        }
+                        else {
+                            RaiseError("Includes are not supported in this file.");
+                        }
+                    }
+                }
+                else if (trimmedLine.StartsWith("#include ")) {
+                    if (isActive == false) {
+                        line = null;
+                    }
+
+                    if (line != null) {
+                        _currentLine = line;
+                        if (_includeResolver != null) {
+                            if (_includeStream == null) {
+                                ProcessIncludeInstruction(trimmedLine, /* skipPreprocessing */ false);
+                                line = null;
+                            }
+                            else {
+                                RaiseError("Nested includes are not supported.");
+                            }
+                        }
+                        else {
+                            RaiseError("Includes are not supported in this file.");
+                        }
+                    }
+                }
+                else if (trimmedLine.StartsWith("#")) {
+                    if ((isActive == false) &&
+                        (trimmedLine.StartsWith("#elseif ") == false) &&
+                        (trimmedLine.StartsWith("#elif ") == false) &&
+                        (trimmedLine.StartsWith("#else") == false) &&
+                        (trimmedLine.StartsWith("#endif") == false)) {
+                        line = null;
+                    }
+
+                    if (line != null) {
+                        ProcessInstruction(trimmedLine);
+                        line = null;
+                    }
+                }
+                else {
+                    if (isActive == false) {
+                        line = null;
+                    }
+                }
+            }
+
+            return ProcessInlineInstruction(line);
+        }
+
+        public bool Initialize(TextWriter skipPreprocessingWriter) {
+            _skipPreprocessingWriter = skipPreprocessingWriter;
+
+            _sourceStream = _source.GetStream();
+            if (_sourceStream == null) {
+                return false;
+            }
+
+            _sourceTextReader = new StreamReader(_sourceStream);
+            return true;
+        }
+
+        private string ParseInstructionVariable(string instructionLine, int startIndex, out int endIndex) {
+            endIndex = -1;
+
+            int i = startIndex;
+            while (i < instructionLine.Length) {
+                char ch = instructionLine[i];
+                if ((ch != ' ') && (ch != '\t')) {
+                    break;
+                }
+                i++;
+            }
+
+            if (i < instructionLine.Length) {
+                int j = i;
+                while (j < instructionLine.Length) {
+                    char ch = instructionLine[j];
+                    if ((ch == ' ') || (ch == '\t')) {
+                        break;
+                    }
+                    j++;
+                }
+
+                endIndex = j;
+                return instructionLine.Substring(i, j - i);
+            }
+
+            return null;
+        }
+
+        public override int Peek() {
+            if (EnsureLine() == false) {
+                return -1;
+            }
+
+            int ch;
+            if (_currentLinePosition == _currentLine.Length) {
+                ch = '\n';
+            }
+            else {
+                ch = _currentLine[_currentLinePosition];
+            }
+
+            return ch;
+        }
+
+        private void ProcessIncludeInstruction(string instructionLine, bool skipPreprocessing) {
+            Debug.Assert(_includeStream == null);
+            Debug.Assert(_includeTextReader == null);
+
+            bool included = false;
+            int beginQuoteIndex = instructionLine.IndexOf('"');
+            int endQuoteIndex = 0;
+
+            if (beginQuoteIndex > 0) {
+                endQuoteIndex = instructionLine.IndexOf('"', beginQuoteIndex + 1);
+            }
+
+            if (endQuoteIndex > 0) {
+                Exception resolveException = null;
+                string includePath = instructionLine.Substring(beginQuoteIndex + 1, endQuoteIndex - beginQuoteIndex - 1);
+                try {
+                    _include = _includeResolver.ResolveInclude(_source, includePath);
+
+                    if (_include != null) {
+                        _includeStream = _include.GetStream();
+                        if (_includeStream != null) {
+                            _includeTextReader = new StreamReader(_includeStream);
+                            _includeLineCounter = 0;
+
+                            if (skipPreprocessing) {
+                                string includeText = _includeTextReader.ReadToEnd();
+                                _skipPreprocessingWriter.Write(includeText);
+
+                                _include.CloseStream(_includeStream);
+                                _includeTextReader = null;
+                                _includeStream = null;
+
+                                included = true;
+                            }
+                        }
+                    }
+                }
+                catch (Exception e) {
+                    resolveException = e;
+                }
+
+                if ((included == false) && (_includeTextReader == null)) {
+                    RaiseError("Unable to resolve or open included file '" + includePath + "'", resolveException);
+                }
+            }
+            else {
+                RaiseError("Invalid #include instruction.");
+            }
+        }
+
+        private string ProcessInlineInstruction(string line) {
+            if (String.IsNullOrEmpty(line)) {
+                return line;
+            }
+
+            int inlineInstructionIndex;
+
+            // Processes inline instructions within the line such as
+            // ... #= XYZ ## ...
+            inlineInstructionIndex = line.IndexOf("#=");
+            while (inlineInstructionIndex >= 0) {
+                int variableEndIndex;
+                string variable = ParseInstructionVariable(line, inlineInstructionIndex + 2, out variableEndIndex);
+                if (variable == null) {
+                    RaiseError("Variable name was missing after '#=' instruction.");
+                    continue;
+                }
+
+                string value = _scriptInfo.GetValue(variable);
+                if (value == null) {
+                    RaiseError("Unknown variable name, '" + variable + "' after '#=' instruction.");
+                    continue;
+                }
+
+                int inlineInstructionEndIndex = line.IndexOf("##", variableEndIndex);
+                if (inlineInstructionEndIndex < 0) {
+                    RaiseError("Invalid instruction. Missing ending '##' after '#='.");
+                    continue;
+                }
+
+                if (line.Length > inlineInstructionEndIndex + 2) {
+                    line = line.Substring(0, inlineInstructionIndex) + value + line.Substring(inlineInstructionEndIndex + 2);
+                }
+                else {
+                    line = line.Substring(0, inlineInstructionIndex) + value;
+                }
+
+                inlineInstructionIndex = line.IndexOf("#=");
+            }
+
+            // Processes inline instructions within the line such as
+            // ... #? DEBUG ... ## ...
+            inlineInstructionIndex = line.IndexOf("#?");
+            while (inlineInstructionIndex >= 0) {
+                int variableEndIndex;
+                string variable = ParseInstructionVariable(line, inlineInstructionIndex + 2, out variableEndIndex);
+                if (variable == null) {
+                    RaiseError("Variable name was missing after '#?' instruction.");
+                    continue;
+                }
+
+                int inlineInstructionEndIndex = line.IndexOf("##", variableEndIndex);
+                if (inlineInstructionEndIndex < 0) {
+                    RaiseError("Invalid instruction. Missing ending '##' after '#?'.");
+                    continue;
+                }
+
+                if (_definedVariables.ContainsKey(variable)) {
+                    int scriptIndex = variableEndIndex + 1;
+                    if (line.Length > scriptIndex) {
+                        line = line.Remove(inlineInstructionEndIndex, 2);
+                        line = line.Remove(inlineInstructionIndex, variableEndIndex - inlineInstructionIndex);
+                    }
+                    else {
+                        RaiseError("No script was present on the line after the '##' instruction.");
+                    }
+                }
+                else {
+                    // Update the line to be everything except for the inline instruction
+                    line = line.Remove(inlineInstructionIndex, inlineInstructionEndIndex - inlineInstructionIndex + 2);
+                }
+
+                inlineInstructionIndex = line.IndexOf("#?");
+            }
+
+            return line;
+        }
+
+        private void ProcessInstruction(string instructionLine) {
+            int dummy;
+            if (instructionLine.StartsWith("#define ")) {
+                string variableName = ParseInstructionVariable(instructionLine, 8, out dummy);
+                if (variableName == null) {
+                    RaiseError("Missing variable following the '#define' instruction.");
+                }
+                if (_definedVariables.ContainsKey(variableName)) {
+                    RaiseError("Duplicate definition of variable '" + variableName + "'.");
+                }
+
+                _definedVariables[variableName] = String.Empty;
+            }
+            else if (instructionLine.StartsWith("#undefine ")) {
+                string variableName = ParseInstructionVariable(instructionLine, 10, out dummy);
+
+                if (variableName == null) {
+                    RaiseError("Missing variable following the '#undefine' instruction.");
+                }
+                if (_definedVariables.ContainsKey(variableName) == false) {
+                    RaiseError("The variable '" + variableName + "' has not been defined yet.");
+                }
+
+                _definedVariables.Remove(variableName);
+            }
+            else if (instructionLine.StartsWith("#if ")) {
+                string variableName = ParseInstructionVariable(instructionLine, 4, out dummy);
+
+                if (variableName == null) {
+                    RaiseError("Missing variable following the '#if' instruction.");
+                }
+
+                Instruction instruction = new Instruction();
+                _activeInstructions.Push(instruction);
+
+                instruction.AddVariable(variableName, _definedVariables);
+            }
+            else if (instructionLine.StartsWith("#elseif ") ||
+                     instructionLine.StartsWith("#elif ")) {
+                string variableName = ParseInstructionVariable(instructionLine, 8, out dummy);
+                if (variableName == null) {
+                    RaiseError("Missing variable following the '#elif' instruction.");
+                }
+
+                if (_activeInstructions.Count == 0) {
+                    RaiseError("Unexpected '#elif' instruction.");
+                }
+
+                Instruction currentInstruction = _activeInstructions.Peek();
+                bool added = currentInstruction.AddVariable(variableName, _definedVariables);
+
+                if (added == false) {
+                    RaiseError("The specified '" + variableName + "' has already been used, or an '#else' instruction has already been specified.");
+                }
+            }
+            else if (instructionLine.StartsWith("#else")) {
+                if (_activeInstructions.Count == 0) {
+                    RaiseError("Unexpected '#else' instruction.");
+                }
+
+                Instruction currentInstruction = _activeInstructions.Peek();
+                bool added = currentInstruction.AddVariable(null, _definedVariables);
+
+                if (added == false) {
+                    RaiseError("Only a single '#else' instruction is allowed for a given '#if' instruction.");
+                }
+            }
+            else if (instructionLine.StartsWith("#endif")) {
+                if (_activeInstructions.Count == 0) {
+                    RaiseError("Unexpected '#endif' instruction.");
+                }
+
+                _activeInstructions.Pop();
+            }
+        }
+
+        private string ProcessSingleLineInstruction(string instructionLine) {
+            string scriptLine = null;
+
+            int variableEndIndex;
+            string variable = ParseInstructionVariable(instructionLine, 2, out variableEndIndex);
+            if (variable == null) {
+                RaiseError("Variable name was missing after '##' instruction.");
+            }
+
+            if (_definedVariables.ContainsKey(variable)) {
+                int scriptIndex = variableEndIndex + 1;
+                if (instructionLine.Length > scriptIndex) {
+                    scriptLine = instructionLine.Substring(scriptIndex);
+                }
+                else {
+                    RaiseError("No script was present on the line after the '##' instruction.");
+                }
+            }
+
+            return scriptLine;
+        }
+
+        private void RaiseError(string errorMessage) {
+            RaiseError(errorMessage, null);
+        }
+
+        private void RaiseError(string errorMessage, Exception innerException) {
+            string path = CurrentFile;
+            int lineNumber = CurrentLineNumber;
+
+            if (_includeStream != null) {
+                _includeStream.Close();
+                _includeStream = null;
+
+                _includeTextReader = null;
+            }
+
+            if (innerException == null) {
+                throw new PreprocessorException(errorMessage, _currentLine, path, lineNumber);
+            }
+            else {
+                throw new PreprocessorException(errorMessage, _currentLine, path, lineNumber);
+            }
+        }
+
+        public override int Read() {
+            if (EnsureLine() == false) {
+                return -1;
+            }
+
+            int ch;
+            if (_currentLinePosition == _currentLine.Length) {
+                ch = '\n';
+                ClearLine();
+            }
+            else {
+                ch = _currentLine[_currentLinePosition];
+                _currentLinePosition++;
+            }
+
+            return ch;
+        }
+
+
+        private sealed class Instruction {
+
+            private ArrayList _variables;
+            private bool _active;
+            private bool _activated;
+            private bool _canAddVariables;
+
+            public Instruction() {
+                _variables = new ArrayList();
+                _canAddVariables = true;
+            }
+
+            public bool IsActive {
+                get {
+                    return _active;
+                }
+            }
+
+            public bool AddVariable(string variable, Dictionary<string, string> definedVariables) {
+                if (variable == null) {
+                    if (_canAddVariables == false) {
+                        // already seen #else
+                        return false;
+                    }
+
+                    _canAddVariables = false;
+                    if (_activated == false) {
+                        // #else should be active if no other block was activated
+                        _active = true;
+                        _activated = true;
+                    }
+                    else {
+                        _active = false;
+                    }
+                    return true;
+                }
+                else {
+                    if (_canAddVariables == false) {
+                        // already seen #else
+                        return false;
+                    }
+
+                    if (_variables.Contains(variable)) {
+                        // duplicate use of same variable
+                        return false;
+                    }
+
+                    _variables.Add(variable);
+                    if (_active) {
+                        // no longer active
+                        _active = false;
+                    }
+                    else if (_activated == false) {
+                        if (definedVariables.ContainsKey(variable)) {
+                            // variable is defined, so the block becomes activated
+                            _active = true;
+                            _activated = true;
+                        }
+                    }
+
+                    return true;
+                }
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/PreprocessorOptions.cs b/src/Core/Compiler/PreprocessorOptions.cs
new file mode 100644
index 000000000..8fb4c8aa8
--- /dev/null
+++ b/src/Core/Compiler/PreprocessorOptions.cs
@@ -0,0 +1,93 @@
+// PreprocessorOptions.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+
+namespace ScriptSharp {
+
+    /// <summary>
+    /// Script# pre-processor options.
+    /// </summary>
+    public sealed class PreprocessorOptions {
+
+        private ICollection<string> _preprocessorVariables;
+        private IStreamSource _sourceFile;
+        private IStreamSource _targetFile;
+        private bool _stripCommentsOnly;
+        private bool _useWindowsLineBreaks;
+        private bool _debug;
+        private bool _minimize;
+
+        public bool DebugFlavor {
+            get {
+                return _debug;
+            }
+            set {
+                _debug = value;
+            }
+        }
+
+        public bool Minimize {
+            get {
+                if (!DebugFlavor) {
+                    return _minimize;
+                }
+                return false;
+            }
+            set {
+                _minimize = value;
+            }
+        }
+
+        public ICollection<string> PreprocessorVariables {
+            get {
+                return _preprocessorVariables;
+            }
+            set {
+                _preprocessorVariables = value;
+            }
+        }
+
+        public IStreamSource SourceFile {
+            get {
+                return _sourceFile;
+            }
+            set {
+                _sourceFile = value;
+            }
+        }
+
+        public bool StripCommentsOnly {
+            get {
+                return _stripCommentsOnly;
+            }
+            set {
+                _stripCommentsOnly = value;
+            }
+        }
+
+        public IStreamSource TargetFile {
+            get {
+                return _targetFile;
+            }
+            set {
+                _targetFile = value;
+            }
+        }
+
+        public bool UseWindowsLineBreaks {
+            get {
+                return _useWindowsLineBreaks;
+            }
+            set {
+                _useWindowsLineBreaks = value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Properties/AssemblyInfo.cs b/src/Core/Compiler/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..30ffb967e
--- /dev/null
+++ b/src/Core/Compiler/Properties/AssemblyInfo.cs
@@ -0,0 +1,13 @@
+// AssemblyInfo.cs
+// Script#/ScriptSharp
+// Copyright (c) Nikhil Kothari, 2006. All Rights Reserved.
+//
+// Assembly Metadata
+//
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("ScriptSharp")]
+[assembly: AssemblyDescription("Script# Compiler Core")]
diff --git a/src/Core/Compiler/ScriptCompiler.cs b/src/Core/Compiler/ScriptCompiler.cs
new file mode 100644
index 000000000..3dd0c405f
--- /dev/null
+++ b/src/Core/Compiler/ScriptCompiler.cs
@@ -0,0 +1,423 @@
+// ScriptCompiler.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using ScriptSharp.CodeModel;
+using ScriptSharp.Compiler;
+using ScriptSharp.Generator;
+using ScriptSharp.Importer;
+using ScriptSharp.ResourceModel;
+using ScriptSharp.ScriptModel;
+using ScriptSharp.Validator;
+
+namespace ScriptSharp {
+
+    /// <summary>
+    /// The Script# compiler.
+    /// </summary>
+    public sealed class ScriptCompiler : IErrorHandler, IStreamResolver, IScriptInfo {
+
+        private CompilerOptions _options;
+        private IErrorHandler _errorHandler;
+
+        private ParseNodeList _compilationUnitList;
+        private SymbolSet _symbols;
+        private ICollection<TypeSymbol> _importedSymbols;
+        private ICollection<TypeSymbol> _appSymbols;
+        private bool _hasErrors;
+
+#if DEBUG
+        private string _testOutput;
+#endif
+
+        public ScriptCompiler()
+            : this(null) {
+        }
+
+        public ScriptCompiler(IErrorHandler errorHandler) {
+            _errorHandler = errorHandler;
+        }
+
+        private void BuildCodeModel() {
+            _compilationUnitList = new ParseNodeList();
+
+            CodeModelBuilder codeModelBuilder = new CodeModelBuilder(_options, this);
+            CodeModelValidator codeModelValidator = new CodeModelValidator(this);
+            CodeModelProcessor validationProcessor = new CodeModelProcessor(codeModelValidator, _options);
+
+            foreach (IStreamSource source in _options.Sources) {
+                CompilationUnitNode compilationUnit = codeModelBuilder.BuildCodeModel(source);
+                if (compilationUnit != null) {
+                    validationProcessor.Process(compilationUnit);
+
+                    _compilationUnitList.Append(compilationUnit);
+                }
+            }
+        }
+
+        private void BuildImplementation() {
+            CodeBuilder codeBuilder = new CodeBuilder(_options, this);
+            ICollection<SymbolImplementation> implementations = codeBuilder.BuildCode(_symbols);
+
+            if (_options.Minimize) {
+                foreach (SymbolImplementation impl in implementations) {
+                    if (impl.Scope == null) {
+                        continue;
+                    }
+
+                    SymbolObfuscator obfuscator = new SymbolObfuscator();
+                    SymbolImplementationTransformer transformer = new SymbolImplementationTransformer(obfuscator);
+
+                    transformer.TransformSymbolImplementation(impl);
+                }
+            }
+        }
+
+        private void BuildMetadata() {
+            if ((_options.Resources != null) && (_options.Resources.Count != 0)) {
+                ResourcesBuilder resourcesBuilder = new ResourcesBuilder(_symbols);
+                resourcesBuilder.BuildResources(_options.Resources);
+            }
+
+            MetadataBuilder mdBuilder = new MetadataBuilder(this);
+            _appSymbols = mdBuilder.BuildMetadata(_compilationUnitList, _symbols, _options);
+
+            // Check if any of the types defined in this assembly conflict against types in
+            // imported assemblies.
+
+            Dictionary<string, TypeSymbol> types = new Dictionary<string, TypeSymbol>();
+            foreach (TypeSymbol importedType in _importedSymbols) {
+                types[importedType.FullGeneratedName] = importedType;
+            }
+
+            foreach (TypeSymbol appType in _appSymbols) {
+                if ((appType.IsApplicationType == false) || (appType.Type == SymbolType.Delegate)) {
+                    // Skip the check for types that are marked as imported, as they
+                    // aren't going to be generated into the script.
+                    // Delegates are implicitly imported types, as they're never generated into
+                    // the script.
+                    continue;
+                }
+
+                if ((appType.Type == SymbolType.Class) &&
+                    (((ClassSymbol)appType).PrimaryPartialClass != appType)) {
+                    // Skip the check for partial types, since they should only be
+                    // checked once.
+                    continue;
+                }
+
+                string name = appType.FullGeneratedName;
+                if (types.ContainsKey(name)) {
+                    string error = "The type '" + name + "' conflicts with another existing type with the same full name. This might be because a referenced assembly uses the same type, or you have multiple types with the same name across namespaces mapped to the same script namespace.";
+                    ((IErrorHandler)this).ReportError(error, null);
+                }
+                else {
+                    types[name] = appType;
+                }
+            }
+
+            // Capture whether there are any test types in the project
+            // when not compiling the test flavor script. This is used to determine
+            // if the test flavor script should be compiled in the build task.
+
+            if (_options.IncludeTests == false) {
+                foreach (TypeSymbol appType in _appSymbols) {
+                    if (appType.IsApplicationType && appType.IsTestType) {
+                        _options.HasTestTypes = true;
+                    }
+                }
+            }
+
+#if DEBUG
+            if (_options.InternalTestType == "metadata") {
+                StringWriter testWriter = new StringWriter();
+
+                testWriter.WriteLine("Metadata");
+                testWriter.WriteLine("================================================================");
+
+                SymbolSetDumper symbolDumper = new SymbolSetDumper(testWriter);
+                symbolDumper.DumpSymbols(_symbols);
+
+                testWriter.WriteLine();
+                testWriter.WriteLine();
+
+                _testOutput = testWriter.ToString();
+            }
+#endif // DEBUG
+
+            if (_options.Minimize) {
+                SymbolObfuscator obfuscator = new SymbolObfuscator();
+                SymbolSetTransformer obfuscationTransformer = new SymbolSetTransformer(obfuscator);
+
+                ICollection<Symbol> obfuscatedSymbols = obfuscationTransformer.TransformSymbolSet(_symbols, /* useInheritanceOrder */ true);
+
+#if DEBUG
+                if (_options.InternalTestType == "minimizationMap") {
+                    StringWriter testWriter = new StringWriter();
+
+                    testWriter.WriteLine("Minimization Map");
+                    testWriter.WriteLine("================================================================");
+
+                    List<Symbol> sortedObfuscatedSymbols = new List<Symbol>(obfuscatedSymbols);
+                    sortedObfuscatedSymbols.Sort(delegate(Symbol s1, Symbol s2) {
+                        return String.Compare(s1.Name, s2.Name);
+                    });
+
+                    foreach (Symbol obfuscatedSymbol in sortedObfuscatedSymbols) {
+                        if (obfuscatedSymbol is TypeSymbol) {
+                            TypeSymbol typeSymbol = (TypeSymbol)obfuscatedSymbol;
+
+                            testWriter.WriteLine("Type '" + typeSymbol.FullName + "' renamed to '" + typeSymbol.GeneratedName + "'");
+                        }
+                        else {
+                            Debug.Assert(obfuscatedSymbol is MemberSymbol);
+                            testWriter.WriteLine("    Member '" + obfuscatedSymbol.Name + "' renamed to '" + obfuscatedSymbol.GeneratedName + "'");
+                        }
+                    }
+
+                    testWriter.WriteLine();
+                    testWriter.WriteLine();
+
+                    _testOutput = testWriter.ToString();
+                }
+#endif // DEBUG
+            }
+            else {
+                if (_options.DebugFlavor) {
+                    SymbolInternalizer internalizer = new SymbolInternalizer();
+                    SymbolSetTransformer internalizingTransformer = new SymbolSetTransformer(internalizer);
+
+                    internalizingTransformer.TransformSymbolSet(_symbols, /* useInheritanceOrder */ true);
+                }
+            }
+        }
+
+        public bool Compile(CompilerOptions options) {
+            if (options == null) {
+                throw new ArgumentNullException("options");
+            }
+            _options = options;
+
+            _hasErrors = false;
+            _symbols = new SymbolSet();
+
+            ImportMetadata();
+            if (_hasErrors) {
+                return false;
+            }
+
+            BuildCodeModel();
+            if (_hasErrors) {
+                return false;
+            }
+
+            BuildMetadata();
+            if (_hasErrors) {
+                return false;
+            }
+
+            BuildImplementation();
+            if (_hasErrors) {
+                return false;
+            }
+
+            GenerateScript();
+            if (_hasErrors) {
+                return false;
+            }
+
+            return true;
+        }
+
+        private void GenerateScript() {
+            if (_options.TemplateFile != null) {
+                PreprocessorOptions preprocessorOptions = new PreprocessorOptions();
+                preprocessorOptions.SourceFile = _options.TemplateFile;
+                preprocessorOptions.TargetFile = _options.ScriptFile;
+                preprocessorOptions.DebugFlavor = _options.DebugFlavor;
+                preprocessorOptions.Minimize = _options.Minimize;
+                // preprocessorOptions.StripCommentsOnly = _options.StripCommentsOnly;
+                preprocessorOptions.UseWindowsLineBreaks = !_options.Minimize;
+                preprocessorOptions.PreprocessorVariables = _options.Defines;
+
+                ScriptPreprocessor preprocessor = new ScriptPreprocessor(this, this, this);
+                preprocessor.Preprocess(preprocessorOptions);
+            }
+            else {
+                Stream outputStream = null;
+                TextWriter outputWriter = null;
+
+                try {
+                    outputStream = _options.ScriptFile.GetStream();
+                    if (outputStream == null) {
+                        ((IErrorHandler)this).ReportError("Unable to write to file " + _options.ScriptFile.FullName,
+                                                                  _options.ScriptFile.FullName);
+                        return;
+                    }
+
+                    outputWriter = new StreamWriter(outputStream);
+
+#if DEBUG
+                    if (_options.InternalTestMode) {
+                        if (_testOutput != null) {
+                            outputWriter.Write(_testOutput);
+                            outputWriter.WriteLine("Script");
+                            outputWriter.WriteLine("================================================================");
+                            outputWriter.WriteLine();
+                            outputWriter.WriteLine();
+                        }
+                    }
+#endif // DEBUG
+
+                    GenerateScriptCore(outputWriter);
+                }
+                catch (Exception e) {
+                    Debug.Fail(e.ToString());
+                }
+                finally {
+                    if (outputWriter != null) {
+                        outputWriter.Flush();
+                    }
+                    if (outputStream != null) {
+                        _options.ScriptFile.CloseStream(outputStream);
+                    }
+                }
+            }
+        }
+
+        private void GenerateScriptCore(TextWriter writer) {
+            ScriptGenerator scriptGenerator = new ScriptGenerator(writer, _options, this);
+            scriptGenerator.GenerateScript(_symbols);
+        }
+
+        private void ImportMetadata() {
+            MetadataImporter mdImporter = new MetadataImporter(_options, this);
+
+            _importedSymbols = mdImporter.ImportMetadata(_options.References, _symbols);
+        }
+
+        #region Implementation of IErrorHandler
+        void IErrorHandler.ReportError(string errorMessage, string location) {
+            _hasErrors = true;
+
+            if (_errorHandler != null) {
+                _errorHandler.ReportError(errorMessage, location);
+                return;
+            }
+
+            if (String.IsNullOrEmpty(location) == false) {
+                Console.Error.Write(location);
+                Console.Error.Write(": ");
+            }
+
+            Console.Error.WriteLine(errorMessage);
+        }
+        #endregion
+
+        #region Implementation of IStreamResolver
+        IStreamSource IStreamResolver.ResolveInclude(IStreamSource baseStream, string includePath) {
+            if (includePath == "%code%") {
+                StringBuilder sb = new StringBuilder(4096);
+                StringWriter sw = new StringWriter(sb);
+
+                sw.WriteLine();
+                GenerateScriptCore(sw);
+
+                string compiledCode = sb.ToString();
+                return new CodeStreamSource(compiledCode);
+            }
+            else {
+                IStreamResolver resolver = baseStream as IStreamResolver;
+                if (resolver != null) {
+                    return resolver.ResolveInclude(baseStream, includePath);
+                }
+
+                string resolvedPath = Path.Combine(Path.GetDirectoryName(Path.GetFullPath(baseStream.FullName)), includePath);
+                return new FileInputStreamSource(resolvedPath);
+            }
+        }
+        #endregion
+
+        #region Implementation of IScriptInfo
+        string IScriptInfo.GetValue(string name) {
+            if (_symbols == null) {
+                return null;
+            }
+
+            if (String.CompareOrdinal(name, "Name") == 0) {
+                if (String.IsNullOrEmpty(_options.ScriptNameSuffix) == false) {
+                    return _symbols.ScriptName + "." + _options.ScriptNameSuffix;
+                }
+                return _symbols.ScriptName;
+            }
+            if (String.CompareOrdinal(name, "ExecutionDependencies") == 0) {
+                if (_options.ExecutionDependencies == null) {
+                    return String.Empty;
+                }
+
+                bool first = true;
+                StringBuilder sb = new StringBuilder();
+                foreach (string scriptName in _options.ExecutionDependencies) {
+                    if (first == false) {
+                        sb.Append(",");
+                    }
+                    sb.Append(scriptName);
+                    first = false;
+                }
+
+                return sb.ToString();
+            }
+            if (String.CompareOrdinal(name, "ScriptFile") == 0) {
+                return Path.GetFileName(_options.ScriptFile.Name);
+            }
+            if (String.CompareOrdinal(name, "CompilerVersion") == 0) {
+                string exePath = typeof(ScriptCompiler).Assembly.GetModules()[0].FullyQualifiedName;
+                FileVersionInfo versionInfo = FileVersionInfo.GetVersionInfo(exePath);
+
+                return versionInfo.FileVersion;
+            }
+
+            return null;
+        }
+        #endregion
+
+
+        private sealed class CodeStreamSource : IStreamSource {
+
+            private string _code;
+
+            public CodeStreamSource(string code) {
+                _code = code;
+            }
+
+            public string FullName {
+                get {
+                    return "%code%";
+                }
+            }
+
+            public string Name {
+                get {
+                    return "%code%";
+                }
+            }
+
+            public void CloseStream(Stream stream) {
+                Debug.Assert(stream != null);
+                stream.Close();
+            }
+
+            public Stream GetStream() {
+                byte[] buffer = Encoding.Default.GetBytes(_code);
+                return new MemoryStream(buffer);
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/BaseExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/BaseExpression.cs
new file mode 100644
index 000000000..3db1406e3
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/BaseExpression.cs
@@ -0,0 +1,26 @@
+// BaseExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    /// <summary>
+    /// Represents the base class of the current type context.
+    /// </summary>
+    internal sealed class BaseExpression : Expression {
+
+        public BaseExpression(ClassSymbol classSymbol)
+            : base(ExpressionType.Base, classSymbol, SymbolFilter.Public | SymbolFilter.Protected | SymbolFilter.InstanceMembers) {
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/BaseInitializerExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/BaseInitializerExpression.cs
new file mode 100644
index 000000000..6362ea4e4
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/BaseInitializerExpression.cs
@@ -0,0 +1,41 @@
+// BaseInitializerExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class BaseInitializerExpression : Expression {
+
+        private Collection<Expression> _parameters;
+
+        public BaseInitializerExpression()
+            : base(ExpressionType.BaseInitializer, null, 0) {
+        }
+
+        public ICollection<Expression> Parameters {
+            get {
+                return _parameters;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                return true;
+            }
+        }
+
+        public void AddParameterValue(Expression expression) {
+            if (_parameters == null) {
+                _parameters = new Collection<Expression>();
+            }
+            _parameters.Add(expression);
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/BinaryExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/BinaryExpression.cs
new file mode 100644
index 000000000..b856a0e6f
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/BinaryExpression.cs
@@ -0,0 +1,58 @@
+// BinaryExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class BinaryExpression : Expression {
+
+        private Expression _leftOperand;
+        private Expression _rightOperand;
+        private Operator _operator;
+
+        public BinaryExpression(Operator operatorType, Expression leftOperand, Expression rightOperand)
+            : this(operatorType, leftOperand, rightOperand, leftOperand.EvaluatedType) {
+        }
+
+        public BinaryExpression(Operator operatorType, Expression leftOperand, Expression rightOperand, TypeSymbol evaluatedType)
+            : base(ExpressionType.Binary, evaluatedType, SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _operator = operatorType;
+            _leftOperand = leftOperand;
+            _rightOperand = rightOperand;
+        }
+
+        protected override bool IsParenthesisRedundant {
+            get {
+                return false;
+            }
+        }
+
+        public Expression LeftOperand {
+            get {
+                return _leftOperand;
+            }
+        }
+
+        public Operator Operator {
+            get {
+                return _operator;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                return _leftOperand.RequiresThisContext || _rightOperand.RequiresThisContext;
+            }
+        }
+
+        public Expression RightOperand {
+            get {
+                return _rightOperand;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/ConditionalExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/ConditionalExpression.cs
new file mode 100644
index 000000000..803c98914
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/ConditionalExpression.cs
@@ -0,0 +1,55 @@
+// ConditionalExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class ConditionalExpression : Expression {
+
+        private Expression _trueValue;
+        private Expression _falseValue;
+        private Expression _condition;
+
+        public ConditionalExpression(Expression condition, Expression trueValue, Expression falseValue)
+            : base(ExpressionType.Conditional, trueValue.EvaluatedType, trueValue.MemberMask) {
+            _condition = condition;
+            _trueValue = trueValue;
+            _falseValue = falseValue;
+        }
+
+        protected override bool IsParenthesisRedundant {
+            get {
+                return false;
+            }
+        }
+
+        public Expression Condition {
+            get {
+                return _condition;
+            }
+        }
+
+        public Expression FalseValue {
+            get {
+                return _falseValue;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                return _trueValue.RequiresThisContext || _falseValue.RequiresThisContext ||
+                       _condition.RequiresThisContext;
+            }
+        }
+
+        public Expression TrueValue {
+            get {
+                return _trueValue;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/DelegateExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/DelegateExpression.cs
new file mode 100644
index 000000000..d65d3b1b8
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/DelegateExpression.cs
@@ -0,0 +1,40 @@
+// DelegateExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class DelegateExpression : Expression {
+
+        private MethodSymbol _method;
+        private Expression _objectReference;
+
+        public DelegateExpression(Expression objectReference, MethodSymbol method)
+            : base(ExpressionType.Delegate, method.AssociatedType, SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _method = method;
+            _objectReference = objectReference;
+        }
+
+        public MethodSymbol Method {
+            get {
+                return _method;
+            }
+        }
+
+        public Expression ObjectReference {
+            get {
+                return _objectReference;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                return _objectReference.RequiresThisContext;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/DelegateInvokeExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/DelegateInvokeExpression.cs
new file mode 100644
index 000000000..3cb8ba6aa
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/DelegateInvokeExpression.cs
@@ -0,0 +1,17 @@
+// DelegateInvokeExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class DelegateInvokeExpression : MethodExpression {
+
+        public DelegateInvokeExpression(MethodExpression methodExpression)
+            : base(ExpressionType.DelegateInvoke, methodExpression.ObjectReference, methodExpression.Method, methodExpression.GetParameters()) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/EnumerationFieldExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/EnumerationFieldExpression.cs
new file mode 100644
index 000000000..bdae25630
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/EnumerationFieldExpression.cs
@@ -0,0 +1,17 @@
+// FieldExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class EnumerationFieldExpression : FieldExpression {
+
+        public EnumerationFieldExpression(Expression objectReference, EnumerationFieldSymbol field)
+            : base(ExpressionType.EnumerationField, objectReference, field) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/EventExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/EventExpression.cs
new file mode 100644
index 000000000..b7c7f3d54
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/EventExpression.cs
@@ -0,0 +1,54 @@
+// EventExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class EventExpression : Expression {
+
+        private EventSymbol _event;
+        private Expression _objectReference;
+        private Expression _handler;
+
+        public EventExpression(Expression objectReference, EventSymbol eventSymbol, bool add)
+            : base((add ? ExpressionType.EventAdd : ExpressionType.EventRemove), eventSymbol.AssociatedType, SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _event = eventSymbol;
+            _objectReference = objectReference;
+        }
+
+        public EventSymbol Event {
+            get {
+                return _event;
+            }
+        }
+
+        public Expression Handler {
+            get {
+                return _handler;
+            }
+        }
+
+        public Expression ObjectReference {
+            get {
+                return _objectReference;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                return _objectReference.RequiresThisContext || _handler.RequiresThisContext;
+            }
+        }
+
+        public void SetHandler(Expression handler) {
+            Debug.Assert(handler != null);
+            Debug.Assert(_handler == null);
+
+            _handler = handler;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/Expression.cs b/src/Core/Compiler/ScriptModel/Expressions/Expression.cs
new file mode 100644
index 000000000..7acb58c59
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/Expression.cs
@@ -0,0 +1,71 @@
+// Expression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal abstract class Expression {
+
+        private ExpressionType _type;
+        private TypeSymbol _evaluatedType;
+        private SymbolFilter _memberMask;
+
+        private bool _parenthesized;
+
+        protected Expression(ExpressionType type, TypeSymbol evaluatedType, SymbolFilter memberMask) {
+            _type = type;
+            _evaluatedType = evaluatedType;
+            _memberMask = memberMask | SymbolFilter.Members;
+        }
+
+        public TypeSymbol EvaluatedType {
+            get {
+                return _evaluatedType;
+            }
+        }
+
+        protected virtual bool IsParenthesisRedundant {
+            get {
+                return true;
+            }
+        }
+
+        public SymbolFilter MemberMask {
+            get {
+                return _memberMask;
+            }
+        }
+
+        public bool Parenthesized {
+            get {
+                return _parenthesized;
+            }
+        }
+
+        public virtual bool RequiresThisContext {
+            get {
+                return false;
+            }
+        }
+
+        public ExpressionType Type {
+            get {
+                return _type;
+            }
+        }
+
+        public void AddParenthesisHint() {
+            if (IsParenthesisRedundant == false) {
+                _parenthesized = true;
+            }
+        }
+
+        public void Reevaluate(TypeSymbol evaluatedType) {
+            _evaluatedType = evaluatedType;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/ExpressionType.cs b/src/Core/Compiler/ScriptModel/Expressions/ExpressionType.cs
new file mode 100644
index 000000000..34b8b799c
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/ExpressionType.cs
@@ -0,0 +1,58 @@
+// ExpressionType.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal enum ExpressionType {
+
+        Literal = 0,
+
+        Local = 1,
+
+        Member = 2,
+
+        Field = 3,
+
+        EnumerationField = 4,
+
+        PropertyGet = 5,
+
+        PropertySet = 6,
+
+        MethodInvoke = 7,
+
+        DelegateInvoke = 8,
+
+        BaseInitializer = 9,
+
+        EventAdd = 10,
+
+        EventRemove = 11,
+
+        Indexer = 12,
+
+        This = 13,
+
+        Base = 14,
+
+        New = 15,
+
+        Unary = 16,
+
+        Binary = 17,
+
+        Conditional = 18,
+
+        Type = 19,
+
+        Delegate = 20,
+
+        LateBound = 21,
+
+        InlineScript = 22
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/FieldExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/FieldExpression.cs
new file mode 100644
index 000000000..8bc23577b
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/FieldExpression.cs
@@ -0,0 +1,44 @@
+// FieldExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal class FieldExpression : Expression {
+
+        private FieldSymbol _field;
+        private Expression _objectReference;
+
+        public FieldExpression(Expression objectReference, FieldSymbol field)
+            : this(ExpressionType.Field, objectReference, field) {
+        }
+
+        protected FieldExpression(ExpressionType type, Expression objectReference, FieldSymbol field)
+            : base(type, field.AssociatedType, SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _field = field;
+            _objectReference = objectReference;
+        }
+
+        public FieldSymbol Field {
+            get {
+                return _field;
+            }
+        }
+
+        public Expression ObjectReference {
+            get {
+                return _objectReference;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                return _objectReference.RequiresThisContext;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/IndexerExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/IndexerExpression.cs
new file mode 100644
index 000000000..ad7948d1a
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/IndexerExpression.cs
@@ -0,0 +1,66 @@
+// IndexerExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class IndexerExpression : Expression {
+
+        private IndexerSymbol _indexer;
+        private Expression _objectReference;
+        private Collection<Expression> _indices;
+
+        public IndexerExpression(Expression objectReference, IndexerSymbol indexer)
+            : base(ExpressionType.Indexer, indexer.AssociatedType, SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _indexer = indexer;
+            _objectReference = objectReference;
+
+            _indices = new Collection<Expression>();
+        }
+
+        public IndexerSymbol Indexer {
+            get {
+                return _indexer;
+            }
+        }
+
+        public ICollection<Expression> Indices {
+            get {
+                return _indices;
+            }
+        }
+
+        public Expression ObjectReference {
+            get {
+                return _objectReference;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                if (_objectReference.RequiresThisContext) {
+                    return true;
+                }
+
+                foreach (Expression expression in _indices) {
+                    if (expression.RequiresThisContext) {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        public void AddIndexParameterValue(Expression expression) {
+            _indices.Add(expression);
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/InlineScriptExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/InlineScriptExpression.cs
new file mode 100644
index 000000000..c6a7e7463
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/InlineScriptExpression.cs
@@ -0,0 +1,68 @@
+// InlineScriptExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal class InlineScriptExpression : Expression {
+
+        private string _script;
+        private Collection<Expression> _parameters;
+        private bool _parenthesize;
+
+        public InlineScriptExpression(string script, TypeSymbol evaluatedType)
+            : this(script, evaluatedType, /* parenthesize */ true) {
+        }
+
+        public InlineScriptExpression(string script, TypeSymbol evaluatedType, bool parenthesize)
+            : base(ExpressionType.InlineScript, evaluatedType, SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _script = script;
+            _parenthesize = parenthesize;
+        }
+
+        protected override bool IsParenthesisRedundant {
+            get {
+                return !_parenthesize;
+            }
+        }
+
+        public ICollection<Expression> Parameters {
+            get {
+                return _parameters;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                if (_parameters != null) {
+                    foreach (Expression expression in _parameters) {
+                        if (expression.RequiresThisContext) {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        public string Script {
+            get {
+                return _script;
+            }
+        }
+
+        public void AddParameterValue(Expression expression) {
+            if (_parameters == null) {
+                _parameters = new Collection<Expression>();
+            }
+            _parameters.Add(expression);
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/LateBoundExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/LateBoundExpression.cs
new file mode 100644
index 000000000..dd0c1b63a
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/LateBoundExpression.cs
@@ -0,0 +1,77 @@
+// LateBoundExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class LateBoundExpression : Expression {
+
+        private LateBoundOperation _operation;
+        private Expression _objectReference;
+        private Expression _nameExpression;
+        private Collection<Expression> _parameters;
+
+        public LateBoundExpression(Expression objectReference, Expression nameExpression, LateBoundOperation operation, TypeSymbol evaluatedType)
+            : base(ExpressionType.LateBound, evaluatedType, SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _objectReference = objectReference;
+            _nameExpression = nameExpression;
+            _operation = operation;
+
+            _parameters = new Collection<Expression>();
+        }
+
+        public Expression NameExpression {
+            get {
+                return _nameExpression;
+            }
+        }
+
+        public LateBoundOperation Operation {
+            get {
+                return _operation;
+            }
+        }
+
+        public Expression ObjectReference {
+            get {
+                return _objectReference;
+            }
+        }
+
+        public ICollection<Expression> Parameters {
+            get {
+                return _parameters;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                if ((_objectReference != null) && _objectReference.RequiresThisContext) {
+                    return true;
+                }
+                if (_nameExpression.RequiresThisContext) {
+                    return true;
+                }
+
+                foreach (Expression expression in _parameters) {
+                    if (expression.RequiresThisContext) {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        public void AddParameterValue(Expression expression) {
+            _parameters.Add(expression);
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/LateBoundOperation.cs b/src/Core/Compiler/ScriptModel/Expressions/LateBoundOperation.cs
new file mode 100644
index 000000000..3085f9df7
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/LateBoundOperation.cs
@@ -0,0 +1,26 @@
+// LateBoundOperation.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal enum LateBoundOperation {
+
+        InvokeMethod = 0,
+
+        GetField = 1,
+
+        SetField = 2,
+
+        DeleteField = 3,
+
+        HasField = 4,
+
+        HasMethod = 5,
+
+        GetScriptType = 6,
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/LiteralExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/LiteralExpression.cs
new file mode 100644
index 000000000..26baf48d7
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/LiteralExpression.cs
@@ -0,0 +1,54 @@
+// LiteralExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    /// <summary>
+    /// Represents constant values, null values, as well as type instances
+    /// (eg. typeof(x))
+    /// </summary>
+    internal sealed class LiteralExpression : Expression {
+
+        private object _value;
+
+        public LiteralExpression(TypeSymbol valueType, object value)
+            : base(ExpressionType.Literal, valueType, SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _value = value;
+        }
+
+        protected override bool IsParenthesisRedundant {
+            get {
+                if ((_value is String) || (_value is Boolean)) {
+                    return true;
+                }
+                return false;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                Expression[] items = _value as Expression[];
+                if (items != null) {
+                    foreach (Expression item in items) {
+                        if (item.RequiresThisContext) {
+                            return true;
+                        }
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        public object Value {
+            get {
+                return _value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/LocalExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/LocalExpression.cs
new file mode 100644
index 000000000..9b1eb133e
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/LocalExpression.cs
@@ -0,0 +1,31 @@
+// SymbolExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class LocalExpression : Expression {
+
+        private LocalSymbol _symbol;
+
+        public LocalExpression(LocalSymbol symbol)
+            : this(symbol, SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _symbol = symbol;
+        }
+
+        public LocalExpression(LocalSymbol symbol, SymbolFilter memberMask)
+            : base(ExpressionType.Local, symbol.ValueType, memberMask) {
+            _symbol = symbol;
+        }
+
+        public LocalSymbol Symbol {
+            get {
+                return _symbol;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/MemberExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/MemberExpression.cs
new file mode 100644
index 000000000..0e341ea03
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/MemberExpression.cs
@@ -0,0 +1,41 @@
+// MemberExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class MemberExpression : Expression {
+
+        private MemberSymbol _member;
+        private Expression _objectReference;
+
+        public MemberExpression(Expression objectReference, MemberSymbol member)
+            : base(ExpressionType.Member, (member.AssociatedType.Type == SymbolType.GenericParameter ? objectReference.EvaluatedType : member.AssociatedType),
+                   SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _member = member;
+            _objectReference = objectReference;
+        }
+
+        public MemberSymbol Member {
+            get {
+                return _member;
+            }
+        }
+
+        public Expression ObjectReference {
+            get {
+                return _objectReference;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                return _objectReference.RequiresThisContext;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/MethodExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/MethodExpression.cs
new file mode 100644
index 000000000..98603259f
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/MethodExpression.cs
@@ -0,0 +1,74 @@
+// MethodExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal class MethodExpression : Expression {
+
+        private MethodSymbol _method;
+        private Expression _objectReference;
+        private Collection<Expression> _parameters;
+
+        public MethodExpression(Expression objectReference, MethodSymbol method)
+            : this(ExpressionType.MethodInvoke, objectReference, method, null) {
+        }
+
+        protected MethodExpression(ExpressionType type, Expression objectReference, MethodSymbol method, Collection<Expression> parameters) :
+            base(type, (method.AssociatedType.Type == SymbolType.GenericParameter ? objectReference.EvaluatedType : method.AssociatedType),
+                 SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _method = method;
+            _objectReference = objectReference;
+            _parameters = (parameters == null) ? new Collection<Expression>() : parameters;
+        }
+
+        public MethodSymbol Method {
+            get {
+                return _method;
+            }
+        }
+
+        public IList<Expression> Parameters {
+            get {
+                return _parameters;
+            }
+        }
+
+        public Expression ObjectReference {
+            get {
+                return _objectReference;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                if (_objectReference.RequiresThisContext) {
+                    return true;
+                }
+
+                foreach (Expression expression in _parameters) {
+                    if (expression.RequiresThisContext) {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        public void AddParameterValue(Expression expression) {
+            _parameters.Add(expression);
+        }
+
+        public Collection<Expression> GetParameters() {
+            return _parameters;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/NewExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/NewExpression.cs
new file mode 100644
index 000000000..cfced9444
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/NewExpression.cs
@@ -0,0 +1,80 @@
+// NewExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class NewExpression : Expression {
+
+        private TypeSymbol _associatedType;
+        private Expression _typeExpression;
+        private Collection<Expression> _parameters;
+
+        public NewExpression(TypeSymbol associatedType)
+            : base(ExpressionType.New, associatedType, SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _associatedType = associatedType;
+        }
+
+        public NewExpression(Expression typeExpression, TypeSymbol associatedType)
+            : base(ExpressionType.New, associatedType, SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _typeExpression = typeExpression;
+            _associatedType = associatedType;
+        }
+
+        public TypeSymbol AssociatedType {
+            get {
+                return _associatedType;
+            }
+        }
+
+        public bool IsSpecificType {
+            get {
+                return (_typeExpression == null);
+            }
+        }
+
+        public IList<Expression> Parameters {
+            get {
+                return _parameters;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                if ((_typeExpression != null) && _typeExpression.RequiresThisContext) {
+                    return true;
+                }
+
+                if (_parameters != null) {
+                    foreach (Expression expression in _parameters) {
+                        if (expression.RequiresThisContext) {
+                            return true;
+                        }
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        public Expression TypeExpression {
+            get {
+                return _typeExpression;
+            }
+        }
+
+        public void AddParameterValue(Expression expression) {
+            if (_parameters == null) {
+                _parameters = new Collection<Expression>();
+            }
+            _parameters.Add(expression);
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/Operator.cs b/src/Core/Compiler/ScriptModel/Expressions/Operator.cs
new file mode 100644
index 000000000..60298d1cd
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/Operator.cs
@@ -0,0 +1,100 @@
+// Operator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal enum Operator {
+
+        Plus = 0,
+
+        PlusEquals = 1,
+
+        Minus = 2,
+
+        MinusEquals = 3,
+
+        Multiply = 4,
+
+        MultiplyEquals = 5,
+
+        Divide = 6,
+
+        DivideEquals = 7,
+
+        Mod = 8,
+
+        ModEquals = 9,
+
+        EqualEqualEqual = 10,
+
+        NotEqualEqual = 11,
+
+        Less = 12,
+
+        LessEqual = 13,
+
+        Greater = 14,
+
+        GreaterEqual = 15,
+
+        LogicalOr = 16,
+
+        LogicalAnd = 17,
+
+        LogicalNot = 18,
+
+        BitwiseOr = 19,
+
+        BitwiseOrEquals = 20,
+
+        BitwiseAnd = 21,
+
+        BitwiseAndEquals = 22,
+
+        BitwiseXor = 23,
+
+        BitwiseXorEquals = 24,
+
+        BitwiseNot = 25,
+
+        ShiftLeft = 26,
+
+        ShiftLeftEquals = 27,
+
+        ShiftRight = 28,
+
+        ShiftRightEquals = 29,
+
+        UnsignedShiftRight = 30,
+
+        UnsignedShiftRightEquals = 31,
+
+        PreIncrement = 32,
+
+        PreDecrement = 33,
+
+        PostIncrement = 34,
+
+        PostDecrement = 35,
+
+        Equals = 36,
+
+        Is = 37,
+
+        As = 38,
+
+        Negative = 39,
+
+        Cast = 40,
+
+        EqualEqual = 41,
+
+        NotEqual = 42,
+
+        Invalid = 43
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/OperatorConverter.cs b/src/Core/Compiler/ScriptModel/Expressions/OperatorConverter.cs
new file mode 100644
index 000000000..d6620bab4
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/OperatorConverter.cs
@@ -0,0 +1,177 @@
+// OperatorConverter.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal static class OperatorConverter {
+
+        public static Operator OperatorFromToken(TokenType token) {
+            switch (token) {
+                case TokenType.Tilde:
+                    return Operator.BitwiseNot;
+                case TokenType.Bang:
+                    return Operator.LogicalNot;
+                case TokenType.Equal:
+                    return Operator.Equals;
+                case TokenType.PlusEqual:
+                    return Operator.PlusEquals;
+                case TokenType.MinusEqual:
+                    return Operator.MinusEquals;
+                case TokenType.StarEqual:
+                    return Operator.MultiplyEquals;
+                case TokenType.SlashEqual:
+                    return Operator.DivideEquals;
+                case TokenType.PercentEqual:
+                    return Operator.ModEquals;
+                case TokenType.AndEqual:
+                    return Operator.BitwiseAndEquals;
+                case TokenType.HatEqual:
+                    return Operator.BitwiseXorEquals;
+                case TokenType.BarEqual:
+                    return Operator.BitwiseOrEquals;
+                case TokenType.ShiftLeftEqual:
+                    return Operator.ShiftLeftEquals;
+                case TokenType.ShiftRightEqual:
+                    return Operator.ShiftRightEquals;
+                case TokenType.Bar:
+                    return Operator.BitwiseOr;
+                case TokenType.Hat:
+                    return Operator.BitwiseXor;
+                case TokenType.Ampersand:
+                    return Operator.BitwiseAnd;
+                case TokenType.LogAnd:
+                    return Operator.LogicalAnd;
+                case TokenType.LogOr:
+                case TokenType.Coalesce:
+                    return Operator.LogicalOr;
+                case TokenType.EqualEqual:
+                    return Operator.EqualEqualEqual;
+                case TokenType.NotEqual:
+                    return Operator.NotEqualEqual;
+                case TokenType.Less:
+                    return Operator.Less;
+                case TokenType.LessEqual:
+                    return Operator.LessEqual;
+                case TokenType.Greater:
+                    return Operator.Greater;
+                case TokenType.GreaterEqual:
+                    return Operator.GreaterEqual;
+                case TokenType.ShiftLeft:
+                    return Operator.ShiftLeft;
+                case TokenType.ShiftRight:
+                    return Operator.ShiftRight;
+                case TokenType.Plus:
+                    return Operator.Plus;
+                case TokenType.Minus:
+                    return Operator.Minus;
+                case TokenType.Star:
+                    return Operator.Multiply;
+                case TokenType.Slash:
+                    return Operator.Divide;
+                case TokenType.Percent:
+                    return Operator.Mod;
+                case TokenType.Is:
+                    return Operator.Is;
+                case TokenType.As:
+                    return Operator.As;
+                default:
+                    Debug.Fail("Unhandled operator token " + token);
+                    return Operator.Invalid;
+            }
+        }
+
+        public static string OperatorToString(Operator operatorType) {
+            switch (operatorType) {
+                case Operator.Plus:
+                    return " + ";
+                case Operator.Minus:
+                    return " - ";
+                case Operator.Multiply:
+                    return " * ";
+                case Operator.Divide:
+                    return " / ";
+                case Operator.Mod:
+                    return " % ";
+                case Operator.EqualEqualEqual:
+                    return " === ";
+                case Operator.NotEqualEqual:
+                    return " !== ";
+                case Operator.Less:
+                    return " < ";
+                case Operator.LessEqual:
+                    return " <= ";
+                case Operator.Greater:
+                    return " > ";
+                case Operator.GreaterEqual:
+                    return " >= ";
+                case Operator.LogicalOr:
+                    return " || ";
+                case Operator.LogicalAnd:
+                    return " && ";
+                case Operator.LogicalNot:
+                    return "!";
+                case Operator.BitwiseOr:
+                    return " | ";
+                case Operator.BitwiseAnd:
+                    return " & ";
+                case Operator.BitwiseXor:
+                    return " ^ ";
+                case Operator.BitwiseNot:
+                    return "~";
+                case Operator.ShiftLeft:
+                    return " << ";
+                case Operator.ShiftRight:
+                    return " >> ";
+                case Operator.UnsignedShiftRight:
+                    return " >>> ";
+                case Operator.PreIncrement:
+                case Operator.PostIncrement:
+                    return "++";
+                case Operator.PreDecrement:
+                case Operator.PostDecrement:
+                    return "--";
+                case Operator.Equals:
+                    return " = ";
+                case Operator.PlusEquals:
+                    return " += ";
+                case Operator.MinusEquals:
+                    return " -= ";
+                case Operator.MultiplyEquals:
+                    return " *= ";
+                case Operator.DivideEquals:
+                    return " /= ";
+                case Operator.ModEquals:
+                    return " %= ";
+                case Operator.BitwiseOrEquals:
+                    return " |= ";
+                case Operator.BitwiseAndEquals:
+                    return " &= ";
+                case Operator.BitwiseXorEquals:
+                    return " ^= ";
+                case Operator.ShiftLeftEquals:
+                    return " <<= ";
+                case Operator.ShiftRightEquals:
+                    return " >>= ";
+                case Operator.UnsignedShiftRightEquals:
+                    return " >>>= ";
+                case Operator.Negative:
+                    return "-";
+                case Operator.Cast:
+                    return String.Empty;
+                case Operator.EqualEqual:
+                    return " == ";
+                case Operator.NotEqual:
+                    return " != ";
+                default:
+                    Debug.Fail("Unexpected operator type: " + operatorType);
+                    return String.Empty;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/PropertyExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/PropertyExpression.cs
new file mode 100644
index 000000000..314c19232
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/PropertyExpression.cs
@@ -0,0 +1,40 @@
+// PropertyExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class PropertyExpression : Expression {
+
+        private PropertySymbol _property;
+        private Expression _objectReference;
+
+        public PropertyExpression(Expression objectReference, PropertySymbol property, bool getter)
+            : base((getter ? ExpressionType.PropertyGet : ExpressionType.PropertySet), property.AssociatedType, SymbolFilter.Public | SymbolFilter.InstanceMembers) {
+            _property = property;
+            _objectReference = objectReference;
+        }
+
+        public Expression ObjectReference {
+            get {
+                return _objectReference;
+            }
+        }
+
+        public PropertySymbol Property {
+            get {
+                return _property;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                return _objectReference.RequiresThisContext;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/ThisExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/ThisExpression.cs
new file mode 100644
index 000000000..cf1f7b9d2
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/ThisExpression.cs
@@ -0,0 +1,35 @@
+// ThisExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    /// <summary>
+    /// Represents the class of the current type context.
+    /// </summary>
+    internal sealed class ThisExpression : Expression {
+
+        private bool _explicitReference;
+
+        public ThisExpression(ClassSymbol classSymbol, bool explicitReference)
+            : base(ExpressionType.This, classSymbol, SymbolFilter.Public | SymbolFilter.Protected | SymbolFilter.Private | SymbolFilter.InstanceMembers) {
+            _explicitReference = explicitReference;
+        }
+
+        public bool ExplicitReference {
+            get {
+                return _explicitReference;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                return true;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/TypeExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/TypeExpression.cs
new file mode 100644
index 000000000..9a9add85a
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/TypeExpression.cs
@@ -0,0 +1,31 @@
+// TypeExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    /// <summary>
+    /// Represents a type which allows access to static members on the type
+    /// Note that this does not represent a Type object itself (eg. typeof(x));
+    /// Instead that is represented by a LiteralExpression.
+    /// </summary>
+    internal sealed class TypeExpression : Expression {
+
+        private TypeSymbol _associatedType;
+
+        public TypeExpression(TypeSymbol associatedType, SymbolFilter memberMask)
+            : base(ExpressionType.Type, associatedType, memberMask) {
+            _associatedType = associatedType;
+        }
+
+        public TypeSymbol AssociatedType {
+            get {
+                return _associatedType;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Expressions/UnaryExpression.cs b/src/Core/Compiler/ScriptModel/Expressions/UnaryExpression.cs
new file mode 100644
index 000000000..03246ac41
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Expressions/UnaryExpression.cs
@@ -0,0 +1,50 @@
+// UnaryExpression.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class UnaryExpression : Expression {
+
+        private Expression _operand;
+        private Operator _operator;
+
+        public UnaryExpression(Operator operatorType, Expression operand)
+            : this(operatorType, operand, operand.EvaluatedType, operand.MemberMask) {
+        }
+
+        public UnaryExpression(Operator operatorType, Expression operand, TypeSymbol evaluatedType, SymbolFilter memberMask)
+            : base(ExpressionType.Unary, evaluatedType, memberMask) {
+            _operator = operatorType;
+            _operand = operand;
+        }
+
+        protected override bool IsParenthesisRedundant {
+            get {
+                return false;
+            }
+        }
+
+        public Expression Operand {
+            get {
+                return _operand;
+            }
+        }
+
+        public Operator Operator {
+            get {
+                return _operator;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                return _operand.RequiresThisContext;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/BlockStatement.cs b/src/Core/Compiler/ScriptModel/Statements/BlockStatement.cs
new file mode 100644
index 000000000..5f4ac790c
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/BlockStatement.cs
@@ -0,0 +1,45 @@
+// BlockStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class BlockStatement : Statement {
+
+        private List<Statement> _statements;
+
+        public BlockStatement()
+            : base(StatementType.Block) {
+            _statements = new List<Statement>();
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                foreach (Statement statement in _statements) {
+                    if (statement.RequiresThisContext) {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        public ICollection<Statement> Statements {
+            get {
+                return _statements;
+            }
+        }
+
+        public void AddStatement(Statement statement) {
+            _statements.Add(statement);
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/BreakStatement.cs b/src/Core/Compiler/ScriptModel/Statements/BreakStatement.cs
new file mode 100644
index 000000000..a2341cf5d
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/BreakStatement.cs
@@ -0,0 +1,17 @@
+// BreakStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class BreakStatement : Statement {
+
+        public BreakStatement()
+            : base(StatementType.Break) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/ContinueStatement.cs b/src/Core/Compiler/ScriptModel/Statements/ContinueStatement.cs
new file mode 100644
index 000000000..b263f2b63
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/ContinueStatement.cs
@@ -0,0 +1,17 @@
+// ContinueStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class ContinueStatement : Statement {
+
+        public ContinueStatement()
+            : base(StatementType.Continue) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/EmptyStatement.cs b/src/Core/Compiler/ScriptModel/Statements/EmptyStatement.cs
new file mode 100644
index 000000000..4395ba431
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/EmptyStatement.cs
@@ -0,0 +1,17 @@
+// EmptyStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class EmptyStatement : Statement {
+
+        public EmptyStatement()
+            : base(StatementType.Empty) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/ErrorStatement.cs b/src/Core/Compiler/ScriptModel/Statements/ErrorStatement.cs
new file mode 100644
index 000000000..0623ac149
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/ErrorStatement.cs
@@ -0,0 +1,34 @@
+// ErrorStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class ErrorStatement : Statement {
+
+        private string _message;
+        private string _location;
+
+        public ErrorStatement(string message, string location)
+            : base(StatementType.Error) {
+            _message = message;
+            _location = location;
+        }
+
+        public string Location {
+            get {
+                return _location;
+            }
+        }
+
+        public string Message {
+            get {
+                return _message;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/ExpressionStatement.cs b/src/Core/Compiler/ScriptModel/Statements/ExpressionStatement.cs
new file mode 100644
index 000000000..83b1f0fab
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/ExpressionStatement.cs
@@ -0,0 +1,44 @@
+// ExpressionStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class ExpressionStatement : Statement {
+
+        private Expression _expression;
+        private bool _fragment;
+
+        public ExpressionStatement(Expression expression)
+            : this(expression, false) {
+        }
+
+        public ExpressionStatement(Expression expression, bool isFragment)
+            : base(StatementType.Expression) {
+            _expression = expression;
+            _fragment = isFragment;
+        }
+
+        public Expression Expression {
+            get {
+                return _expression;
+            }
+        }
+
+        public bool IsFragment {
+            get {
+                return _fragment;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                return _expression.RequiresThisContext;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/ForInStatement.cs b/src/Core/Compiler/ScriptModel/Statements/ForInStatement.cs
new file mode 100644
index 000000000..6bd7006cc
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/ForInStatement.cs
@@ -0,0 +1,86 @@
+// ForInStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class ForInStatement : Statement {
+
+        private VariableSymbol _dictionaryVariable;
+        private VariableSymbol _loopVariable;
+        private VariableSymbol _itemVariable;
+        private Expression _collectionExpression;
+        private Statement _body;
+
+        public ForInStatement(Expression collectionExpression)
+            : this(collectionExpression, null) {
+        }
+
+        public ForInStatement(Expression collectionExpression, VariableSymbol dictionaryVariable)
+            : base(StatementType.ForIn) {
+            _collectionExpression = collectionExpression;
+            _dictionaryVariable = dictionaryVariable;
+        }
+
+        public Statement Body {
+            get {
+                return _body;
+            }
+        }
+
+        public Expression CollectionExpression {
+            get {
+                return _collectionExpression;
+            }
+        }
+
+        public VariableSymbol DictionaryVariable {
+            get {
+                return _dictionaryVariable;
+            }
+        }
+
+        public bool IsDictionaryEnumeration {
+            get {
+                return (_dictionaryVariable != null);
+            }
+        }
+
+        public VariableSymbol ItemVariable {
+            get {
+                return _itemVariable;
+            }
+        }
+
+        public VariableSymbol LoopVariable {
+            get {
+                return _loopVariable;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                return _collectionExpression.RequiresThisContext || _body.RequiresThisContext;
+            }
+        }
+
+        public void AddBody(Statement statement) {
+            Debug.Assert(_body == null);
+            _body = statement;
+        }
+
+        public void SetItemVariable(VariableSymbol variable) {
+            Debug.Assert(_itemVariable == null);
+            _itemVariable = variable;
+        }
+
+        public void SetLoopVariable(VariableSymbol variable) {
+            Debug.Assert(_loopVariable == null);
+            _loopVariable = variable;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/ForStatement.cs b/src/Core/Compiler/ScriptModel/Statements/ForStatement.cs
new file mode 100644
index 000000000..aa40e0e48
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/ForStatement.cs
@@ -0,0 +1,119 @@
+// ForStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class ForStatement : Statement {
+
+        private Expression _condition;
+        private List<Expression> _initializers;
+        private List<Expression> _increments;
+        private VariableDeclarationStatement _variables;
+        private Statement _body;
+
+        public ForStatement()
+            : base(StatementType.For) {
+        }
+
+        public Statement Body {
+            get {
+                return _body;
+            }
+        }
+
+        public Expression Condition {
+            get {
+                return _condition;
+            }
+        }
+
+        public bool HasScopeVariables {
+            get {
+                return (_variables != null);
+            }
+        }
+
+        public ICollection<Expression> Increments {
+            get {
+                return _increments;
+            }
+        }
+
+        public ICollection<Expression> Initializers {
+            get {
+                return _initializers;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                if ((_body != null) && _body.RequiresThisContext) {
+                    return true;
+                }
+                if ((_condition != null) && _condition.RequiresThisContext) {
+                    return true;
+                }
+                if (_increments != null) {
+                    foreach (Expression expression in _increments) {
+                        if (expression.RequiresThisContext) {
+                            return true;
+                        }
+                    }
+                }
+                if (_initializers != null) {
+                    foreach (Expression expression in _initializers) {
+                        if (expression.RequiresThisContext) {
+                            return true;
+                        }
+                    }
+                }
+                return false;
+            }
+        }
+
+        public VariableDeclarationStatement Variables {
+            get {
+                return _variables;
+            }
+        }
+
+        public void AddBody(Statement statement) {
+            Debug.Assert(_body == null);
+            _body = statement;
+        }
+
+        public void AddCondition(Expression expression) {
+            Debug.Assert(_condition == null);
+            _condition = expression;
+        }
+
+        public void AddIncrement(Expression expression) {
+            if (_increments == null) {
+                _increments = new List<Expression>();
+            }
+            _increments.Add(expression);
+        }
+
+        public void AddInitializer(Expression expression) {
+            Debug.Assert(_variables == null);
+            if (_initializers == null) {
+                _initializers = new List<Expression>();
+            }
+            _initializers.Add(expression);
+        }
+
+        public void AddInitializer(VariableDeclarationStatement variables) {
+            Debug.Assert(_initializers == null);
+            Debug.Assert(_variables == null);
+            _variables = variables;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/IfElseStatement.cs b/src/Core/Compiler/ScriptModel/Statements/IfElseStatement.cs
new file mode 100644
index 000000000..f141dbf2b
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/IfElseStatement.cs
@@ -0,0 +1,57 @@
+// IfElseStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class IfElseStatement : Statement {
+
+        private Expression _condition;
+        private Statement _ifStatement;
+        private Statement _elseStatement;
+
+        public IfElseStatement(Expression condition, Statement ifStatement, Statement elseStatement)
+            : base(StatementType.IfElse) {
+            _condition = condition;
+            _ifStatement = ifStatement;
+            _elseStatement = elseStatement;
+        }
+
+        public Expression Condition {
+            get {
+                return _condition;
+            }
+        }
+
+        public Statement ElseStatement {
+            get {
+                return _elseStatement;
+            }
+        }
+
+        public Statement IfStatement {
+            get {
+                return _ifStatement;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                if (_condition.RequiresThisContext) {
+                    return true;
+                }
+                if ((_ifStatement != null) && _ifStatement.RequiresThisContext) {
+                    return true;
+                }
+                if ((_elseStatement != null) && _elseStatement.RequiresThisContext) {
+                    return true;
+                }
+                return false;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/ReturnStatement.cs b/src/Core/Compiler/ScriptModel/Statements/ReturnStatement.cs
new file mode 100644
index 000000000..d543e0230
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/ReturnStatement.cs
@@ -0,0 +1,35 @@
+// ReturnStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class ReturnStatement : Statement {
+
+        private Expression _value;
+
+        public ReturnStatement(Expression value)
+            : base(StatementType.Return) {
+            _value = value;
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                if (_value != null) {
+                    return _value.RequiresThisContext;
+                }
+                return false;
+            }
+        }
+
+        public Expression Value {
+            get {
+                return _value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/Statement.cs b/src/Core/Compiler/ScriptModel/Statements/Statement.cs
new file mode 100644
index 000000000..9ccbe9115
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/Statement.cs
@@ -0,0 +1,31 @@
+// Statement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal abstract class Statement {
+
+        private StatementType _type;
+
+        protected Statement(StatementType type) {
+            _type = type;
+        }
+
+        public virtual bool RequiresThisContext {
+            get {
+                return false;
+            }
+        }
+
+        public StatementType Type {
+            get {
+                return _type;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/StatementType.cs b/src/Core/Compiler/ScriptModel/Statements/StatementType.cs
new file mode 100644
index 000000000..829da5532
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/StatementType.cs
@@ -0,0 +1,42 @@
+// StatementType.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal enum StatementType {
+
+        Block = 0,
+
+        Empty = 1,
+
+        VariableDeclaration = 2,
+
+        Return = 3,
+
+        Expression = 4,
+
+        IfElse = 5,
+
+        While = 6,
+
+        For = 7,
+
+        ForIn = 8,
+
+        Switch = 9,
+
+        Break = 10,
+
+        Continue = 11,
+
+        Throw = 12,
+
+        TryCatchFinally = 13,
+
+        Error = 14
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/SwitchGroup.cs b/src/Core/Compiler/ScriptModel/Statements/SwitchGroup.cs
new file mode 100644
index 000000000..1a5ca1ed2
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/SwitchGroup.cs
@@ -0,0 +1,68 @@
+// SwitchGroup.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class SwitchGroup {
+
+        private List<Expression> _cases;
+        private bool _includeDefault;
+        private List<Statement> _statements;
+
+        public SwitchGroup() {
+            _statements = new List<Statement>();
+        }
+
+        public ICollection<Expression> Cases {
+            get {
+                return _cases;
+            }
+        }
+
+        public bool IncludeDefault {
+            get {
+                return _includeDefault;
+            }
+        }
+
+        public bool RequiresThisContext {
+            get {
+                foreach (Statement statement in _statements) {
+                    if (statement.RequiresThisContext) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+
+        public ICollection<Statement> Statements {
+            get {
+                return _statements;
+            }
+        }
+
+        public void AddCase(Expression caseValue) {
+            if (_cases == null) {
+                _cases = new List<Expression>();
+            }
+            _cases.Add(caseValue);
+        }
+
+        public void AddDefaultCase() {
+            _includeDefault = true;
+        }
+
+        public void AddStatement(Statement statement) {
+            _statements.Add(statement);
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/SwitchStatement.cs b/src/Core/Compiler/ScriptModel/Statements/SwitchStatement.cs
new file mode 100644
index 000000000..7825f75ed
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/SwitchStatement.cs
@@ -0,0 +1,57 @@
+// SwitchStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class SwitchStatement : Statement {
+
+        private Expression _condition;
+        private List<SwitchGroup> _groups;
+
+        public SwitchStatement(Expression condition)
+            : base(StatementType.Switch) {
+            _condition = condition;
+            _groups = new List<SwitchGroup>();
+        }
+
+        public Expression Condition {
+            get {
+                return _condition;
+            }
+        }
+
+        public ICollection<SwitchGroup> Groups {
+            get {
+                return _groups;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                if (_condition.RequiresThisContext) {
+                    return true;
+                }
+
+                foreach (SwitchGroup group in _groups) {
+                    if (group.RequiresThisContext) {
+                        return true;
+                    }
+                }
+
+                return false;
+            }
+        }
+
+        public void AddSwitchGroup(SwitchGroup group) {
+            _groups.Add(group);
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/ThrowStatement.cs b/src/Core/Compiler/ScriptModel/Statements/ThrowStatement.cs
new file mode 100644
index 000000000..be3846bb7
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/ThrowStatement.cs
@@ -0,0 +1,35 @@
+// ThrowStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class ThrowStatement : Statement {
+
+        private Expression _value;
+
+        public ThrowStatement(Expression value)
+            : base(StatementType.Throw) {
+            _value = value;
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                if (_value != null) {
+                    return _value.RequiresThisContext;
+                }
+                return false;
+            }
+        }
+
+        public Expression Value {
+            get {
+                return _value;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/TryCatchFinallyStatement.cs b/src/Core/Compiler/ScriptModel/Statements/TryCatchFinallyStatement.cs
new file mode 100644
index 000000000..f18212d43
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/TryCatchFinallyStatement.cs
@@ -0,0 +1,76 @@
+// TryCatchFinallyStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class TryCatchFinallyStatement : Statement {
+
+        private Statement _body;
+        private VariableSymbol _exceptionVariable;
+        private Statement _catch;
+        private Statement _finally;
+
+        public TryCatchFinallyStatement()
+            : base(StatementType.TryCatchFinally) {
+        }
+
+        public Statement Body {
+            get {
+                return _body;
+            }
+        }
+
+        public Statement Catch {
+            get {
+                return _catch;
+            }
+        }
+
+        public VariableSymbol ExceptionVariable {
+            get {
+                return _exceptionVariable;
+            }
+        }
+
+        public Statement Finally {
+            get {
+                return _finally;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                if (_body.RequiresThisContext || _catch.RequiresThisContext) {
+                    return true;
+                }
+                if (_finally != null) {
+                    return _finally.RequiresThisContext;
+                }
+                return false;
+            }
+        }
+
+        public void AddBody(Statement statement) {
+            Debug.Assert(_body == null);
+            _body = statement;
+        }
+
+        public void AddCatch(VariableSymbol exceptionVariable, Statement catchStatement) {
+            Debug.Assert(_exceptionVariable == null);
+            Debug.Assert(_catch == null);
+
+            _exceptionVariable = exceptionVariable;
+            _catch = catchStatement;
+        }
+
+        public void AddFinally(Statement finallyStatement) {
+            Debug.Assert(_finally == null);
+            _finally = finallyStatement;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/VariableDeclarationStatement.cs b/src/Core/Compiler/ScriptModel/Statements/VariableDeclarationStatement.cs
new file mode 100644
index 000000000..b9e88fc50
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/VariableDeclarationStatement.cs
@@ -0,0 +1,45 @@
+// VariableDeclarationStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class VariableDeclarationStatement : Statement {
+
+        private List<VariableSymbol> _variables;
+
+        public VariableDeclarationStatement()
+            : base(StatementType.VariableDeclaration) {
+            _variables = new List<VariableSymbol>();
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                foreach (VariableSymbol variable in _variables) {
+                    if ((variable.Value != null) &&
+                        variable.Value.RequiresThisContext) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+
+        public ICollection<VariableSymbol> Variables {
+            get {
+                return _variables;
+            }
+        }
+
+        public void AddVariable(VariableSymbol variable) {
+            _variables.Add(variable);
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Statements/WhileStatement.cs b/src/Core/Compiler/ScriptModel/Statements/WhileStatement.cs
new file mode 100644
index 000000000..9621f93c5
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Statements/WhileStatement.cs
@@ -0,0 +1,54 @@
+// WhileStatement.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class WhileStatement : Statement {
+
+        private Expression _condition;
+        private Statement _body;
+        private bool _preCondition;
+
+        public WhileStatement(Expression condition, Statement body, bool preCondition)
+            : base(StatementType.While) {
+            _condition = condition;
+            _body = body;
+            _preCondition = preCondition;
+        }
+
+        public Statement Body {
+            get {
+                return _body;
+            }
+        }
+
+        public Expression Condition {
+            get {
+                return _condition;
+            }
+        }
+
+        public bool PreCondition {
+            get {
+                return _preCondition;
+            }
+        }
+
+        public override bool RequiresThisContext {
+            get {
+                if ((_body != null) && _body.RequiresThisContext) {
+                    return true;
+                }
+                if ((_condition != null) && _condition.RequiresThisContext) {
+                    return true;
+                }
+                return false;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/AnonymousMethodSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/AnonymousMethodSymbol.cs
new file mode 100644
index 000000000..a8bc8e60c
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/AnonymousMethodSymbol.cs
@@ -0,0 +1,54 @@
+// AnonymousMethodSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal sealed class AnonymousMethodSymbol : MethodSymbol {
+
+        private CodeMemberSymbol _containingMember;
+        private ISymbolTable _stackContext;
+
+        public AnonymousMethodSymbol(CodeMemberSymbol containingMember, ISymbolTable stackContext, TypeSymbol returnType, bool isStatic)
+            : base(SymbolType.AnonymousMethod, /* name */ String.Empty, (TypeSymbol)containingMember.Parent, returnType) {
+            SetVisibility(isStatic ? MemberVisibility.Public | MemberVisibility.Static : MemberVisibility.Public);
+            _containingMember = containingMember;
+            _stackContext = stackContext;
+
+            _containingMember.AddAnonymousMethod(this);
+        }
+
+        public CodeMemberSymbol ContainingMember {
+            get {
+                return _containingMember;
+            }
+        }
+
+        public int Depth {
+            get {
+                int depth = 1;
+                if (_containingMember is AnonymousMethodSymbol) {
+                    depth += ((AnonymousMethodSymbol)_containingMember).Depth;
+                }
+                return depth;
+            }
+        }
+
+        public ISymbolTable StackContext {
+            get {
+                return _stackContext;
+            }
+        }
+
+        public override void AddAnonymousMethod(AnonymousMethodSymbol anonymousMethod) {
+            _containingMember.AddAnonymousMethod(anonymousMethod);
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/ClassSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/ClassSymbol.cs
new file mode 100644
index 000000000..1cebbf747
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/ClassSymbol.cs
@@ -0,0 +1,296 @@
+// ClassSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal class ClassSymbol : TypeSymbol {
+
+        private ClassSymbol _baseClass;
+        private ICollection<InterfaceSymbol> _interfaces;
+        private int _inheritanceDepth;
+        private int _minimizationDepth;
+        private int _transformationCookie;
+
+        private ConstructorSymbol _constructor;
+        private ConstructorSymbol _staticConstructor;
+        private IndexerSymbol _indexer;
+
+        private bool _globalMethods;
+        private string _mixinRoot;
+        private bool _testClass;
+
+        private ClassSymbol _primaryPartialClass;
+
+        public ClassSymbol(string name, NamespaceSymbol parent)
+            : this(SymbolType.Class, name, parent) {
+        }
+
+        protected ClassSymbol(SymbolType type, string name, NamespaceSymbol parent)
+            : base(type, name, parent) {
+            _inheritanceDepth = -1;
+            _minimizationDepth = -1;
+            _transformationCookie = -1;
+        }
+
+        public ClassSymbol BaseClass {
+            get {
+                if (_primaryPartialClass != null) {
+                    return _primaryPartialClass.BaseClass;
+                }
+                return _baseClass;
+            }
+        }
+
+        public ConstructorSymbol Constructor {
+            get {
+                if (_primaryPartialClass != null) {
+                    return _primaryPartialClass.Constructor;
+                }
+                return _constructor;
+            }
+        }
+
+        public override string GeneratedName {
+            get {
+                if (_primaryPartialClass != null) {
+                    return _primaryPartialClass.GeneratedName;
+                }
+                return base.GeneratedName;
+            }
+        }
+
+        public bool HasGlobalMethods {
+            get {
+                return _globalMethods;
+            }
+        }
+
+        public IndexerSymbol Indexer {
+            get {
+                if (_primaryPartialClass != null) {
+                    return _primaryPartialClass.Indexer;
+                }
+                return _indexer;
+            }
+        }
+
+        public int InheritanceDepth {
+            get {
+                if (_primaryPartialClass != null) {
+                    return _primaryPartialClass.InheritanceDepth;
+                }
+                if (_inheritanceDepth == -1) {
+                    if (_baseClass != null) {
+                        _inheritanceDepth = _baseClass.InheritanceDepth + 1;
+                    }
+                    else {
+                        _inheritanceDepth = 0;
+                    }
+                }
+                return _inheritanceDepth;
+            }
+        }
+
+        public ICollection<InterfaceSymbol> Interfaces {
+            get {
+                if (_primaryPartialClass != null) {
+                    return _primaryPartialClass.Interfaces;
+                }
+                return _interfaces;
+            }
+        }
+
+        public bool IsTestClass {
+            get {
+                if (_primaryPartialClass != null) {
+                    return _primaryPartialClass.IsTestClass;
+                }
+                return _testClass;
+            }
+        }
+
+        public int MinimizationDepth {
+            get {
+                // This is like InheritanceDepth but not the same. It is specific for
+                // use by the minimization process.
+                //
+                // - For imported types this matches actual inheritance depth.
+                // - When the base class is an imported type, then we also go ahead
+                //   and use matches inheritance depth as well.
+                // - Special case: When this type and the base type are both application
+                //   types, they both have the same minimization depth. (This is done to
+                //   keep inheritance depth to 0 as much as possible, since this
+                //   reduces size of minimized identifiers).
+
+                if (_primaryPartialClass != null) {
+                    return _primaryPartialClass.MinimizationDepth;
+                }
+                if (_minimizationDepth == -1) {
+                    if (_baseClass != null) {
+                        if (IsApplicationType && _baseClass.IsApplicationType) {
+                            _minimizationDepth = _baseClass.MinimizationDepth;
+                        }
+                        else {
+                            _minimizationDepth = _baseClass.MinimizationDepth + 1;
+                        }
+                    }
+                    else {
+                        _minimizationDepth = 0;
+                    }
+                }
+                return _minimizationDepth;
+            }
+        }
+
+        public string MixinRoot {
+            get {
+                return _mixinRoot;
+            }
+        }
+
+        public ClassSymbol PrimaryPartialClass {
+            get {
+                if (_primaryPartialClass != null) {
+                    return _primaryPartialClass;
+                }
+                return this;
+            }
+        }
+
+        public ConstructorSymbol StaticConstructor {
+            get {
+                if (_primaryPartialClass != null) {
+                    return _primaryPartialClass.StaticConstructor;
+                }
+                return _staticConstructor;
+            }
+        }
+
+        public int TransformationCookie {
+            get {
+                if (_primaryPartialClass != null) {
+                    return _primaryPartialClass.TransformationCookie;
+                }
+                if ((_transformationCookie == -1) &&
+                    (_baseClass != null)) {
+                    // If this classes members did not get transformed,
+                    // return the base classes transformation cookie.
+                    //
+                    // The transformation cookie is accessed when transforming
+                    // members of a derived class, so by then this classes
+                    // members would have been transformed if they needed
+                    // to be. The fact that the transformation cookie is unset
+                    // implies no members on this class needed to be transformed.
+
+                    return _baseClass.TransformationCookie;
+                }
+                return _transformationCookie;
+            }
+            set {
+                if (_primaryPartialClass != null) {
+                    _primaryPartialClass.TransformationCookie = value;
+                }
+                _transformationCookie = value;
+            }
+        }
+
+        public override void AddMember(MemberSymbol memberSymbol) {
+            if (_primaryPartialClass != null) {
+                _primaryPartialClass.AddMember(memberSymbol);
+                return;
+            }
+
+            Debug.Assert(memberSymbol != null);
+
+            if (memberSymbol.Type == SymbolType.Constructor) {
+                if ((memberSymbol.Visibility & MemberVisibility.Static) == 0) {
+                    Debug.Assert(_constructor == null);
+                    _constructor = (ConstructorSymbol)memberSymbol;
+                }
+                else {
+                    Debug.Assert(_staticConstructor == null);
+                    _staticConstructor = (ConstructorSymbol)memberSymbol;
+                }
+            }
+            else if (memberSymbol.Type == SymbolType.Indexer) {
+                Debug.Assert((IsApplicationType == false) || (_indexer == null));
+                _indexer = (IndexerSymbol)memberSymbol;
+            }
+            else {
+                base.AddMember(memberSymbol);
+            }
+        }
+
+        public override TypeSymbol GetBaseType() {
+            if (_primaryPartialClass != null) {
+                return _primaryPartialClass.GetBaseType();
+            }
+            return _baseClass;
+        }
+
+        public IndexerSymbol GetIndexer() {
+            if (_primaryPartialClass != null) {
+                return _primaryPartialClass.GetIndexer();
+            }
+
+            ClassSymbol classSymbol = this;
+            IndexerSymbol indexer = classSymbol.Indexer;
+
+            while (indexer == null) {
+                classSymbol = (ClassSymbol)classSymbol.GetBaseType();
+                if (classSymbol == null) {
+                    break;
+                }
+
+                indexer = classSymbol.Indexer;
+            }
+
+            return indexer;
+        }
+
+        public override MemberSymbol GetMember(string name) {
+            if (_primaryPartialClass != null) {
+                return _primaryPartialClass.GetMember(name);
+            }
+            return base.GetMember(name);
+        }
+
+        public void SetGlobalMethods(string mixinRoot) {
+            _globalMethods = true;
+            _mixinRoot = mixinRoot;
+        }
+
+        public void SetInheritance(ClassSymbol baseClass, ICollection<InterfaceSymbol> interfaces) {
+            // Inheritance should only be assigned to a primary partial class.
+            Debug.Assert(_primaryPartialClass == null);
+
+            _baseClass = baseClass;
+            _interfaces = interfaces;
+        }
+
+        public void SetPrimaryPartialClass(ClassSymbol primaryPartialClass) {
+            Debug.Assert(_primaryPartialClass == null);
+            Debug.Assert(primaryPartialClass != null);
+
+            _primaryPartialClass = primaryPartialClass;
+        }
+
+        public void SetTestClass() {
+            if (_primaryPartialClass != null) {
+                _primaryPartialClass.SetTestClass();
+                return;
+            }
+
+            Debug.Assert(_testClass == false);
+            _testClass = true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/CodeMemberSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/CodeMemberSymbol.cs
new file mode 100644
index 000000000..8cdd712a0
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/CodeMemberSymbol.cs
@@ -0,0 +1,79 @@
+// CodeMemberSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal abstract class CodeMemberSymbol : MemberSymbol {
+
+        private List<ParameterSymbol> _parameters;
+        private SymbolImplementationFlags _implementationFlags;
+
+        private List<AnonymousMethodSymbol> _anonymousMethods;
+
+        protected CodeMemberSymbol(SymbolType type, string name, TypeSymbol parent, TypeSymbol associatedType)
+            : base(type, name, parent, associatedType) {
+        }
+
+        public IList<AnonymousMethodSymbol> AnonymousMethods {
+            get {
+                return _anonymousMethods;
+            }
+        }
+
+        protected SymbolImplementationFlags ImplementationFlags {
+            get {
+                return _implementationFlags;
+            }
+        }
+
+        public bool IsAbstract {
+            get {
+                return ((_implementationFlags & SymbolImplementationFlags.Abstract) != 0);
+            }
+        }
+
+        public bool IsOverride {
+            get {
+                return ((_implementationFlags & SymbolImplementationFlags.Override) != 0);
+            }
+        }
+
+        public IList<ParameterSymbol> Parameters {
+            get {
+                return _parameters;
+            }
+        }
+
+        public virtual void AddAnonymousMethod(AnonymousMethodSymbol anonymousMethod) {
+            Debug.Assert(anonymousMethod != null);
+
+            if (_anonymousMethods == null) {
+                _anonymousMethods = new List<AnonymousMethodSymbol>();
+            }
+
+            _anonymousMethods.Add(anonymousMethod);
+        }
+
+        public void AddParameter(ParameterSymbol parameterSymbol) {
+            Debug.Assert(parameterSymbol != null);
+
+            if (_parameters == null) {
+                _parameters = new List<ParameterSymbol>();
+            }
+            _parameters.Add(parameterSymbol);
+        }
+
+        public void SetImplementationState(SymbolImplementationFlags implementationFlags) {
+            Debug.Assert(_implementationFlags == SymbolImplementationFlags.Regular);
+            _implementationFlags = implementationFlags;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/ConstructorSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/ConstructorSymbol.cs
new file mode 100644
index 000000000..b1fa805ce
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/ConstructorSymbol.cs
@@ -0,0 +1,51 @@
+// MethodSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Text;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal sealed class ConstructorSymbol : MethodSymbol {
+
+        public ConstructorSymbol(TypeSymbol parent, bool isStatic)
+            : base(SymbolType.Constructor, /* name */ String.Empty, parent, /* associatedType */ parent) {
+            SetVisibility(isStatic ? MemberVisibility.Public | MemberVisibility.Static : MemberVisibility.Public);
+        }
+
+        public override string DocumentationID {
+            get {
+                TypeSymbol parent = (TypeSymbol)Parent;
+
+                StringBuilder sb = new StringBuilder();
+                sb.Append("M:");
+                sb.Append(parent.Namespace);
+                sb.Append(".");
+                sb.Append(parent.Name);
+                sb.Append(".#ctor");
+
+                if (Parameters != null) {
+                    sb.Append("(");
+
+                    for (int i = 0; i < Parameters.Count; i++) {
+                        if (i > 0) {
+                            sb.Append(",");
+                        }
+
+                        sb.Append(Parameters[i].DocumentationID);
+                    }
+
+                    sb.Append(")");
+                }
+
+                return sb.ToString();
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/DelegateSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/DelegateSymbol.cs
new file mode 100644
index 000000000..14d7895e1
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/DelegateSymbol.cs
@@ -0,0 +1,17 @@
+// DelegateSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal sealed class DelegateSymbol : TypeSymbol {
+
+        public DelegateSymbol(string name, NamespaceSymbol parent)
+            : base(SymbolType.Delegate, name, parent) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/EnumerationFieldSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/EnumerationFieldSymbol.cs
new file mode 100644
index 000000000..72bc89627
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/EnumerationFieldSymbol.cs
@@ -0,0 +1,19 @@
+// EnumerationFieldSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal sealed class EnumerationFieldSymbol : FieldSymbol {
+
+        public EnumerationFieldSymbol(string name, TypeSymbol parent, object value, TypeSymbol valueType)
+            : base(SymbolType.EnumerationField, name, parent, valueType) {
+            SetVisibility(MemberVisibility.Public | MemberVisibility.Static);
+            Value = value;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/EnumerationSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/EnumerationSymbol.cs
new file mode 100644
index 000000000..44c2a6f20
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/EnumerationSymbol.cs
@@ -0,0 +1,80 @@
+// EnumerationSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class EnumerationSymbol : TypeSymbol {
+
+        private bool _flags;
+
+        private bool _numericValues;
+        private bool _namedValues;
+
+        private int _transformationCookie;
+
+        public EnumerationSymbol(string name, NamespaceSymbol parent, bool flags)
+            : base(SymbolType.Enumeration, name, parent) {
+            _flags = flags;
+            _transformationCookie = -1;
+        }
+
+        public bool Flags {
+            get {
+                return _flags;
+            }
+        }
+
+        public int TransformationCookie {
+            get {
+                return _transformationCookie;
+            }
+            set {
+                _transformationCookie = value;
+            }
+        }
+
+        public bool UseNamedValues {
+            get {
+                return _namedValues;
+            }
+        }
+
+        public bool UseNumericValues {
+            get {
+                return _numericValues;
+            }
+        }
+
+        public string CreateNamedValue(EnumerationFieldSymbol field) {
+            Debug.Assert(_namedValues);
+            Debug.Assert(field.Parent == this);
+
+            if (field.IsTransformed) {
+                return field.GeneratedName;
+            }
+
+            string name = field.Name;
+            if (field.IsCasePreserved == false) {
+                name = Utility.CreateCamelCaseName(name);
+            }
+            return name;
+        }
+
+        public void SetNamedValues() {
+            Debug.Assert(_numericValues == false);
+
+            _namedValues = true;
+        }
+
+        public void SetNumericValues() {
+            Debug.Assert(_namedValues == false);
+
+            _numericValues = true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/EventSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/EventSymbol.cs
new file mode 100644
index 000000000..cccd15990
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/EventSymbol.cs
@@ -0,0 +1,72 @@
+// FieldSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.Text;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal sealed class EventSymbol : CodeMemberSymbol {
+
+        private SymbolImplementation _adderImplementation;
+        private SymbolImplementation _removerImplementation;
+
+        public EventSymbol(string name, TypeSymbol parent, TypeSymbol handlerType)
+            : base(SymbolType.Event, name, parent, handlerType) {
+            ParameterSymbol valueParameter = new ParameterSymbol("value", this, handlerType, ParameterMode.In);
+            AddParameter(valueParameter);
+        }
+
+        public SymbolImplementation AdderImplementation {
+            get {
+                Debug.Assert(_adderImplementation != null);
+                return _adderImplementation;
+            }
+        }
+
+        public bool DefaultImplementation {
+            get {
+                return ((ImplementationFlags & SymbolImplementationFlags.Generated) != 0);
+            }
+        }
+
+        public override string DocumentationID {
+            get {
+                TypeSymbol parent = (TypeSymbol)Parent;
+
+                StringBuilder sb = new StringBuilder();
+                sb.Append("E:");
+                sb.Append(parent.Namespace);
+                sb.Append(".");
+                sb.Append(parent.Name);
+                sb.Append(".");
+                sb.Append(Name);
+
+                return sb.ToString();
+            }
+        }
+
+        public SymbolImplementation RemoverImplementation {
+            get {
+                Debug.Assert(_removerImplementation != null);
+                return _removerImplementation;
+            }
+        }
+
+        public void AddImplementation(SymbolImplementation implementation, bool adder) {
+            Debug.Assert(implementation != null);
+
+            if (adder) {
+                Debug.Assert(_adderImplementation == null);
+                _adderImplementation = implementation;
+            }
+            else {
+                Debug.Assert(_removerImplementation == null);
+                _removerImplementation = implementation;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/FieldSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/FieldSymbol.cs
new file mode 100644
index 000000000..d887ff633
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/FieldSymbol.cs
@@ -0,0 +1,111 @@
+// FieldSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.Text;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal class FieldSymbol : MemberSymbol {
+
+        private bool _hasInitializer;
+        private bool _isConstant;
+        private bool _aliased;
+
+        private object _value;
+
+        private SymbolImplementation _implementation;
+
+        public FieldSymbol(string name, TypeSymbol parent, TypeSymbol valueType)
+            : this(SymbolType.Field, name, parent, valueType) {
+        }
+
+        protected FieldSymbol(SymbolType type, string name, TypeSymbol parent, TypeSymbol valueType)
+            : base(type, name, parent, valueType) {
+        }
+
+        public override string DocumentationID {
+            get {
+                TypeSymbol parent = (TypeSymbol)Parent;
+
+                StringBuilder sb = new StringBuilder();
+                sb.Append("F:");
+                sb.Append(parent.Namespace);
+                sb.Append(".");
+                sb.Append(parent.Name);
+                sb.Append(".");
+                sb.Append(Name);
+
+                return sb.ToString();
+            }
+        }
+
+        public bool HasInitializer {
+            get {
+                return _hasInitializer;
+            }
+        }
+
+        public SymbolImplementation Implementation {
+            get {
+                Debug.Assert(_implementation != null);
+                return _implementation;
+            }
+        }
+
+        public bool IsConstant {
+            get {
+                return _isConstant;
+            }
+        }
+
+        public bool IsGlobalField {
+            get {
+                return _aliased;
+            }
+        }
+
+        public object Value {
+            get {
+                Debug.Assert(_value != null);
+                return _value;
+            }
+            set {
+                Debug.Assert(value != null);
+
+                _value = value;
+            }
+        }
+
+        public void AddImplementation(SymbolImplementation implementation) {
+            Debug.Assert(_implementation == null);
+            Debug.Assert(implementation != null);
+
+            _implementation = implementation;
+        }
+
+        public void SetAlias(string alias) {
+            Debug.Assert((Visibility & MemberVisibility.Static) != 0);
+
+            SetTransformedName(alias);
+            _aliased = true;
+        }
+
+        public void SetConstant() {
+            // NOTE: This is only called for fields built from application
+            //       code. We use this information to do const inlining
+            //       which is scoped to consts defined within the assembly
+            //       being compiled.
+
+            Debug.Assert(_isConstant == false);
+            _isConstant = true;
+        }
+
+        public void SetImplementationState(bool hasInitializer) {
+            _hasInitializer = hasInitializer;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/GenericParameterSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/GenericParameterSymbol.cs
new file mode 100644
index 000000000..27e9e481a
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/GenericParameterSymbol.cs
@@ -0,0 +1,37 @@
+// GenericParameterSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class GenericParameterSymbol : TypeSymbol {
+
+        private int _index;
+        private bool _typeParameter;
+
+        public GenericParameterSymbol(int index, string name, bool typeParameter, NamespaceSymbol parent)
+            : base(SymbolType.GenericParameter, name, parent) {
+            _index = index;
+            _typeParameter = typeParameter;
+        }
+
+        public int Index {
+            get {
+                return _index;
+            }
+        }
+
+        public bool IsTypeParameter {
+            get {
+                return _typeParameter;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/GenericTypeSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/GenericTypeSymbol.cs
new file mode 100644
index 000000000..fd7ffa366
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/GenericTypeSymbol.cs
@@ -0,0 +1,32 @@
+// ClassSymbol.cs
+// Script#/Core/ScriptSharp
+// Copyright (c) Nikhil Kothari.
+// Copyright (c) Microsoft Corporation.
+// This source code is subject to terms and conditions of the Microsoft 
+// Public License. A copy of the license can be found in License.txt.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class GenericTypeSymbol : TypeSymbol {
+
+        private int _genericArgumentIndex;
+
+        public GenericTypeSymbol(int genericArgumentIndex, NamespaceSymbol parent)
+            : base(SymbolType.GenericParameter, "<T>", parent) {
+            _genericArgumentIndex = genericArgumentIndex;
+        }
+
+        public int GenericArgumentIndex {
+            get {
+                return _genericArgumentIndex;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/ILocalSymbolTable.cs b/src/Core/Compiler/ScriptModel/Symbols/ILocalSymbolTable.cs
new file mode 100644
index 000000000..0b7331c16
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/ILocalSymbolTable.cs
@@ -0,0 +1,20 @@
+// ILocalSymbolTable.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal interface ILocalSymbolTable : ISymbolTable {
+
+        void AddSymbol(LocalSymbol symbol);
+
+        string CreateSymbolName(string nameHint);
+
+        void PopScope();
+
+        void PushScope();
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/ISymbolTable.cs b/src/Core/Compiler/ScriptModel/Symbols/ISymbolTable.cs
new file mode 100644
index 000000000..c2f398926
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/ISymbolTable.cs
@@ -0,0 +1,19 @@
+// ISymbolTable.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal interface ISymbolTable {
+
+        ICollection Symbols {
+            get;
+        }
+
+        Symbol FindSymbol(string name, Symbol context, SymbolFilter filter);
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/ISymbolTransformer.cs b/src/Core/Compiler/ScriptModel/Symbols/ISymbolTransformer.cs
new file mode 100644
index 000000000..22c97283e
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/ISymbolTransformer.cs
@@ -0,0 +1,14 @@
+// ISymbolTransformer.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.ScriptModel {
+
+    interface ISymbolTransformer {
+
+        string TransformSymbol(Symbol symbol, out bool transformChildren);
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/IndexerSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/IndexerSymbol.cs
new file mode 100644
index 000000000..0503ab04c
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/IndexerSymbol.cs
@@ -0,0 +1,55 @@
+// IndexerSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.Text;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class IndexerSymbol : PropertySymbol {
+
+        private bool _intrinsic;
+
+        public IndexerSymbol(TypeSymbol parent, TypeSymbol propertyType)
+            : base(SymbolType.Indexer, "Item", parent, propertyType) {
+        }
+
+        public IndexerSymbol(TypeSymbol parent, TypeSymbol propertyType, MemberVisibility visibility)
+            : this(parent, propertyType) {
+            SetVisibility(visibility);
+        }
+
+        public override string DocumentationID {
+            get {
+                TypeSymbol parent = (TypeSymbol)Parent;
+
+                StringBuilder sb = new StringBuilder();
+                sb.Append("P:");
+                sb.Append(parent.Namespace);
+                sb.Append(".");
+
+                // Only include the first parameter.
+                sb.Append(parent.Name);
+                sb.Append(".Item(");
+                sb.Append(Parameters[0].DocumentationID);
+                sb.Append(")");
+
+                return sb.ToString();
+            }
+        }
+
+        public bool IsIntrinsic {
+            get {
+                return _intrinsic;
+            }
+        }
+
+        public void SetIntrinsic() {
+            Debug.Assert(_intrinsic == false);
+            _intrinsic = true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/InterfaceSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/InterfaceSymbol.cs
new file mode 100644
index 000000000..209d0a87a
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/InterfaceSymbol.cs
@@ -0,0 +1,37 @@
+// InterfaceSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class InterfaceSymbol : TypeSymbol {
+
+        private IndexerSymbol _indexer;
+
+        public InterfaceSymbol(string name, NamespaceSymbol parent)
+            : base(SymbolType.Interface, name, parent) {
+        }
+
+        public IndexerSymbol Indexer {
+            get {
+                return _indexer;
+            }
+        }
+
+        public override void AddMember(MemberSymbol memberSymbol) {
+            Debug.Assert(memberSymbol != null);
+
+            if (memberSymbol.Type == SymbolType.Indexer) {
+                Debug.Assert(_indexer == null);
+                _indexer = (IndexerSymbol)memberSymbol;
+            }
+            else {
+                base.AddMember(memberSymbol);
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/IntrinsicType.cs b/src/Core/Compiler/ScriptModel/Symbols/IntrinsicType.cs
new file mode 100644
index 000000000..07fa3844e
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/IntrinsicType.cs
@@ -0,0 +1,70 @@
+// IntrinsicType.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal enum IntrinsicType {
+
+        Object,
+
+        Boolean,
+
+        String,
+
+        Number,
+
+        Integer,
+
+        UnsignedInteger,
+
+        Long,
+
+        UnsignedLong,
+
+        Short,
+
+        UnsignedShort,
+
+        Byte,
+
+        SignedByte,
+
+        Single,
+
+        Double,
+
+        Decimal,
+
+        Delegate,
+
+        Function,
+
+        Void,
+
+        Array,
+
+        Dictionary,
+
+        GenericList,
+
+        GenericDictionary,
+
+        Type,
+
+        IEnumerator,
+
+        Enum,
+
+        Exception,
+
+        Script,
+
+        Arguments,
+
+        Nullable
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/LocalSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/LocalSymbol.cs
new file mode 100644
index 000000000..ad6306fbd
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/LocalSymbol.cs
@@ -0,0 +1,33 @@
+// LocalSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal abstract class LocalSymbol : Symbol {
+
+        private TypeSymbol _valueType;
+
+        protected LocalSymbol(SymbolType type, string name, MemberSymbol parent, TypeSymbol valueType)
+            : base(type, name, parent) {
+            _valueType = valueType;
+        }
+
+        public TypeSymbol ValueType {
+            get {
+                return _valueType;
+            }
+        }
+
+        public override bool MatchFilter(SymbolFilter filter) {
+            if ((filter & SymbolFilter.Locals) == 0) {
+                return false;
+            }
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/MemberSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/MemberSymbol.cs
new file mode 100644
index 000000000..0d382085f
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/MemberSymbol.cs
@@ -0,0 +1,136 @@
+// MemberSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal abstract class MemberSymbol : Symbol {
+
+        private MemberVisibility _visibility;
+        private TypeSymbol _associatedType;
+        private bool _preserveCase;
+        private MemberSymbol _interfaceMember;
+
+        private string _generatedName;
+
+        protected MemberSymbol(SymbolType type, string name, TypeSymbol parent, TypeSymbol associatedType)
+            : base(type, name, parent) {
+            _associatedType = associatedType;
+        }
+
+        public TypeSymbol AssociatedType {
+            get {
+                return _associatedType;
+            }
+        }
+
+        public override string GeneratedName {
+            get {
+                if (_interfaceMember != null) {
+                    // If this member is implementing an interface,
+                    // defer to the interface for our generated name.
+                    return _interfaceMember.GeneratedName;
+                }
+                if (IsTransformed) {
+                    return base.GeneratedName;
+                }
+
+                if (_generatedName == null) {
+                    if (_preserveCase) {
+                        _generatedName = Name;
+                    }
+                    else {
+                        _generatedName = Utility.CreateCamelCaseName(Name);
+                    }
+                }
+
+                return _generatedName;
+            }
+        }
+
+        public MemberSymbol InterfaceMember {
+            get {
+                return _interfaceMember;
+            }
+        }
+
+        public bool IsCasePreserved {
+            get {
+                return _preserveCase;
+            }
+        }
+
+        public bool IsPublic {
+            get {
+                if (((TypeSymbol)Parent).IsPublic == false) {
+                    return false;
+                }                
+                if ((_visibility & (MemberVisibility.Public | MemberVisibility.Protected)) != 0) {
+                    return true;
+                }
+                return false;
+            }
+        }
+
+        public MemberVisibility Visibility {
+            get {
+                return _visibility;
+            }
+        }
+
+        public override bool MatchFilter(SymbolFilter filter) {
+            if ((filter & SymbolFilter.Members) == 0) {
+                return false;
+            }
+
+            SymbolFilter memberTypeFilter = (filter & SymbolFilter.AnyMember);
+            if ((memberTypeFilter == SymbolFilter.InstanceMembers) &&
+                ((_visibility & MemberVisibility.Static) != 0)) {
+                // Filter specifies member should be an instance member;
+                // Visibility of member indicates it is a static member.
+                return false;
+            }
+            if ((memberTypeFilter == SymbolFilter.StaticMembers) &&
+                ((_visibility & MemberVisibility.Static) == 0)) {
+                // Filter specifies member should be a static member;
+                // Visibility of member indicates it is an instance member.
+                return false;
+            }
+            SymbolFilter visibilityFilter = (filter & SymbolFilter.AnyVisibility);
+            if ((visibilityFilter == SymbolFilter.Public) &&
+                ((_visibility & (MemberVisibility.Public | MemberVisibility.Internal)) == 0)) {
+                // Filter specifies member should be public;
+                // Visibility of member indicates it is not public or internal
+                return false;
+            }
+            if ((visibilityFilter == (SymbolFilter.Public | SymbolFilter.Protected)) &&
+                ((_visibility & (MemberVisibility.Public | MemberVisibility.Internal | MemberVisibility.Protected)) == 0)) {
+                // Filter specifies member should be public or protected;
+                // Visibility of member indicates it is not public, internal or protected
+                return false;
+            }
+
+            return true;
+        }
+
+        public void SetInterfaceMember(MemberSymbol memberSymbol) {
+            Debug.Assert(_interfaceMember == null);
+            Debug.Assert(memberSymbol != null);
+
+            _interfaceMember = memberSymbol;
+        }
+
+        public void SetNameCasing(bool preserveCase) {
+            _preserveCase = preserveCase;
+        }
+
+        public void SetVisibility(MemberVisibility visibility) {
+            _visibility = visibility;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/MemberVisibility.cs b/src/Core/Compiler/ScriptModel/Symbols/MemberVisibility.cs
new file mode 100644
index 000000000..2426abb06
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/MemberVisibility.cs
@@ -0,0 +1,23 @@
+// MemberVisibility.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.ScriptModel {
+
+    [Flags]
+    internal enum MemberVisibility {
+
+        PrivateInstance = 0,
+
+        Protected = 1,
+
+        Public = 2,
+
+        Internal = 4,
+
+        Static = 8
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/MethodSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/MethodSymbol.cs
new file mode 100644
index 000000000..eaa3ab92e
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/MethodSymbol.cs
@@ -0,0 +1,158 @@
+// MethodSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal class MethodSymbol : CodeMemberSymbol {
+
+        private ICollection<string> _conditions;
+        private bool _aliased;
+        private bool _skipGeneration;
+        private ICollection<GenericParameterSymbol> _genericArguments;
+
+        private SymbolImplementation _implementation;
+
+        public MethodSymbol(string name, TypeSymbol parent, TypeSymbol returnType)
+            : this(SymbolType.Method, name, parent, returnType) {
+        }
+
+        public MethodSymbol(string name, TypeSymbol parent, TypeSymbol returnType, MemberVisibility visibility)
+            : this(SymbolType.Method, name, parent, returnType) {
+            SetVisibility(visibility);
+        }
+
+        protected MethodSymbol(SymbolType type, string name, TypeSymbol parent, TypeSymbol returnType)
+            : base(type, name, parent, returnType) {
+        }
+
+        public ICollection<string> Conditions {
+            get {
+                return _conditions;
+            }
+        }
+
+        public override string DocumentationID {
+            get {
+                TypeSymbol parent = (TypeSymbol)Parent;
+
+                StringBuilder sb = new StringBuilder();
+                sb.Append("M:");
+                sb.Append(parent.Namespace);
+                sb.Append(".");
+                sb.Append(parent.Name);
+                sb.Append(".");
+                sb.Append(Name);
+
+                if (Parameters != null) {
+                    sb.Append("(");
+
+                    for (int i = 0; i < Parameters.Count; i++) {
+                        if (i > 0) {
+                            sb.Append(",");
+                        }
+
+                        sb.Append(Parameters[i].DocumentationID);
+                    }
+
+                    sb.Append(")");
+                }
+
+                return sb.ToString();
+            }
+        }
+
+        public ICollection<GenericParameterSymbol> GenericArguments {
+            get {
+                return _genericArguments;
+            }
+        }
+
+        public SymbolImplementation Implementation {
+            get {
+                Debug.Assert(_implementation != null);
+                return _implementation;
+            }
+        }
+
+        public bool IsGeneric {
+            get {
+                return (_genericArguments != null) &&
+                       (_genericArguments.Count != 0);
+            }
+        }
+
+        public bool IsGlobalMethod {
+            get {
+                if (_aliased) {
+                    // Methods with a script alias are considered global methods.
+                    return true;
+                }
+                if (Parent.Type == SymbolType.Class) {
+                    return ((ClassSymbol)Parent).HasGlobalMethods;
+                }
+                return false;
+            }
+        }
+
+        public bool SkipGeneration {
+            get {
+                return _skipGeneration;
+            }
+        }
+
+        public void AddGenericArguments(ICollection<GenericParameterSymbol> genericArguments) {
+            Debug.Assert(_genericArguments == null);
+            Debug.Assert(genericArguments != null);
+            Debug.Assert(genericArguments.Count != 0);
+
+            _genericArguments = genericArguments;
+        }
+
+        public void AddImplementation(SymbolImplementation implementation) {
+            Debug.Assert(_implementation == null);
+            Debug.Assert(implementation != null);
+
+            _implementation = implementation;
+        }
+
+        public bool MatchesConditions(ICollection<string> defines) {
+            if (_conditions == null) {
+                return true;
+            }
+
+            foreach (string condition in _conditions) {
+                if (defines.Contains(condition)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        public void SetAlias(string alias) {
+            Debug.Assert((Visibility & MemberVisibility.Static) != 0);
+
+            SetTransformedName(alias);
+            _aliased = true;
+        }
+
+        public void SetConditions(ICollection<string> conditions) {
+            Debug.Assert(_conditions == null);
+            Debug.Assert(conditions != null);
+
+            _conditions = conditions;
+        }
+
+        public void SetSkipGeneration() {
+            Debug.Assert(_skipGeneration == false);
+            _skipGeneration = true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/NamespaceSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/NamespaceSymbol.cs
new file mode 100644
index 000000000..b45b65402
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/NamespaceSymbol.cs
@@ -0,0 +1,86 @@
+// NamespaceSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal sealed class NamespaceSymbol : Symbol, ISymbolTable {
+
+        private SymbolSet _symbolSet;
+        private List<TypeSymbol> _types;
+        private Dictionary<string, TypeSymbol> _typeMap;
+        private bool _hasApplicationTypes;
+
+        public NamespaceSymbol(string name, SymbolSet symbolSet)
+            : base(SymbolType.Namespace, name, null) {
+            _symbolSet = symbolSet;
+            _types = new List<TypeSymbol>();
+            _typeMap = new Dictionary<string, TypeSymbol>();
+        }
+
+        public bool HasApplicationTypes {
+            get {
+                return _hasApplicationTypes;
+            }
+        }
+
+        public override SymbolSet SymbolSet {
+            get {
+                return _symbolSet;
+            }
+        }
+
+        public ICollection<TypeSymbol> Types {
+            get {
+                return _types;
+            }
+        }
+
+        public void AddType(TypeSymbol typeSymbol) {
+            Debug.Assert(typeSymbol != null);
+            Debug.Assert(String.IsNullOrEmpty(typeSymbol.Name) == false);
+            Debug.Assert(_typeMap.ContainsKey(typeSymbol.Name) == false);
+
+            _types.Add(typeSymbol);
+            _typeMap[typeSymbol.Name] = typeSymbol;
+
+            if (typeSymbol.IsApplicationType) {
+                _hasApplicationTypes = true;
+            }
+        }
+
+        public override bool MatchFilter(SymbolFilter filter) {
+            if ((filter & SymbolFilter.Namespaces) == 0) {
+                return false;
+            }
+            return true;
+        }
+
+        #region ISymbolTable Members
+        ICollection ISymbolTable.Symbols {
+            get {
+                return _types;
+            }
+        }
+
+        Symbol ISymbolTable.FindSymbol(string name, Symbol context, SymbolFilter filter) {
+            Debug.Assert(String.IsNullOrEmpty(name) == false);
+            Debug.Assert(context == null);
+            Debug.Assert(filter == SymbolFilter.Types);
+
+            if (_typeMap.ContainsKey(name)) {
+                return _typeMap[name];
+            }
+
+            return null;
+        }
+        #endregion
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/ParameterMode.cs b/src/Core/Compiler/ScriptModel/Symbols/ParameterMode.cs
new file mode 100644
index 000000000..28f734c31
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/ParameterMode.cs
@@ -0,0 +1,18 @@
+// ParameterMode.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal enum ParameterMode {
+
+        In = 0,
+
+        InOut = 1,
+
+        List = 2
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/ParameterSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/ParameterSymbol.cs
new file mode 100644
index 000000000..d4c60241a
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/ParameterSymbol.cs
@@ -0,0 +1,48 @@
+// ParameterSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.Text;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal sealed class ParameterSymbol : LocalSymbol {
+
+        private ParameterMode _mode;
+
+        public ParameterSymbol(string name, MemberSymbol parent, TypeSymbol valueType, ParameterMode mode)
+            : base(SymbolType.Parameter, name, parent, valueType) {
+            _mode = mode;
+        }
+
+        public override string Documentation {
+            get {
+                return SymbolSet.GetParameterDocumentation(Parent.DocumentationID, Name);
+            }
+        }
+
+        public override string DocumentationID {
+            get {
+                TypeSymbol parameterType = ValueType;
+
+                if (parameterType.IsArray) {
+                    parameterType = ((ClassSymbol)parameterType).Indexer.AssociatedType;
+
+                    return String.Format("{0}.{1}[]", parameterType.Namespace, parameterType.Name);
+                }
+                else {
+                    return String.Format("{0}.{1}", parameterType.Namespace, parameterType.Name);
+                }
+            }
+        }
+
+        public ParameterMode Mode {
+            get {
+                return _mode;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/PropertySymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/PropertySymbol.cs
new file mode 100644
index 000000000..4ad5f38e5
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/PropertySymbol.cs
@@ -0,0 +1,74 @@
+// PropertySymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.Text;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal class PropertySymbol : CodeMemberSymbol {
+
+        private SymbolImplementation _getterImplementation;
+        private SymbolImplementation _setterImplementation;
+
+        public PropertySymbol(string name, TypeSymbol parent, TypeSymbol propertyType)
+            : this(SymbolType.Property, name, parent, propertyType) {
+        }
+
+        protected PropertySymbol(SymbolType type, string name, TypeSymbol parent, TypeSymbol propertyType)
+            : base(type, name, parent, propertyType) {
+        }
+
+        public override string DocumentationID {
+            get {
+                TypeSymbol parent = (TypeSymbol)Parent;
+
+                StringBuilder sb = new StringBuilder();
+                sb.Append("P:");
+                sb.Append(parent.Namespace);
+                sb.Append(".");
+                sb.Append(parent.Name);
+                sb.Append(".");
+                sb.Append(Name);
+
+                return sb.ToString();
+            }
+        }
+
+        public bool IsReadOnly {
+            get {
+                return ((ImplementationFlags & SymbolImplementationFlags.ReadOnly) != 0);
+            }
+        }
+
+        public SymbolImplementation GetterImplementation {
+            get {
+                Debug.Assert(_getterImplementation != null);
+                return _getterImplementation;
+            }
+        }
+
+        public SymbolImplementation SetterImplementation {
+            get {
+                Debug.Assert(_setterImplementation != null);
+                return _setterImplementation;
+            }
+        }
+
+        public void AddImplementation(SymbolImplementation implementation, bool getter) {
+            Debug.Assert(implementation != null);
+
+            if (getter) {
+                Debug.Assert(_getterImplementation == null);
+                _getterImplementation = implementation;
+            }
+            else {
+                Debug.Assert(_setterImplementation == null);
+                _setterImplementation = implementation;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/RecordSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/RecordSymbol.cs
new file mode 100644
index 000000000..b22dde0e0
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/RecordSymbol.cs
@@ -0,0 +1,17 @@
+// RecordSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal sealed class RecordSymbol : ClassSymbol {
+
+        public RecordSymbol(string name, NamespaceSymbol parent)
+            : base(SymbolType.Record, name, parent) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/ResourcesSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/ResourcesSymbol.cs
new file mode 100644
index 000000000..48a927831
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/ResourcesSymbol.cs
@@ -0,0 +1,17 @@
+// ResourcesSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class ResourcesSymbol : ClassSymbol {
+
+        public ResourcesSymbol(string name, NamespaceSymbol parent)
+            : base(SymbolType.Resources, name, parent) {
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/Symbol.cs b/src/Core/Compiler/ScriptModel/Symbols/Symbol.cs
new file mode 100644
index 000000000..2bd2a0ef4
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/Symbol.cs
@@ -0,0 +1,118 @@
+// Symbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal abstract class Symbol {
+
+        private SymbolType _type;
+        private string _name;
+        private string _transformedName;
+        private bool _transformAllowed;
+        private Symbol _parent;
+        private object _parseContext;
+
+        protected Symbol(SymbolType type, string name, Symbol parent) {
+            _type = type;
+            _name = name;
+            _parent = parent;
+            _transformAllowed = true;
+        }
+
+        public virtual string Documentation {
+            get {
+                return SymbolSet.GetSummaryDocumentation(DocumentationID);
+            }
+        }
+
+        public virtual string DocumentationID {
+            get {
+                Debug.Fail("Documentation is not supported for this symbol type.");
+                return null;
+            }
+        }
+
+        public string Name {
+            get {
+                return _name;
+            }
+        }
+
+        public virtual string GeneratedName {
+            get {
+                if (IsTransformed) {
+                    return _transformedName;
+                }
+                return Name;
+            }
+        }
+
+        public bool IsTransformAllowed {
+            get {
+                return _transformAllowed;
+            }
+        }
+
+        public bool IsTransformed {
+            get {
+                return (_transformedName != null);
+            }
+        }
+
+        public Symbol Parent {
+            get {
+                return _parent;
+            }
+        }
+
+        public object ParseContext {
+            get {
+                Debug.Assert(_parseContext != null);
+                return _parseContext;
+            }
+        }
+
+        public virtual SymbolSet SymbolSet {
+            get {
+                return Parent.SymbolSet;
+            }
+        }
+
+        public SymbolType Type {
+            get {
+                return _type;
+            }
+        }
+
+        public void DisableNameTransformation() {
+            Debug.Assert(IsTransformAllowed);
+
+            _transformAllowed = false;
+        }
+
+        public abstract bool MatchFilter(SymbolFilter filter);
+
+        public void SetTransformedName(string name) {
+            Debug.Assert(IsTransformed == false);
+            Debug.Assert(IsTransformAllowed);
+
+            _transformedName = name;
+            _transformAllowed = false;
+        }
+
+        public void SetParseContext(object parseContext) {
+            Debug.Assert(_parseContext == null);
+            Debug.Assert(parseContext != null);
+            _parseContext = parseContext;
+        }
+
+        public override string ToString() {
+            return Name;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/SymbolFilter.cs b/src/Core/Compiler/ScriptModel/Symbols/SymbolFilter.cs
new file mode 100644
index 000000000..0b7079b7c
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/SymbolFilter.cs
@@ -0,0 +1,42 @@
+// SymbolFilter.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+
+namespace ScriptSharp.ScriptModel {
+
+    [Flags]
+    internal enum SymbolFilter {
+
+        Locals = 1,
+
+        Members = 2,
+
+        Types = 4,
+
+        Namespaces = 8,
+
+        InstanceMembers = 32,
+
+        StaticMembers = 64,
+
+        Public = 128,
+
+        Protected = 256,
+
+        Private = 512,
+
+        ExcludeParent = 1024,
+
+        AllTypes = Locals | Members | Types | Namespaces,
+
+        AnyMember = InstanceMembers | StaticMembers,
+
+        AnyVisibility = Public | Protected | Private,
+
+        All = AllTypes | AnyMember | AnyVisibility,
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/SymbolImplementation.cs b/src/Core/Compiler/ScriptModel/Symbols/SymbolImplementation.cs
new file mode 100644
index 000000000..848a23cce
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/SymbolImplementation.cs
@@ -0,0 +1,58 @@
+// SymbolImplementation.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class SymbolImplementation {
+
+        private SymbolScope _scope;
+        private ICollection<Statement> _statements;
+
+        public SymbolImplementation(ICollection<Statement> statements, SymbolScope scope) {
+            _scope = scope;
+            _statements = statements;
+        }
+
+        public bool DeclaresVariables {
+            get {
+                foreach (Statement statement in _statements) {
+                    if (statement is VariableDeclarationStatement) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+
+        public SymbolScope Scope {
+            get {
+                return _scope;
+            }
+        }
+
+        public bool RequiresThisContext {
+            get {
+                foreach (Statement statement in _statements) {
+                    if (statement.RequiresThisContext) {
+                        return true;
+                    }
+                }
+                return false;
+            }
+        }
+
+        public ICollection<Statement> Statements {
+            get {
+                return _statements;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/SymbolImplementationFlags.cs b/src/Core/Compiler/ScriptModel/Symbols/SymbolImplementationFlags.cs
new file mode 100644
index 000000000..73ecbbb11
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/SymbolImplementationFlags.cs
@@ -0,0 +1,23 @@
+// SymbolImplementationFlags.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.ScriptModel {
+
+    [Flags]
+    internal enum SymbolImplementationFlags {
+
+        Regular = 0,
+
+        Abstract = 1,
+
+        Override = 2,
+
+        Generated = 4,
+
+        ReadOnly = 8
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/SymbolImplementationTransformer.cs b/src/Core/Compiler/ScriptModel/Symbols/SymbolImplementationTransformer.cs
new file mode 100644
index 000000000..70d081694
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/SymbolImplementationTransformer.cs
@@ -0,0 +1,51 @@
+// SymbolSetTransformer.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class SymbolImplementationTransformer {
+
+        private ISymbolTransformer _transformer;
+
+        public SymbolImplementationTransformer(ISymbolTransformer transformer) {
+            _transformer = transformer;
+        }
+
+        private void TransformScope(SymbolScope scope, List<Symbol> transformedSymbols) {
+            foreach (Symbol symbol in ((ISymbolTable)scope).Symbols) {
+                if (symbol.Type != SymbolType.Variable) {
+                    continue;
+                }
+
+                bool dummy;
+                string transformedName = _transformer.TransformSymbol(symbol, out dummy);
+                if (transformedName != null) {
+                    symbol.SetTransformedName(transformedName);
+                    transformedSymbols.Add(symbol);
+                }
+            }
+
+            if (scope.ChildScopes != null) {
+                foreach (SymbolScope childScope in scope.ChildScopes) {
+                    TransformScope(childScope, transformedSymbols);
+                }
+            }
+        }
+
+        public ICollection<Symbol> TransformSymbolImplementation(SymbolImplementation implementation) {
+            List<Symbol> transformedSymbols = new List<Symbol>();
+
+            SymbolScope scope = implementation.Scope;
+            TransformScope(scope, transformedSymbols);
+
+            return transformedSymbols;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/SymbolInternalizer.cs b/src/Core/Compiler/ScriptModel/Symbols/SymbolInternalizer.cs
new file mode 100644
index 000000000..8a6145ffb
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/SymbolInternalizer.cs
@@ -0,0 +1,92 @@
+// SymbolInternalizer.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class SymbolInternalizer : ISymbolTransformer {
+
+        private static string GenerateName(string name) {
+            if (name.StartsWith("_", StringComparison.OrdinalIgnoreCase) == false) {
+                return "_" + Utility.CreateCamelCaseName(name);
+            }
+            return null;
+        }
+
+        private string TransformMember(MemberSymbol memberSymbol) {
+            TypeSymbol type = (TypeSymbol)memberSymbol.Parent;
+            if (((memberSymbol.Visibility & MemberVisibility.Public) != 0) ||
+                ((memberSymbol.Visibility & MemberVisibility.Protected) != 0) ||
+                (memberSymbol.IsTransformAllowed == false)) {
+                return null;
+            }
+            if ((memberSymbol.Visibility & MemberVisibility.Internal) != 0) {
+                return GenerateName(memberSymbol.Name);
+            }
+            else {
+                // We add the inheritance depth, because two classes in the
+                // same type hierarchy can have similar named private methods
+                // which end up overriding each other in the generated script.
+                // In release mode, these will get transformed into generated
+                // names, so this type of disambiguation needs to be done for
+                // debug builds only.
+                int inheritanceDepth = 0;
+                if (type.Type == SymbolType.Class) {
+                    inheritanceDepth = ((ClassSymbol)type).InheritanceDepth;
+                }
+                if (inheritanceDepth != 0) {
+                    string generatedName = GenerateName(memberSymbol.Name);
+                    if (generatedName == null) {
+                        // Can be null if the member was already prefixed with
+                        // a "_"
+                        generatedName = memberSymbol.Name;
+                    }
+                    return generatedName + "$" + inheritanceDepth;
+                }
+                return GenerateName(memberSymbol.Name);
+            }
+        }
+
+        private string TransformType(TypeSymbol typeSymbol, out bool transformChildren) {
+            transformChildren = (typeSymbol.Type != SymbolType.Interface) &&
+                                (typeSymbol.Type != SymbolType.Delegate);
+
+            if ((typeSymbol.Type == SymbolType.Enumeration) &&
+                ((EnumerationSymbol)typeSymbol).UseNamedValues) {
+                // If the enum uses named values, then don't transform, as its
+                // unlikely the code wants to use some random generated name as the
+                // named value.
+                transformChildren = false;
+            }
+
+            if ((typeSymbol.IsPublic == false) && typeSymbol.IsTransformAllowed) {
+                return GenerateName(typeSymbol.Name);
+            }
+
+            return null;
+        }
+
+        #region Implementation of ISymbolTransformer
+        string ISymbolTransformer.TransformSymbol(Symbol symbol, out bool transformChildren) {
+            transformChildren = false;
+
+            if (symbol is TypeSymbol) {
+                if ((symbol.Type == SymbolType.Class) && ((ClassSymbol)symbol).IsTestType) {
+                    return null;
+                }
+
+                return TransformType((TypeSymbol)symbol, out transformChildren);
+            }
+            else if (symbol is MemberSymbol) {
+                return TransformMember((MemberSymbol)symbol);
+            }
+
+            return null;
+        }
+        #endregion
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/SymbolObfuscator.cs b/src/Core/Compiler/ScriptModel/Symbols/SymbolObfuscator.cs
new file mode 100644
index 000000000..e50a4c828
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/SymbolObfuscator.cs
@@ -0,0 +1,156 @@
+// SymbolObfuscator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class SymbolObfuscator : ISymbolTransformer {
+
+        private int _count;
+
+        private static string GenerateName(int index, int offset) {
+            if (offset == 0) {
+                return String.Format("${0:X}", index);
+            }
+            return String.Format("${0:X}_{1:X}", offset, index);
+        }
+
+        private string TransformLocal(LocalSymbol localSymbol) {
+            int depth = 0;
+
+            AnonymousMethodSymbol parentMethod = localSymbol.Parent as AnonymousMethodSymbol;
+            if (parentMethod != null) {
+                // If an anonymous method contains a local variable with the
+                // same name as a variable in the containing method, they will
+                // conflict at runtime, i.e. the value in the inner method
+                // will override the value of the outer method when it is run.
+                // Note that right now we aren't seeing if there is actually a conflict.
+                // We're always qualifying the inner variable with a depth prefix.
+                // REVIEW: Should we try to optimize when we qualify?
+
+                depth = parentMethod.Depth;
+            }
+
+            string transformedName = GenerateName(_count, depth);
+            _count++;
+
+            return transformedName;
+        }
+
+        private string TransformMember(MemberSymbol memberSymbol) {
+            if ((memberSymbol.InterfaceMember != null) ||
+                (memberSymbol.Name.Length < 3) ||
+                (memberSymbol.IsTransformAllowed == false)) {
+                // Interface members do get obfuscated
+
+                // Also members with already short names do not get
+                // obfuscated, as doing so might infact increase the name size
+                return null;
+            }
+
+            TypeSymbol type = (TypeSymbol)memberSymbol.Parent;
+
+            if (memberSymbol.IsPublic == false) {
+                if ((memberSymbol is CodeMemberSymbol) &&
+                    ((CodeMemberSymbol)memberSymbol).IsOverride) {
+                    ClassSymbol baseType = ((ClassSymbol)type).BaseClass;
+
+                    if (baseType == null) {
+                        baseType = (ClassSymbol)((ISymbolTable)memberSymbol.SymbolSet.SystemNamespace).FindSymbol("Object", null, SymbolFilter.Types);
+                        Debug.Assert(baseType != null);
+                    }
+
+                    MemberSymbol baseMember =
+                        (MemberSymbol)((ISymbolTable)baseType).FindSymbol(memberSymbol.Name, type, SymbolFilter.Members);
+                    Debug.Assert(baseMember != null);
+
+                    return baseMember.GeneratedName;
+                }
+                else {
+                    int minimizationDepth = 0;
+                    int currentCount = -1;
+
+                    if (type is ClassSymbol) {
+                        currentCount = ((ClassSymbol)type).TransformationCookie;
+                    }
+                    else if (type is EnumerationSymbol) {
+                        currentCount = ((EnumerationSymbol)type).TransformationCookie;
+                    }
+
+                    if (type is ClassSymbol) {
+                        minimizationDepth = ((ClassSymbol)type).MinimizationDepth;
+
+                        if (currentCount == -1) {
+                            ClassSymbol baseClass = ((ClassSymbol)type).BaseClass;
+                            if ((baseClass != null) && baseClass.IsApplicationType) {
+                                // Set current count to the base classes transformation
+                                // cookie, so the generated one will the next one in
+                                // sequence
+                                currentCount = baseClass.TransformationCookie;
+                            }
+                        }
+                    }
+
+                    currentCount++;
+                    if (type is ClassSymbol) {
+                        ((ClassSymbol)type).TransformationCookie = currentCount;
+                    }
+                    else if (type is EnumerationSymbol) {
+                        ((EnumerationSymbol)type).TransformationCookie = currentCount;
+                    }
+
+                    return GenerateName(currentCount, minimizationDepth);
+                }
+            }
+
+            return null;
+        }
+
+        private string TransformType(TypeSymbol typeSymbol, out bool transformChildren) {
+            string transformedName = null;
+            transformChildren = (typeSymbol.Type != SymbolType.Interface) &&
+                                (typeSymbol.Type != SymbolType.Delegate);
+
+            if ((typeSymbol.IsPublic == false) && typeSymbol.IsTransformAllowed) {
+                string prefix = typeSymbol.SymbolSet.ScriptPrefix;
+
+                string name = String.Format("{0}${1:X}", prefix, _count);
+                if ((typeSymbol.Name.Length + 1) < name.Length) {
+                    transformedName = "_" + typeSymbol.Name;
+                }
+                else {
+                    transformedName = name;
+                    _count++;
+                }
+            }
+
+            return transformedName;
+        }
+
+        #region Implementation of ISymbolTransformer
+        string ISymbolTransformer.TransformSymbol(Symbol symbol, out bool transformChildren) {
+            transformChildren = false;
+
+            if (symbol is TypeSymbol) {
+                if ((symbol.Type == SymbolType.Class) && ((ClassSymbol)symbol).IsTestType) {
+                    return null;
+                }
+
+                return TransformType((TypeSymbol)symbol, out transformChildren);
+            }
+            else if (symbol is MemberSymbol) {
+                return TransformMember((MemberSymbol)symbol);
+            }
+            else if (symbol is LocalSymbol) {
+                return TransformLocal((LocalSymbol)symbol);
+            }
+
+            return null;
+        }
+        #endregion
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/SymbolScope.cs b/src/Core/Compiler/ScriptModel/Symbols/SymbolScope.cs
new file mode 100644
index 000000000..af3d12aeb
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/SymbolScope.cs
@@ -0,0 +1,89 @@
+// SymbolScope.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class SymbolScope : ISymbolTable {
+
+        private SymbolScope _parentScope;
+        private ISymbolTable _parentSymbolTable;
+        private List<SymbolScope> _childScopes;
+
+        private Dictionary<string, LocalSymbol> _localTable;
+        private Collection<LocalSymbol> _locals;
+
+        public SymbolScope(SymbolScope parentScope)
+            : this((ISymbolTable)parentScope) {
+            _parentScope = parentScope;
+        }
+
+        public SymbolScope(ISymbolTable parentSymbolTable) {
+            Debug.Assert(parentSymbolTable != null);
+            _parentSymbolTable = parentSymbolTable;
+
+            _locals = new Collection<LocalSymbol>();
+            _localTable = new Dictionary<string, LocalSymbol>();
+        }
+
+        public ICollection<SymbolScope> ChildScopes {
+            get {
+                return _childScopes;
+            }
+        }
+
+        public SymbolScope Parent {
+            get {
+                return _parentScope;
+            }
+        }
+
+        public void AddChildScope(SymbolScope scope) {
+            if (_childScopes == null) {
+                _childScopes = new List<SymbolScope>();
+            }
+            _childScopes.Add(scope);
+        }
+
+        public void AddSymbol(LocalSymbol symbol) {
+            Debug.Assert(symbol != null);
+            Debug.Assert(String.IsNullOrEmpty(symbol.Name) == false);
+            Debug.Assert(_localTable.ContainsKey(symbol.Name) == false);
+
+            _locals.Add(symbol);
+            _localTable[symbol.Name] = symbol;
+        }
+
+        #region ISymbolTable Members
+        ICollection ISymbolTable.Symbols {
+            get {
+                return _locals;
+            }
+        }
+
+        Symbol ISymbolTable.FindSymbol(string name, Symbol context, SymbolFilter filter) {
+            Symbol symbol = null;
+
+            if ((filter & SymbolFilter.Locals) != 0) {
+                if (_localTable.ContainsKey(name)) {
+                    symbol = _localTable[name];
+                }
+            }
+
+            if (symbol == null) {
+                Debug.Assert(_parentSymbolTable != null);
+                symbol = _parentSymbolTable.FindSymbol(name, context, filter);
+            }
+
+            return symbol;
+        }
+        #endregion
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/SymbolSet.cs b/src/Core/Compiler/ScriptModel/Symbols/SymbolSet.cs
new file mode 100644
index 000000000..469b0c028
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/SymbolSet.cs
@@ -0,0 +1,767 @@
+// SymbolSet.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Text;
+using System.Xml;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class SymbolSet : ISymbolTable {
+
+        private List<NamespaceSymbol> _namespaces;
+        private Dictionary<string, NamespaceSymbol> _namespaceMap;
+        private NamespaceSymbol _systemNamespace;
+        private NamespaceSymbol _globalNamespace;
+
+        private Dictionary<string, TypeSymbol> _arrayTypeTable;
+        private Dictionary<string, TypeSymbol> _genericTypeTable;
+
+        private MemberSymbol _entryPoint;
+        private string _scriptName;
+        private string _scriptPrefix;
+
+        private Dictionary<string, Dictionary<string, ResXItem>> _resources;
+
+        private XmlDocument _docComments;
+
+        public SymbolSet() {
+            _namespaces = new List<NamespaceSymbol>();
+            _namespaceMap = new Dictionary<string, NamespaceSymbol>();
+
+            _globalNamespace = new NamespaceSymbol(String.Empty, this);
+            _globalNamespace.SetTransformedName(String.Empty);
+            _namespaces.Add(_globalNamespace);
+            _namespaceMap[String.Empty] = _globalNamespace;
+
+            _systemNamespace = new NamespaceSymbol("System", this);
+            _namespaces.Add(_systemNamespace);
+            _namespaceMap["System"] = _systemNamespace;
+
+            _resources = new Dictionary<string, Dictionary<string, ResXItem>>(StringComparer.OrdinalIgnoreCase);
+        }
+
+        public MemberSymbol EntryPoint {
+            get {
+                return _entryPoint;
+            }
+        }
+
+        public NamespaceSymbol GlobalNamespace {
+            get {
+                return _globalNamespace;
+            }
+        }
+
+        public bool HasResources {
+            get {
+                return _resources.Count != 0;
+            }
+        }
+
+        public ICollection<NamespaceSymbol> Namespaces {
+            get {
+                return _namespaces;
+            }
+        }
+
+        public string ScriptName {
+            get {
+                return _scriptName;
+            }
+            set {
+                _scriptName = value;
+            }
+        }
+
+        public string ScriptPrefix {
+            get {
+                return _scriptPrefix;
+            }
+            set {
+                _scriptPrefix = value;
+            }
+        }
+
+        public NamespaceSymbol SystemNamespace {
+            get {
+                return _systemNamespace;
+            }
+        }
+
+        public TypeSymbol CreateArrayTypeSymbol(TypeSymbol itemTypeSymbol) {
+            if ((_arrayTypeTable != null) && (_arrayTypeTable.ContainsKey(itemTypeSymbol.FullName))) {
+                return _arrayTypeTable[itemTypeSymbol.FullName];
+            }
+            else {
+                TypeSymbol specificArrayTypeSymbol = CreateArrayTypeCore(itemTypeSymbol);
+
+                if (_arrayTypeTable == null) {
+                    _arrayTypeTable = new Dictionary<string, TypeSymbol>();
+                }
+                _arrayTypeTable[itemTypeSymbol.FullName] = specificArrayTypeSymbol;
+
+                return specificArrayTypeSymbol;
+            }
+        }
+
+        private TypeSymbol CreateArrayTypeCore(TypeSymbol itemTypeSymbol) {
+            TypeSymbol arrayTypeSymbol =
+                (TypeSymbol)((ISymbolTable)_systemNamespace).FindSymbol("Array", null, SymbolFilter.Types);
+            Debug.Assert(arrayTypeSymbol != null);
+
+            TypeSymbol specificArrayTypeSymbol = new ClassSymbol("Array", _systemNamespace);
+            foreach (MemberSymbol memberSymbol in arrayTypeSymbol.Members) {
+                specificArrayTypeSymbol.AddMember(memberSymbol);
+            }
+
+            IndexerSymbol indexerSymbol = new IndexerSymbol(specificArrayTypeSymbol, itemTypeSymbol,
+                                                            MemberVisibility.Public);
+            indexerSymbol.SetIntrinsic();
+            specificArrayTypeSymbol.AddMember(indexerSymbol);
+            specificArrayTypeSymbol.SetIgnoreNamespace();
+            specificArrayTypeSymbol.SetArray();
+
+            return specificArrayTypeSymbol;
+        }
+
+        private MemberSymbol CreateGenericMember(MemberSymbol templateMember, IList<TypeSymbol> typeArguments) {
+            TypeSymbol parentType = (TypeSymbol)templateMember.Parent;
+            TypeSymbol instanceAssociatedType;
+
+            if (templateMember.AssociatedType.Type == SymbolType.GenericParameter) {
+                GenericParameterSymbol genericParameter = (GenericParameterSymbol)templateMember.AssociatedType;
+                instanceAssociatedType = typeArguments[genericParameter.Index];
+            }
+            else {
+                instanceAssociatedType = typeArguments[0];
+            }
+
+            if (templateMember.Type == SymbolType.Indexer) {
+                IndexerSymbol templateIndexer = (IndexerSymbol)templateMember;
+                IndexerSymbol instanceIndexer = new IndexerSymbol(parentType, instanceAssociatedType);
+
+                if (templateIndexer.IsIntrinsic) {
+                    instanceIndexer.SetIntrinsic();
+                }
+                instanceIndexer.SetVisibility(templateIndexer.Visibility);
+
+                return instanceIndexer;
+            }
+            else if (templateMember.Type == SymbolType.Property) {
+                PropertySymbol templateProperty = (PropertySymbol)templateMember;
+                PropertySymbol instanceProperty = new PropertySymbol(templateProperty.Name, parentType, instanceAssociatedType);
+
+                if (templateProperty.IsTransformed) {
+                    instanceProperty.SetTransformedName(templateProperty.GeneratedName);
+                }
+                instanceProperty.SetNameCasing(templateProperty.IsCasePreserved);
+                instanceProperty.SetVisibility(templateProperty.Visibility);
+
+                return instanceProperty;
+            }
+            else if (templateMember.Type == SymbolType.Field) {
+                FieldSymbol templateField = (FieldSymbol)templateMember;
+                FieldSymbol instanceField = new FieldSymbol(templateField.Name, parentType, instanceAssociatedType);
+
+                if (templateField.IsTransformed) {
+                    instanceField.SetTransformedName(templateField.GeneratedName);
+                }
+                instanceField.SetNameCasing(templateField.IsCasePreserved);
+                instanceField.SetVisibility(templateField.Visibility);
+
+                return instanceField;
+            }
+            else if (templateMember.Type == SymbolType.Method) {
+                MethodSymbol templateMethod = (MethodSymbol)templateMember;
+                MethodSymbol instanceMethod = new MethodSymbol(templateMethod.Name, parentType, instanceAssociatedType);
+
+                if (templateMethod.IsTransformed) {
+                    instanceMethod.SetTransformedName(templateMethod.GeneratedName);
+                }
+                if (templateMethod.InterfaceMember != null) {
+                    instanceMethod.SetInterfaceMember(templateMethod.InterfaceMember);
+                }
+                instanceMethod.SetNameCasing(templateMethod.IsCasePreserved);
+                instanceMethod.SetVisibility(templateMethod.Visibility);
+
+                return instanceMethod;
+            }
+
+            Debug.Fail("Unexpected generic member '" + templateMember.Name + " on type '" + ((TypeSymbol)templateMember.Parent).FullName + "'.");
+            return null;
+        }
+
+        public TypeSymbol CreateGenericTypeSymbol(TypeSymbol templateType, IList<TypeSymbol> typeArguments) {
+            foreach (TypeSymbol typeSymbol in typeArguments) {
+                if (typeSymbol.Type == SymbolType.GenericParameter) {
+                    return templateType;
+                }
+            }
+
+            StringBuilder keyBuilder = new StringBuilder(templateType.FullName);
+            foreach (TypeSymbol typeSymbol in typeArguments) {
+                keyBuilder.Append("+");
+                keyBuilder.Append(typeSymbol.FullName);
+            }
+
+            string key = keyBuilder.ToString();
+
+            if ((_genericTypeTable != null) && (_genericTypeTable.ContainsKey(key))) {
+                return _genericTypeTable[key];
+            }
+            else {
+                if (_genericTypeTable == null) {
+                    _genericTypeTable = new Dictionary<string, TypeSymbol>();
+                }
+
+                // Prepopulate with a placeholder ... if a generic type's member refers to its
+                // parent type it will use the type being created when the return value is null.
+                _genericTypeTable[key] = null;
+
+                TypeSymbol instanceTypeSymbol = CreateGenericTypeCore(templateType, typeArguments);
+                _genericTypeTable[key] = instanceTypeSymbol;
+
+                return instanceTypeSymbol;
+            }
+        }
+
+        private TypeSymbol CreateGenericTypeCore(TypeSymbol templateType, IList<TypeSymbol> typeArguments) {
+            if (templateType.Type == SymbolType.Class) {
+                ClassSymbol genericClass = (ClassSymbol)templateType;
+                ClassSymbol instanceClass = new ClassSymbol(genericClass.Name, (NamespaceSymbol)genericClass.Parent);
+                instanceClass.SetInheritance(genericClass.BaseClass, genericClass.Interfaces);
+                instanceClass.SetImported(genericClass.DependencyName);
+                if (genericClass.IgnoreNamespace) {
+                    instanceClass.SetIgnoreNamespace();
+                }
+                instanceClass.ScriptNamespace = genericClass.ScriptNamespace;
+                if (genericClass.IsTransformed) {
+                    instanceClass.SetTransformedName(genericClass.GeneratedName);
+                }
+                else if (genericClass.IsTransformAllowed == false) {
+                    instanceClass.DisableNameTransformation();
+                }
+
+                instanceClass.AddGenericParameters(genericClass.GenericParameters);
+                instanceClass.AddGenericArguments(genericClass, typeArguments);
+
+                CreateGenericTypeMembers(genericClass, instanceClass, typeArguments);
+
+                return instanceClass;
+            }
+            else if (templateType.Type == SymbolType.Interface) {
+                InterfaceSymbol genericInterface = (InterfaceSymbol)templateType;
+                InterfaceSymbol instanceInterface = new InterfaceSymbol(genericInterface.Name, (NamespaceSymbol)genericInterface.Parent);
+
+                instanceInterface.SetImported(genericInterface.DependencyName);
+                if (genericInterface.IgnoreNamespace) {
+                    instanceInterface.SetIgnoreNamespace();
+                }
+                if (genericInterface.IsTransformed) {
+                    instanceInterface.SetTransformedName(genericInterface.GeneratedName);
+                }
+                else if (genericInterface.IsTransformAllowed == false) {
+                    instanceInterface.DisableNameTransformation();
+                }
+
+                instanceInterface.AddGenericParameters(genericInterface.GenericParameters);
+                instanceInterface.AddGenericArguments(genericInterface, typeArguments);
+
+                CreateGenericTypeMembers(genericInterface, instanceInterface, typeArguments);
+
+                return instanceInterface;
+            }
+            else if (templateType.Type == SymbolType.Delegate) {
+                DelegateSymbol genericDelegate = (DelegateSymbol)templateType;
+                DelegateSymbol instanceDelegate = new DelegateSymbol(genericDelegate.Name, (NamespaceSymbol)genericDelegate.Parent);
+
+                instanceDelegate.AddGenericParameters(genericDelegate.GenericParameters);
+                instanceDelegate.AddGenericArguments(genericDelegate, typeArguments);
+
+                CreateGenericTypeMembers(genericDelegate, instanceDelegate, typeArguments);
+
+                return instanceDelegate;
+            }
+
+            return null;
+        }
+
+        private void CreateGenericTypeMembers(TypeSymbol templateType, TypeSymbol instanceType, IList<TypeSymbol> typeArguments) {
+            foreach (MemberSymbol memberSymbol in templateType.Members) {
+                if ((memberSymbol.AssociatedType.Type == SymbolType.GenericParameter) &&
+                    ((GenericParameterSymbol)memberSymbol.AssociatedType).IsTypeParameter) {
+                    MemberSymbol instanceMemberSymbol = CreateGenericMember(memberSymbol, typeArguments);
+                    instanceType.AddMember(instanceMemberSymbol);
+                }
+                else if (memberSymbol.AssociatedType.IsGeneric &&
+                         (memberSymbol.AssociatedType.GenericArguments == null) &&
+                         (memberSymbol.AssociatedType.GenericParameters.Count == typeArguments.Count)) {
+                    TypeSymbol genericType = CreateGenericTypeSymbol(memberSymbol.AssociatedType, typeArguments);
+                    if (genericType == null) {
+                        genericType = instanceType;
+                    }
+                    List<TypeSymbol> memberTypeArgs = new List<TypeSymbol>() { genericType };
+
+                    MemberSymbol instanceMemberSymbol = CreateGenericMember(memberSymbol, memberTypeArgs);
+                    instanceType.AddMember(instanceMemberSymbol);
+                }
+                else {
+                    instanceType.AddMember(memberSymbol);
+                }
+            }
+
+            IndexerSymbol indexer = null;
+
+            if (templateType.Type == SymbolType.Class) {
+                indexer = ((ClassSymbol)templateType).Indexer;
+            }
+            else if (templateType.Type == SymbolType.Interface) {
+                indexer = ((InterfaceSymbol)templateType).Indexer;
+            }
+
+            if (indexer != null) {
+                if (indexer.AssociatedType.Type == SymbolType.GenericParameter) {
+                    MemberSymbol instanceIndexer = CreateGenericMember(indexer, typeArguments);
+                    instanceType.AddMember(instanceIndexer);
+                }
+                else if (indexer.AssociatedType.IsGeneric &&
+                         (indexer.AssociatedType.GenericArguments == null) &&
+                         (indexer.AssociatedType.GenericParameters.Count == typeArguments.Count)) {
+                    TypeSymbol genericType = CreateGenericTypeSymbol(indexer.AssociatedType, typeArguments);
+                    if (genericType == null) {
+                        genericType = instanceType;
+                    }
+                    List<TypeSymbol> memberTypeArgs = new List<TypeSymbol>() { genericType };
+
+                    MemberSymbol instanceMemberSymbol = CreateGenericMember(indexer, memberTypeArgs);
+                    instanceType.AddMember(instanceMemberSymbol);
+                }
+                else {
+                    instanceType.AddMember(indexer);
+                }
+            }
+        }
+
+        private void CreateNamespace(string namespaceName) {
+            if (namespaceName.IndexOf('.') > 0) {
+                NamespaceSymbol namespaceSymbol = new NamespaceSymbol(namespaceName, this);
+
+                _namespaces.Add(namespaceSymbol);
+                _namespaceMap[namespaceName] = namespaceSymbol;
+            }
+            else {
+                // Split up the namespace into its individual parts, and then
+                // create namespace symbols for each sub-namespace leading up
+                // to the full specified namespace
+
+                string[] namespaceParts = namespaceName.Split('.');
+
+                for (int i = 0; i < namespaceParts.Length; i++) {
+                    string partialNamespace;
+                    if (i == 0) {
+                        partialNamespace = namespaceParts[0];
+                    }
+                    else {
+                        partialNamespace = String.Join(".", namespaceParts, 0, i + 1);
+                    }
+
+                    NamespaceSymbol namespaceSymbol = new NamespaceSymbol(partialNamespace, this);
+
+                    _namespaces.Add(namespaceSymbol);
+                    _namespaceMap[namespaceName] = namespaceSymbol;
+                }
+            }
+        }
+
+        public NamespaceSymbol GetNamespace(string namespaceName) {
+            if (_namespaceMap.ContainsKey(namespaceName) == false) {
+                CreateNamespace(namespaceName);
+            }
+
+            return _namespaceMap[namespaceName];
+        }
+
+        public string GetParameterDocumentation(string id, string paramName) {
+            if (_docComments != null) {
+                XmlNode paramNode = _docComments.SelectSingleNode(
+                    String.Format("//doc/members/member[@name='{0}']/param[@name='{1}']", id, paramName));
+
+                if (paramNode != null) {
+                    return paramNode.InnerXml;
+                }
+            }
+
+            return String.Empty;
+        }
+
+        public Dictionary<string, ResXItem> GetResources(string name) {
+            Debug.Assert(String.IsNullOrEmpty(name) == false);
+
+            Dictionary<string, ResXItem> resourceTable;
+            if (_resources.TryGetValue(name, out resourceTable)) {
+                return resourceTable;
+            }
+
+            resourceTable = new Dictionary<string, ResXItem>(StringComparer.Ordinal);
+            _resources[name] = resourceTable;
+
+            return resourceTable;
+        }
+
+        public string GetSummaryDocumentation(string id) {
+            if (_docComments != null) {
+                XmlNode summaryNode = _docComments.SelectSingleNode(
+                    String.Format("//doc/members/member[@name='{0}']/summary", id));
+
+                if (summaryNode != null) {
+                    return summaryNode.InnerXml;
+                }
+            }
+
+            return String.Empty;
+        }
+
+        public bool IsSymbol(TypeSymbol symbol, string symbolName) {
+            return (((ISymbolTable)this).FindSymbol(symbolName, null, SymbolFilter.Types) == symbol);
+        }
+
+        /// <summary>
+        /// This maps C# intrinsic types (managed types that have an equivalent
+        /// C# keyword)
+        /// </summary>
+        public TypeSymbol ResolveIntrinsicType(IntrinsicType type) {
+            string mappedTypeName = null;
+            string mappedNamespace = null;
+
+            switch (type) {
+                case IntrinsicType.Object:
+                    mappedTypeName = "Object";
+                    break;
+                case IntrinsicType.Boolean:
+                    mappedTypeName = "Boolean";
+                    break;
+                case IntrinsicType.String:
+                    mappedTypeName = "String";
+                    break;
+                case IntrinsicType.Integer:
+                    mappedTypeName = "Int32";
+                    break;
+                case IntrinsicType.UnsignedInteger:
+                    mappedTypeName = "UInt32";
+                    break;
+                case IntrinsicType.Long:
+                    mappedTypeName = "Int64";
+                    break;
+                case IntrinsicType.UnsignedLong:
+                    mappedTypeName = "UInt64";
+                    break;
+                case IntrinsicType.Short:
+                    mappedTypeName = "Int16";
+                    break;
+                case IntrinsicType.UnsignedShort:
+                    mappedTypeName = "UInt16";
+                    break;
+                case IntrinsicType.Byte:
+                    mappedTypeName = "Byte";
+                    break;
+                case IntrinsicType.SignedByte:
+                    mappedTypeName = "SByte";
+                    break;
+                case IntrinsicType.Single:
+                    mappedTypeName = "Single";
+                    break;
+                case IntrinsicType.Decimal:
+                    mappedTypeName = "Decimal";
+                    break;
+                case IntrinsicType.Double:
+                    mappedTypeName = "Double";
+                    break;
+                case IntrinsicType.Delegate:
+                    mappedTypeName = "Delegate";
+                    break;
+                case IntrinsicType.Function:
+                    mappedTypeName = "Function";
+                    break;
+                case IntrinsicType.Void:
+                    mappedTypeName = "Void";
+                    break;
+                case IntrinsicType.Array:
+                    mappedTypeName = "Array";
+                    break;
+                case IntrinsicType.Dictionary:
+                    mappedTypeName = "Dictionary";
+                    mappedNamespace = "System.Collections";
+                    break;
+                case IntrinsicType.GenericList:
+                    mappedTypeName = "List`1";
+                    mappedNamespace = "System.Collections.Generic";
+                    break;
+                case IntrinsicType.GenericDictionary:
+                    mappedTypeName = "Dictionary`2";
+                    mappedNamespace = "System.Collections.Generic";
+                    break;
+                case IntrinsicType.Type:
+                    mappedTypeName = "Type";
+                    break;
+                case IntrinsicType.IEnumerator:
+                    mappedTypeName = "IEnumerator";
+                    mappedNamespace = "System.Collections";
+                    break;
+                case IntrinsicType.Enum:
+                    mappedTypeName = "Enum";
+                    break;
+                case IntrinsicType.Exception:
+                    mappedTypeName = "Exception";
+                    break;
+                case IntrinsicType.Script:
+                    mappedTypeName = "Script";
+                    break;
+                case IntrinsicType.Number:
+                    mappedTypeName = "Number";
+                    break;
+                case IntrinsicType.Arguments:
+                    mappedTypeName = "Arguments";
+                    break;
+                case IntrinsicType.Nullable:
+                    mappedTypeName = "Nullable`1";
+                    break;
+                default:
+                    Debug.Fail("Unmapped intrinsic type " + type);
+                    break;
+            }
+
+            NamespaceSymbol ns = _systemNamespace;
+            if (mappedNamespace != null) {
+                ns = GetNamespace(mappedNamespace);
+                Debug.Assert(ns != null);
+            }
+
+            if (mappedTypeName != null) {
+                TypeSymbol typeSymbol = (TypeSymbol)((ISymbolTable)ns).FindSymbol(mappedTypeName, null, SymbolFilter.Types);
+                Debug.Assert(typeSymbol != null);
+
+                return typeSymbol;
+            }
+
+            return null;
+        }
+
+        public TypeSymbol ResolveType(ParseNode node, ISymbolTable symbolTable, Symbol contextSymbol) {
+            if (node is IntrinsicTypeNode) {
+                IntrinsicType intrinsicType = IntrinsicType.Integer;
+
+                IntrinsicTypeNode intrinsicTypeNode = (IntrinsicTypeNode)node;
+                switch (intrinsicTypeNode.Type) {
+                    case TokenType.Object:
+                        intrinsicType = IntrinsicType.Object;
+                        break;
+                    case TokenType.Bool:
+                        intrinsicType = IntrinsicType.Boolean;
+                        break;
+                    case TokenType.String:
+                    case TokenType.Char:
+                        intrinsicType = IntrinsicType.String;
+                        break;
+                    case TokenType.Int:
+                        intrinsicType = IntrinsicType.Integer;
+                        break;
+                    case TokenType.UInt:
+                        intrinsicType = IntrinsicType.UnsignedInteger;
+                        break;
+                    case TokenType.Long:
+                        intrinsicType = IntrinsicType.Long;
+                        break;
+                    case TokenType.ULong:
+                        intrinsicType = IntrinsicType.UnsignedLong;
+                        break;
+                    case TokenType.Short:
+                        intrinsicType = IntrinsicType.Short;
+                        break;
+                    case TokenType.UShort:
+                        intrinsicType = IntrinsicType.UnsignedShort;
+                        break;
+                    case TokenType.Byte:
+                        intrinsicType = IntrinsicType.Byte;
+                        break;
+                    case TokenType.SByte:
+                        intrinsicType = IntrinsicType.SignedByte;
+                        break;
+                    case TokenType.Float:
+                        intrinsicType = IntrinsicType.Single;
+                        break;
+                    case TokenType.Decimal:
+                        intrinsicType = IntrinsicType.Decimal;
+                        break;
+                    case TokenType.Double:
+                        intrinsicType = IntrinsicType.Double;
+                        break;
+                    case TokenType.Delegate:
+                        intrinsicType = IntrinsicType.Delegate;
+                        break;
+                    case TokenType.Void:
+                        intrinsicType = IntrinsicType.Void;
+                        break;
+                }
+
+                TypeSymbol typeSymbol = ResolveIntrinsicType(intrinsicType);
+
+                if (intrinsicTypeNode.IsNullable) {
+                    TypeSymbol nullableType = ResolveIntrinsicType(IntrinsicType.Nullable);
+                    typeSymbol = CreateGenericTypeSymbol(nullableType, new List<TypeSymbol>() { typeSymbol });
+                }
+
+                return typeSymbol;
+            }
+            else if (node is ArrayTypeNode) {
+                ArrayTypeNode arrayTypeNode = (ArrayTypeNode)node;
+
+                TypeSymbol itemTypeSymbol = ResolveType(arrayTypeNode.BaseType, symbolTable, contextSymbol);
+                Debug.Assert(itemTypeSymbol != null);
+
+                return CreateArrayTypeSymbol(itemTypeSymbol);
+            }
+            else if (node is GenericNameNode) {
+                GenericNameNode genericNameNode = (GenericNameNode)node;
+                string genericTypeName = genericNameNode.Name + "`" + genericNameNode.TypeArguments.Count;
+                TypeSymbol templateType = (TypeSymbol)symbolTable.FindSymbol(genericTypeName, contextSymbol, SymbolFilter.Types);
+
+                List<TypeSymbol> typeArguments = new List<TypeSymbol>();
+                foreach (ParseNode argNode in genericNameNode.TypeArguments) {
+                    TypeSymbol argType = ResolveType(argNode, symbolTable, contextSymbol);
+                    typeArguments.Add(argType);
+                }
+
+                TypeSymbol resolvedSymbol = CreateGenericTypeSymbol(templateType, typeArguments);
+                Debug.Assert(resolvedSymbol != null);
+
+                return resolvedSymbol;
+            }
+            else {
+                Debug.Assert(node is NameNode);
+                NameNode nameNode = (NameNode)node;
+
+                return (TypeSymbol)symbolTable.FindSymbol(nameNode.Name, contextSymbol, SymbolFilter.Types);
+            }
+        }
+
+        public void SetComments(XmlDocument docComments) {
+            Debug.Assert(_docComments == null);
+            Debug.Assert(docComments != null);
+
+            _docComments = docComments;
+        }
+
+        public void SetEntryPoint(MemberSymbol entryPoint) {
+            Debug.Assert(_entryPoint == null);
+            Debug.Assert(entryPoint != null);
+
+            _entryPoint = entryPoint;
+        }
+
+        #region ISymbolTable Members
+        ICollection ISymbolTable.Symbols {
+            get {
+                return _namespaces;
+            }
+        }
+
+        Symbol ISymbolTable.FindSymbol(string name, Symbol context, SymbolFilter filter) {
+            if ((filter & SymbolFilter.Types) == 0) {
+                return null;
+            }
+
+            Symbol symbol = null;
+
+            if (name.IndexOf('.') > 0) {
+                int nameIndex = name.LastIndexOf('.') + 1;
+                Debug.Assert(nameIndex < name.Length);
+
+                string namespaceName = name.Substring(0, nameIndex - 1);
+                name = name.Substring(nameIndex);
+
+                NamespaceSymbol namespaceSymbol;
+                if (_namespaceMap.TryGetValue(namespaceName, out namespaceSymbol)) {
+                    symbol = ((ISymbolTable)namespaceSymbol).FindSymbol(name, /* context */ null, SymbolFilter.Types);
+                }
+            }
+            else {
+                Debug.Assert(context != null);
+
+                TypeSymbol typeSymbol = context as TypeSymbol;
+                if (typeSymbol == null) {
+                    Symbol parentSymbol = context.Parent;
+                    while (parentSymbol != null) {
+                        typeSymbol = parentSymbol as TypeSymbol;
+                        if (typeSymbol != null) {
+                            break;
+                        }
+
+                        parentSymbol = parentSymbol.Parent;
+                    }
+                }
+
+                Debug.Assert(typeSymbol != null);
+                if (typeSymbol == null) {
+                    return null;
+                }
+
+                bool systemNamespaceChecked = false;
+
+                NamespaceSymbol containerNamespace = (NamespaceSymbol)typeSymbol.Parent;
+                Debug.Assert(containerNamespace != null);
+
+                symbol = ((ISymbolTable)containerNamespace).FindSymbol(name, /* context */ null, SymbolFilter.Types);
+                if (containerNamespace == _systemNamespace) {
+                    systemNamespaceChecked = true;
+                }
+                if (symbol == null) {
+                    if ((typeSymbol.Aliases != null) && typeSymbol.Aliases.ContainsKey(name)) {
+                        string typeReference = typeSymbol.Aliases[name];
+                        symbol = ((ISymbolTable)this).FindSymbol(typeReference, /* context */ null, SymbolFilter.Types);
+                    }
+                    else if (typeSymbol.Imports != null) {
+                        foreach (string importedNamespaceReference in typeSymbol.Imports) {
+                            if (_namespaceMap.ContainsKey(importedNamespaceReference) == false) {
+                                // Since we included all parent namespaces of the current type's
+                                // namespace, we might run into a namespace that doesn't contain
+                                // any defined types, i.e. doesn't exist.
+
+                                continue;
+                            }
+
+                            NamespaceSymbol importedNamespace = _namespaceMap[importedNamespaceReference];
+                            if (importedNamespace == containerNamespace) {
+                                continue;
+                            }
+
+                            symbol = ((ISymbolTable)importedNamespace).FindSymbol(name, /* context */ null, SymbolFilter.Types);
+                            if (importedNamespace == _systemNamespace) {
+                                systemNamespaceChecked = true;
+                            }
+                            if (symbol != null) {
+                                break;
+                            }
+                        }
+                    }
+                }
+                if ((symbol == null) && (systemNamespaceChecked == false)) {
+                    symbol = ((ISymbolTable)_systemNamespace).FindSymbol(name, /* context */ null, SymbolFilter.Types);
+                }
+                if (symbol == null) {
+                    symbol = ((ISymbolTable)_globalNamespace).FindSymbol(name, /* context */ null, SymbolFilter.Types);
+                }
+            }
+
+            return symbol;
+        }
+        #endregion
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/SymbolSetDumper.cs b/src/Core/Compiler/ScriptModel/Symbols/SymbolSetDumper.cs
new file mode 100644
index 000000000..89f82b73a
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/SymbolSetDumper.cs
@@ -0,0 +1,288 @@
+// SymbolSetDumper.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.CodeDom.Compiler;
+using System.Diagnostics;
+using System.IO;
+
+namespace ScriptSharp.ScriptModel {
+
+#if DEBUG
+
+    internal sealed class SymbolSetDumper {
+
+        private IndentedTextWriter _writer;
+
+        public SymbolSetDumper(TextWriter writer) {
+            Debug.Assert(writer != null);
+            _writer = new IndentedTextWriter(writer, "    ");
+        }
+
+        private void DumpClass(ClassSymbol classSymbol) {
+            _writer.Write("Global Methods: ");
+            _writer.WriteLine(classSymbol.HasGlobalMethods);
+
+            if (classSymbol.BaseClass != null) {
+                _writer.Write("BaseClass: ");
+                _writer.WriteLine(classSymbol.BaseClass.FullName);
+            }
+            if (classSymbol.Interfaces != null) {
+                _writer.WriteLine("Interfaces:");
+                _writer.Indent++;
+                foreach (InterfaceSymbol interfaceSymbol in classSymbol.Interfaces) {
+                    _writer.WriteLine(interfaceSymbol.FullName);
+                }
+                _writer.Indent--;
+            }
+            if (classSymbol.Constructor != null) {
+                _writer.WriteLine("Constructor:");
+                _writer.Indent++;
+                DumpSymbol(classSymbol.Constructor);
+                _writer.Indent--;
+            }
+            if (classSymbol.StaticConstructor != null) {
+                _writer.WriteLine("StaticConstructor:");
+                _writer.Indent++;
+                DumpSymbol(classSymbol.StaticConstructor);
+                _writer.Indent--;
+            }
+            if (classSymbol.Indexer != null) {
+                _writer.WriteLine("Indexer:");
+                _writer.Indent++;
+                DumpSymbol(classSymbol.Indexer);
+                _writer.Indent--;
+            }
+        }
+
+        private void DumpConstructor(ConstructorSymbol ctorSymbol) {
+            if (ctorSymbol.Parameters != null) {
+                _writer.Write("Parameters:");
+                _writer.Indent++;
+                foreach (ParameterSymbol paramSymbol in ctorSymbol.Parameters) {
+                    DumpSymbol(paramSymbol);
+                }
+                _writer.Indent--;
+            }
+        }
+
+        private void DumpDelegate(DelegateSymbol delegateSymbol) {
+        }
+
+        private void DumpEnumeration(EnumerationSymbol enumSymbol) {
+            _writer.Write("Flags: ");
+            _writer.WriteLine(enumSymbol.Flags);
+        }
+
+        private void DumpEnumerationField(EnumerationFieldSymbol enumFieldSymbol) {
+        }
+
+        private void DumpEvent(EventSymbol eventSymbol) {
+        }
+
+        private void DumpField(FieldSymbol fieldSymbol) {
+        }
+
+        private void DumpIndexer(IndexerSymbol indexerSymbol) {
+            _writer.Write("ReadOnly: ");
+            _writer.WriteLine(indexerSymbol.IsReadOnly);
+            _writer.Write("Abstract: ");
+            _writer.WriteLine(indexerSymbol.IsAbstract);
+        }
+
+        private void DumpInterface(InterfaceSymbol interfaceSymbol) {
+        }
+
+        private void DumpMember(MemberSymbol memberSymbol) {
+            _writer.Indent++;
+
+            _writer.Write("AssociatedType: ");
+            _writer.WriteLine(memberSymbol.AssociatedType.FullName);
+            _writer.Write("Visibility: ");
+            _writer.WriteLine(memberSymbol.Visibility.ToString());
+            _writer.Write("Generated Name: ");
+            _writer.WriteLine(memberSymbol.GeneratedName);
+            if (memberSymbol.InterfaceMember != null) {
+                _writer.Write("Associated Interface Member: ");
+                _writer.Write(memberSymbol.InterfaceMember.Parent.Name);
+                _writer.Write(".");
+                _writer.WriteLine(memberSymbol.InterfaceMember.Name);
+            }
+
+            switch (memberSymbol.Type) {
+                case SymbolType.Field:
+                    DumpField((FieldSymbol)memberSymbol);
+                    break;
+                case SymbolType.EnumerationField:
+                    DumpEnumerationField((EnumerationFieldSymbol)memberSymbol);
+                    break;
+                case SymbolType.Constructor:
+                    DumpConstructor((ConstructorSymbol)memberSymbol);
+                    break;
+                case SymbolType.Property:
+                    DumpProperty((PropertySymbol)memberSymbol);
+                    break;
+                case SymbolType.Indexer:
+                    DumpIndexer((IndexerSymbol)memberSymbol);
+                    break;
+                case SymbolType.Event:
+                    DumpEvent((EventSymbol)memberSymbol);
+                    break;
+                case SymbolType.Method:
+                    DumpMethod((MethodSymbol)memberSymbol);
+                    break;
+            }
+
+            _writer.Indent--;
+        }
+
+        private void DumpMethod(MethodSymbol methodSymbol) {
+            _writer.Write("Abstract: ");
+            _writer.WriteLine(methodSymbol.IsAbstract);
+
+            if (methodSymbol.Conditions != null) {
+                _writer.WriteLine("Conditions:");
+                _writer.Indent++;
+                foreach (string condition in methodSymbol.Conditions) {
+                    _writer.WriteLine(condition);
+                }
+                _writer.Indent--;
+            }
+
+            if (methodSymbol.Parameters != null) {
+                _writer.WriteLine("Parameters:");
+                _writer.Indent++;
+                foreach (ParameterSymbol paramSymbol in methodSymbol.Parameters) {
+                    DumpSymbol(paramSymbol);
+                }
+                _writer.Indent--;
+            }
+        }
+
+        private void DumpNamespace(NamespaceSymbol namespaceSymbol) {
+            _writer.Write("HasApplicationTypes: ");
+            _writer.WriteLine(namespaceSymbol.HasApplicationTypes);
+            _writer.WriteLine("Types:");
+            _writer.Indent++;
+
+            ArrayList types = new ArrayList(namespaceSymbol.Types.Count);
+            foreach (TypeSymbol type in namespaceSymbol.Types) {
+                types.Add(type);
+            }
+            types.Sort(new SymbolComparer());
+
+            foreach (TypeSymbol type in types) {
+                DumpSymbol(type);
+            }
+            _writer.Indent--;
+        }
+
+        private void DumpParameter(ParameterSymbol parameterSymbol) {
+            _writer.Write("AssociatedType: ");
+            _writer.WriteLine(parameterSymbol.ValueType.FullName);
+            _writer.Write("Mode: ");
+            _writer.WriteLine(parameterSymbol.Mode.ToString());
+        }
+
+        private void DumpProperty(PropertySymbol propertySymbol) {
+            _writer.Write("ReadOnly: ");
+            _writer.WriteLine(propertySymbol.IsReadOnly);
+            _writer.Write("Abstract: ");
+            _writer.WriteLine(propertySymbol.IsAbstract);
+        }
+
+        private void DumpSymbol(Symbol symbol) {
+            _writer.Write(symbol.Type.ToString());
+            _writer.Write(": ");
+            _writer.WriteLine(symbol.Name);
+
+            switch (symbol.Type) {
+                case SymbolType.Namespace:
+                    DumpNamespace((NamespaceSymbol)symbol);
+                    break;
+                case SymbolType.Class:
+                case SymbolType.Interface:
+                case SymbolType.Enumeration:
+                case SymbolType.Delegate:
+                case SymbolType.Record:
+                    DumpType((TypeSymbol)symbol);
+                    break;
+                case SymbolType.Field:
+                case SymbolType.EnumerationField:
+                case SymbolType.Constructor:
+                case SymbolType.Property:
+                case SymbolType.Indexer:
+                case SymbolType.Event:
+                case SymbolType.Method:
+                    DumpMember((MemberSymbol)symbol);
+                    break;
+                case SymbolType.Parameter:
+                    DumpParameter((ParameterSymbol)symbol);
+                    break;
+            }
+        }
+
+        public void DumpSymbols(SymbolSet symbols) {
+            ArrayList namespaces = new ArrayList(symbols.Namespaces.Count);
+            foreach (NamespaceSymbol ns in symbols.Namespaces) {
+                namespaces.Add(ns);
+            }
+            namespaces.Sort(new SymbolComparer());
+
+            foreach (NamespaceSymbol ns in namespaces) {
+                DumpSymbol(ns);
+                _writer.WriteLine();
+            }
+        }
+
+        private void DumpType(TypeSymbol typeSymbol) {
+            _writer.Indent++;
+
+            _writer.Write("Application Type: ");
+            _writer.WriteLine(typeSymbol.IsApplicationType);
+            _writer.Write("Public: ");
+            _writer.WriteLine(typeSymbol.IsPublic);
+            _writer.Write("Generated Name: ");
+            _writer.WriteLine(typeSymbol.GeneratedName);
+
+            switch (typeSymbol.Type) {
+                case SymbolType.Class:
+                case SymbolType.Record:
+                    DumpClass((ClassSymbol)typeSymbol);
+                    break;
+                case SymbolType.Interface:
+                    DumpInterface((InterfaceSymbol)typeSymbol);
+                    break;
+                case SymbolType.Enumeration:
+                    DumpEnumeration((EnumerationSymbol)typeSymbol);
+                    break;
+                case SymbolType.Delegate:
+                    DumpDelegate((DelegateSymbol)typeSymbol);
+                    break;
+            }
+
+            _writer.WriteLine("Members:");
+            _writer.Indent++;
+            foreach (MemberSymbol member in typeSymbol.Members) {
+                DumpSymbol(member);
+            }
+            _writer.Indent--;
+            _writer.WriteLine();
+
+            _writer.Indent--;
+        }
+
+
+        private sealed class SymbolComparer : IComparer {
+
+            public int Compare(object x, object y) {
+                return String.Compare(((Symbol)x).Name, ((Symbol)y).Name);
+            }
+        }
+    }
+
+#endif // DEBUG
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/SymbolSetTransformer.cs b/src/Core/Compiler/ScriptModel/Symbols/SymbolSetTransformer.cs
new file mode 100644
index 000000000..cbac2de0b
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/SymbolSetTransformer.cs
@@ -0,0 +1,98 @@
+// SymbolSetTransformer.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal sealed class SymbolSetTransformer {
+
+        private ISymbolTransformer _transformer;
+        private bool _excludeImportedTypes;
+
+        public SymbolSetTransformer(ISymbolTransformer transformer)
+            : this(transformer, /* excludeImportedTypes */ true) {
+        }
+
+        public SymbolSetTransformer(ISymbolTransformer transformer, bool excludeImportedTypes) {
+            _transformer = transformer;
+            _excludeImportedTypes = excludeImportedTypes;
+        }
+
+        public ICollection<Symbol> TransformSymbolSet(SymbolSet symbols, bool useInheritanceOrder) {
+            List<TypeSymbol> symbolsToTransform = new List<TypeSymbol>();
+
+            foreach (NamespaceSymbol ns in symbols.Namespaces) {
+                if (_excludeImportedTypes && (ns.HasApplicationTypes == false)) {
+                    continue;
+                }
+
+                foreach (TypeSymbol type in ns.Types) {
+                    if (_excludeImportedTypes && (type.IsApplicationType == false)) {
+                        continue;
+                    }
+
+                    symbolsToTransform.Add(type);
+                }
+            }
+
+            if (useInheritanceOrder) {
+                symbolsToTransform.Sort(new TypeInheritanceComparer());
+            }
+
+            List<Symbol> transformedSymbols = new List<Symbol>();
+            foreach (TypeSymbol type in symbolsToTransform) {
+                bool transformMembers;
+                string transformedName = _transformer.TransformSymbol(type, out transformMembers);
+                if (transformedName != null) {
+                    type.SetTransformedName(transformedName);
+                    transformedSymbols.Add(type);
+                }
+
+                if (transformMembers) {
+                    bool dummy;
+                    foreach (MemberSymbol member in type.Members) {
+                        transformedName = _transformer.TransformSymbol(member, out dummy);
+                        if (transformedName != null) {
+                            member.SetTransformedName(transformedName);
+                            transformedSymbols.Add(member);
+                        }
+                    }
+                }
+            }
+
+            return transformedSymbols;
+        }
+
+
+        private sealed class TypeInheritanceComparer : IComparer<TypeSymbol> {
+
+            public int Compare(TypeSymbol x, TypeSymbol y) {
+                ClassSymbol class1 = x as ClassSymbol;
+                ClassSymbol class2 = y as ClassSymbol;
+
+                if ((class1 == null) && (class2 == null)) {
+                    return 0;
+                }
+
+                if (class1 == null) {
+                    return -1;
+                }
+
+                if (class2 == null) {
+                    return 1;
+                }
+
+                int depth1 = class1.InheritanceDepth;
+                int depth2 = class2.InheritanceDepth;
+
+                return depth1 - depth2;
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/SymbolType.cs b/src/Core/Compiler/ScriptModel/Symbols/SymbolType.cs
new file mode 100644
index 000000000..a91aa5744
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/SymbolType.cs
@@ -0,0 +1,48 @@
+// SymbolType.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.ScriptModel {
+
+    internal enum SymbolType {
+
+        Namespace = 0,
+
+        Class = 1,
+
+        Interface = 2,
+
+        Enumeration = 3,
+
+        Delegate = 4,
+
+        Record = 5,
+
+        Resources = 6,
+
+        Field = 7,
+
+        EnumerationField = 8,
+
+        Constructor = 9,
+
+        Property = 10,
+
+        Indexer = 11,
+
+        Event = 12,
+
+        Method = 13,
+
+        AnonymousMethod = 14,
+
+        Variable = 15,
+
+        Parameter = 16,
+
+        GenericParameter = 17
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/TypeSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/TypeSymbol.cs
new file mode 100644
index 000000000..8860de4a8
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/TypeSymbol.cs
@@ -0,0 +1,339 @@
+// TypeSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using System.Text;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal abstract class TypeSymbol : Symbol, ISymbolTable {
+
+        private ICollection<string> _imports;
+        private IDictionary<string, string> _aliases;
+        private string _dependencyName;
+        private bool _applicationType;
+        private bool _isPublic;
+        private bool _isArray;
+        private ICollection<GenericParameterSymbol> _genericParameters;
+        private ICollection<TypeSymbol> _genericArguments;
+        private TypeSymbol _genericType;
+
+        private ISymbolTable _parentSymbolTable;
+        private Dictionary<string, MemberSymbol> _memberTable;
+        private List<MemberSymbol> _members;
+
+        private object _metadataReference;
+        private bool _coreType;
+        private bool _ignoreNamespace;
+        private string _scriptNamespace;
+        private bool _testType;
+
+        protected TypeSymbol(SymbolType type, string name, NamespaceSymbol parent)
+            : base(type, name, parent) {
+            Debug.Assert(parent != null);
+
+            _memberTable = new Dictionary<string, MemberSymbol>();
+            _members = new List<MemberSymbol>();
+            _applicationType = true;
+        }
+
+        public IDictionary<string, string> Aliases {
+            get {
+                return _aliases;
+            }
+        }
+
+        public string DependencyName {
+            get {
+                return _dependencyName;
+            }
+        }
+
+        public override string DocumentationID {
+            get {
+                StringBuilder sb = new StringBuilder();
+                sb.Append("T:");
+                sb.Append(Namespace);
+                sb.Append(".");
+                sb.Append(Name);
+
+                return sb.ToString();
+            }
+        }
+
+        public string FullGeneratedName {
+            get {
+                if (_ignoreNamespace == false) {
+                    string namespaceName = GeneratedNamespace;
+                    if (namespaceName.Length != 0) {
+                        return namespaceName + "." + GeneratedName;
+                    }
+                }
+                return GeneratedName;
+            }
+        }
+
+        public string FullName {
+            get {
+                if (_ignoreNamespace == false) {
+                    string namespaceName = Namespace;
+                    if (namespaceName.Length != 0) {
+                        return namespaceName + "." + Name;
+                    }
+                }
+                return Name;
+            }
+        }
+
+        public string GeneratedNamespace {
+            get {
+                return _scriptNamespace != null ? _scriptNamespace : Namespace;
+            }
+        }
+
+        public ICollection<TypeSymbol> GenericArguments {
+            get {
+                return _genericArguments;
+            }
+        }
+
+        public ICollection<GenericParameterSymbol> GenericParameters {
+            get {
+                return _genericParameters;
+            }
+        }
+
+        public TypeSymbol GenericType {
+            get {
+                return _genericType;
+            }
+        }
+
+        public bool IgnoreNamespace {
+            get {
+                return _ignoreNamespace;
+            }
+        }
+
+        public ICollection<string> Imports {
+            get {
+                return _imports;
+            }
+        }
+
+        public bool IsArray {
+            get {
+                return _isArray;
+            }
+        }
+
+        public bool IsApplicationType {
+            get {
+                return _applicationType;
+            }
+        }
+
+        public bool IsCoreType {
+            get {
+                return _coreType;
+            }
+        }
+
+        public bool IsGeneric {
+            get {
+                return (_genericParameters != null) &&
+                       (_genericParameters.Count != 0);
+            }
+        }
+
+        public bool IsPublic {
+            get {
+                return _isPublic;
+            }
+        }
+
+        public bool IsTestType {
+            get {
+                return _testType;
+            }
+        }
+
+        public ICollection<MemberSymbol> Members {
+            get {
+                return _members;
+            }
+        }
+
+        public object MetadataReference {
+            get {
+                Debug.Assert(_metadataReference != null);
+                return _metadataReference;
+            }
+        }
+
+        public string Namespace {
+            get {
+                Debug.Assert(Parent is NamespaceSymbol);
+                return ((NamespaceSymbol)Parent).Name;
+            }
+        }
+
+        public string ScriptNamespace {
+            get {
+                return _scriptNamespace;
+            }
+            set {
+                _scriptNamespace = value;
+            }
+        }
+
+        public virtual void AddMember(MemberSymbol memberSymbol) {
+            Debug.Assert(memberSymbol != null);
+            Debug.Assert(String.IsNullOrEmpty(memberSymbol.Name) == false);
+            Debug.Assert(_memberTable.ContainsKey(memberSymbol.Name) == false);
+
+            _members.Add(memberSymbol);
+            _memberTable[memberSymbol.Name] = memberSymbol;
+        }
+
+        public void AddGenericArguments(TypeSymbol genericType, ICollection<TypeSymbol> genericArguments) {
+            Debug.Assert(genericType != null);
+            Debug.Assert(_genericType == null);
+
+            Debug.Assert(_genericParameters != null);
+
+            Debug.Assert(_genericArguments == null);
+            Debug.Assert(genericArguments != null);
+            Debug.Assert(genericArguments.Count == _genericParameters.Count);
+
+            _genericType = genericType;
+            _genericArguments = genericArguments;
+        }
+
+        public void AddGenericParameters(ICollection<GenericParameterSymbol> genericParameters) {
+            Debug.Assert(_genericParameters == null);
+            Debug.Assert(genericParameters != null);
+            Debug.Assert(genericParameters.Count != 0);
+
+            _genericParameters = genericParameters;
+        }
+
+        public virtual TypeSymbol GetBaseType() {
+            return null;
+        }
+
+        public virtual MemberSymbol GetMember(string name) {
+            if (_memberTable.ContainsKey(name)) {
+                return _memberTable[name];
+            }
+            return null;
+        }
+
+        public void SetMetadataToken(object metadataReference, bool coreType) {
+            Debug.Assert(metadataReference != null);
+            Debug.Assert(_metadataReference == null);
+
+            _metadataReference = metadataReference;
+            _coreType = coreType;
+        }
+
+        public void SetAliases(IDictionary<string, string> aliases) {
+            Debug.Assert(_aliases == null);
+            Debug.Assert(aliases != null);
+            _aliases = aliases;
+        }
+
+        public void SetIgnoreNamespace() {
+            _ignoreNamespace = true;
+        }
+
+        public void SetImported(string dependencyName) {
+            Debug.Assert(_applicationType == true);
+
+            _applicationType = false;
+            _dependencyName = dependencyName;
+        }
+
+        public void SetArray() {
+            _isArray = true;
+        }
+
+        public void SetImports(ICollection<string> imports) {
+            Debug.Assert(_imports == null);
+            Debug.Assert(imports != null);
+            _imports = imports;
+        }
+
+        public void SetPublic() {
+            _isPublic = true;
+        }
+
+        public override bool MatchFilter(SymbolFilter filter) {
+            if ((filter & SymbolFilter.Types) == 0) {
+                return false;
+            }
+            return true;
+        }
+
+        public void SetParentSymbolTable(ISymbolTable symbolTable) {
+            Debug.Assert(_parentSymbolTable == null);
+            Debug.Assert(symbolTable != null);
+
+            _parentSymbolTable = symbolTable;
+        }
+
+        public void SetTestType() {
+            _testType = true;
+        }
+
+        #region ISymbolTable Members
+        ICollection ISymbolTable.Symbols {
+            get {
+                return _members;
+            }
+        }
+
+        Symbol ISymbolTable.FindSymbol(string name, Symbol context, SymbolFilter filter) {
+            Debug.Assert(String.IsNullOrEmpty(name) == false);
+            Debug.Assert(context != null);
+
+            Symbol symbol = null;
+
+            if ((filter & SymbolFilter.Members) != 0) {
+                SymbolFilter baseFilter = filter | SymbolFilter.ExcludeParent;
+
+                symbol = GetMember(name);
+
+                if (symbol == null) {
+                    TypeSymbol baseType = GetBaseType();
+                    TypeSymbol objectType = (TypeSymbol)((ISymbolTable)this.SymbolSet.SystemNamespace).FindSymbol("Object", null, SymbolFilter.Types);
+                    if ((baseType == null) && (this != objectType)) {
+                        baseType = objectType;
+                    }
+
+                    if (baseType != null) {
+                        symbol = ((ISymbolTable)baseType).FindSymbol(name, context, baseFilter);
+                    }
+                }
+
+                if ((symbol != null) && (symbol.MatchFilter(filter) == false)) {
+                    symbol = null;
+                }
+            }
+
+            if ((symbol == null) && (_parentSymbolTable != null) &&
+                ((filter & SymbolFilter.ExcludeParent) == 0)) {
+                symbol = _parentSymbolTable.FindSymbol(name, context, filter);
+            }
+
+            return symbol;
+        }
+        #endregion
+    }
+}
diff --git a/src/Core/Compiler/ScriptModel/Symbols/VariableSymbol.cs b/src/Core/Compiler/ScriptModel/Symbols/VariableSymbol.cs
new file mode 100644
index 000000000..a629c8763
--- /dev/null
+++ b/src/Core/Compiler/ScriptModel/Symbols/VariableSymbol.cs
@@ -0,0 +1,29 @@
+// LocalSymbol.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp.ScriptModel {
+    
+    internal sealed class VariableSymbol : LocalSymbol {
+
+        private Expression _value;
+
+        public VariableSymbol(string name, MemberSymbol parent, TypeSymbol valueType)
+            : base(SymbolType.Variable, name, parent, valueType) {
+        }
+
+        public Expression Value {
+            get {
+                return _value;
+            }
+        }
+
+        public void SetValue(Expression value) {
+            _value = value;
+        }
+    }
+}
diff --git a/src/Core/Compiler/ScriptPreprocessor.cs b/src/Core/Compiler/ScriptPreprocessor.cs
new file mode 100644
index 000000000..294daaca1
--- /dev/null
+++ b/src/Core/Compiler/ScriptPreprocessor.cs
@@ -0,0 +1,85 @@
+// ScriptSharpPreprocessor.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+using ScriptSharp.Preprocessor;
+
+namespace ScriptSharp {
+
+    public sealed class ScriptPreprocessor {
+
+        private IScriptInfo _scriptInfo;
+        private IStreamResolver _includeResolver;
+        private IErrorHandler _errorHandler;
+
+        public ScriptPreprocessor()
+            : this(null, null, null) {
+        }
+
+        public ScriptPreprocessor(IStreamResolver includeResolver, IErrorHandler errorHandler)
+            : this(includeResolver, errorHandler, null) {
+        }
+
+        internal ScriptPreprocessor(IStreamResolver includeResolver, IErrorHandler errorHandler, IScriptInfo scriptInfo) {
+            _scriptInfo = scriptInfo;
+            _includeResolver = includeResolver;
+            _errorHandler = errorHandler;
+        }
+
+        public void Preprocess(PreprocessorOptions options) {
+            Stream outputStream = options.TargetFile.GetStream();
+            StreamWriter outputWriter = null;
+
+            PreprocessorTextReader preprocessor = null;
+            try {
+                if (outputStream != null) {
+                    outputWriter = new StreamWriter(outputStream);
+                    preprocessor = new PreprocessorTextReader(options.SourceFile,
+                                                              options.PreprocessorVariables,
+                                                              _includeResolver,
+                                                              _scriptInfo);
+
+                    TextReader contentReader = preprocessor;
+                    if (options.Minimize) {
+                        contentReader = new CondenserTextReader(preprocessor, options.StripCommentsOnly);
+                    }
+
+                    if (preprocessor.Initialize(outputWriter)) {
+                        int ch;
+                        while ((ch = contentReader.Read()) != -1) {
+                            if (options.UseWindowsLineBreaks && (ch == '\n')) {
+                                outputWriter.Write('\r');
+                            }
+                            outputWriter.Write((char)ch);
+                        }
+                    }
+                }
+            }
+            catch (PreprocessorException pe) {
+                if (_errorHandler != null) {
+                    _errorHandler.ReportError(pe.Message, pe.SourceFile + " (" + pe.Line + ", 1)");
+                }
+
+                if (pe.InnerException != null) {
+                    throw pe.InnerException;
+                }
+            }
+            finally {
+                if (preprocessor != null) {
+                    preprocessor.Close();
+                }
+                if (outputWriter != null) {
+                    outputWriter.Flush();
+                }
+                if (outputStream != null) {
+                    options.TargetFile.CloseStream(outputStream);
+                }
+            }
+        }
+    }
+}
diff --git a/src/Core/Compiler/Utility.cs b/src/Core/Compiler/Utility.cs
new file mode 100644
index 000000000..89f04f4c0
--- /dev/null
+++ b/src/Core/Compiler/Utility.cs
@@ -0,0 +1,262 @@
+// Utility.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+namespace ScriptSharp {
+
+    internal static class Utility {
+
+        private static readonly string[] ScriptKeywords =
+            new string[] {
+                // Current keywords
+                "break", "delete", "function", "return", "typeof", "case", "do",
+                "if", "switch", "var", "catch", "else", "in", "this",
+                "void", "continue", "false", "instanceof", "throw", "while",
+                "debugger", "finally", "new", "true", "with", "default",
+                "for", "null", "try",
+                // Future reserved words
+                "abstract", "double", "goto", "native", "static", "boolean",
+                "enum", "implements", "package", "super", "byte", "export",
+                "import", "private", "synchronized", "char", "extends", "int",
+                "protected", "throws", "class", "final", "interface", "public",
+                "transient", "const", "float", "long", "short", "volatile",
+                // Script#-specific words
+                "ss"
+            };
+        private static Hashtable _keywordTable;
+
+        public static string CreateCamelCaseName(string name) {
+            if (String.IsNullOrEmpty(name)) {
+                return name;
+            }
+
+            // Some exceptions that simply need to be special cased
+            if (name.Equals("ID", StringComparison.Ordinal)) {
+                return "id";
+            }
+
+            bool hasLowerCase = false;
+            int conversionLength = 0;
+
+            for (int i = 0; i < name.Length; i++) {
+                if (Char.IsUpper(name, i)) {
+                    conversionLength++;
+                }
+                else {
+                    hasLowerCase = true;
+                    break;
+                }
+            }
+
+            if (((hasLowerCase == false) && (name.Length != 1)) || (conversionLength == 0)) {
+                // Name is all upper case, or all lower case;
+                // leave it as-is.
+                return name;
+            }
+
+            if (conversionLength > 1) {
+                // Convert the leading uppercase segment, except the last character
+                // which is assumed to be the first letter of the next word
+                return name.Substring(0, conversionLength - 1).ToLower(CultureInfo.InvariantCulture) +
+                       name.Substring(conversionLength - 1);
+            }
+            else if (name.Length == 1) {
+                return name.ToLower(CultureInfo.InvariantCulture);
+            }
+            else {
+                // Convert the leading upper case character to lower case
+                return Char.ToLower(name[0], CultureInfo.InvariantCulture) + name.Substring(1);
+            }
+        }
+
+        public static string GetResourceFileLocale(string fileName) {
+            string extension = Path.GetExtension(fileName);
+
+            if (String.Compare(extension, ".resx", StringComparison.OrdinalIgnoreCase) == 0) {
+                fileName = Path.GetFileNameWithoutExtension(fileName);
+
+                extension = Path.GetExtension(fileName);
+                if (String.IsNullOrEmpty(extension) == false) {
+                    return extension.Substring(1);
+                }
+            }
+
+            return String.Empty;
+        }
+
+        public static string GetResourceFileName(string fileName) {
+            string extension = Path.GetExtension(fileName);
+
+            if (String.Compare(extension, ".resx", StringComparison.OrdinalIgnoreCase) == 0) {
+                fileName = Path.GetFileNameWithoutExtension(fileName);
+
+                extension = Path.GetExtension(fileName);
+                if (String.IsNullOrEmpty(extension) == false) {
+                    fileName = Path.GetFileNameWithoutExtension(fileName);
+                }
+            }
+
+            return fileName;
+        }
+
+        public static bool IsKeyword(string identifier) {
+            return IsKeyword(identifier, /* testCamelCase */ false);
+        }
+
+        public static bool IsKeyword(string identifier, bool testCamelCase) {
+            Debug.Assert(String.IsNullOrEmpty(identifier) == false);
+
+            if (_keywordTable == null) {
+                _keywordTable = new Hashtable(StringComparer.Ordinal);
+                foreach (string word in ScriptKeywords) {
+                    _keywordTable.Add(word, null);
+                }
+            }
+
+            if (testCamelCase) {
+                identifier = CreateCamelCaseName(identifier);
+            }
+            return _keywordTable.ContainsKey(identifier);
+        }
+
+        public static bool IsValidIdentifier(string name) {
+            if (String.IsNullOrEmpty(name)) {
+                return false;
+            }
+            if (IsKeyword(name)) {
+                return false;
+            }
+            if (Char.IsDigit(name[0])) {
+                return false;
+            }
+            for (int i = 0; i < name.Length; i++) {
+                char ch = name[i];
+                if ((ch != '_') && (ch != '$') &&
+                    (Char.IsLetterOrDigit(ch) == false)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public static bool IsValidScriptNamespace(string name) {
+            if (String.IsNullOrEmpty(name)) {
+                return false;
+            }
+            foreach (string part in name.Split('.')) {
+                if (!IsValidIdentifier(part)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public static bool IsValidScriptName(string name) {
+            if (String.IsNullOrEmpty(name)) {
+                return true;
+            }
+            if (IsKeyword(name)) {
+                return false;
+            }
+            if (Char.IsDigit(name[0])) {
+                return false;
+            }
+            for (int i = 0; i < name.Length; i++) {
+                char ch = name[i];
+                if ((Char.IsLetterOrDigit(ch) == false) && (ch != '.') && (ch != '_')) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public static string QuoteString(string s) {
+            if (String.IsNullOrEmpty(s)) {
+                return "''";
+            }
+
+            bool useDoubleQuotes = (s.IndexOf('\'') >= 0);
+
+            StringBuilder b = null;
+            int startIndex = 0;
+            int count = 0;
+            for (int i = 0; i < s.Length; i++) {
+                char c = s[i];
+
+                // Append the unhandled characters (that do not require special treament)
+                // to the string builder when special characters are detected.
+                if (c == '\r' || c == '\t' ||
+                    c == '\\' || c == '\r' || c < ' ' || c > 0x7F ||
+                    ((c == '\"') && useDoubleQuotes) ||
+                    ((c == '\'') && (useDoubleQuotes == false))) {
+                    if (b == null) {
+                        b = new StringBuilder(s.Length + 6);
+                    }
+
+                    if (count > 0) {
+                        b.Append(s, startIndex, count);
+                    }
+
+                    startIndex = i + 1;
+                    count = 0;
+                }
+
+                switch (c) {
+                    case '\r':
+                        b.Append("\\r");
+                        break;
+                    case '\t':
+                        b.Append("\\t");
+                        break;
+                    case '\\':
+                        b.Append("\\\\");
+                        break;
+                    case '\n':
+                        b.Append("\\n");
+                        break;
+                    case '\"':
+                        if (useDoubleQuotes) {
+                            b.Append("\\\"");
+                            break;
+                        }
+                        goto default;
+                    case '\'':
+                        if (!useDoubleQuotes) {
+                            b.Append("\\\'");
+                            break;
+                        }
+                        goto default;
+                    default:
+                        if ((c < ' ') || (c > 0x7F)) {
+                            b.AppendFormat(CultureInfo.InvariantCulture, "\\u{0:x4}", (int)c);
+                        }
+                        else {
+                            count++;
+                        }
+                        break;
+                }
+            }
+
+            string processedString = s;
+            if (b != null) {
+                if (count > 0) {
+                    b.Append(s, startIndex, count);
+                }
+                processedString = b.ToString();
+            }
+
+            if (useDoubleQuotes) {
+                return "\"" + processedString + "\"";
+            }
+            return "'" + processedString + "'";
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/ArrayNewNodeValidator.cs b/src/Core/Compiler/Validator/ArrayNewNodeValidator.cs
new file mode 100644
index 000000000..6d0ffb3c2
--- /dev/null
+++ b/src/Core/Compiler/Validator/ArrayNewNodeValidator.cs
@@ -0,0 +1,31 @@
+// ArrayNewNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class ArrayNewNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            ArrayNewNode newNode = (ArrayNewNode)node;
+
+            if (newNode.ExpressionList != null) {
+                Debug.Assert(newNode.ExpressionList.NodeType == ParseNodeType.ExpressionList);
+                ExpressionListNode argsList = (ExpressionListNode)newNode.ExpressionList;
+
+                if (argsList.Expressions.Count != 1) {
+                    errorHandler.ReportError("Only single dimensional arrays are supported.",
+                                             newNode.ExpressionList.Token.Location);
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/ArrayTypeNodeValidator.cs b/src/Core/Compiler/Validator/ArrayTypeNodeValidator.cs
new file mode 100644
index 000000000..5c7088e99
--- /dev/null
+++ b/src/Core/Compiler/Validator/ArrayTypeNodeValidator.cs
@@ -0,0 +1,25 @@
+// ArrayTypeNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class ArrayTypeNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            ArrayTypeNode typeNode = (ArrayTypeNode)node;
+
+            if (typeNode.Rank != 1) {
+                errorHandler.ReportError("Only single dimensional arrays are supported.",
+                                         typeNode.Token.Location);
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/CodeModelValidator.cs b/src/Core/Compiler/Validator/CodeModelValidator.cs
new file mode 100644
index 000000000..4c4b5ae68
--- /dev/null
+++ b/src/Core/Compiler/Validator/CodeModelValidator.cs
@@ -0,0 +1,170 @@
+// CodeModelValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    /// <summary>
+    /// Validates the code model based on the constrained subset of C# supposed
+    /// in Script#.
+    /// </summary>
+    internal sealed class CodeModelValidator : IParseNodeHandler {
+
+        private IErrorHandler _errorHandler;
+        private Dictionary<Type, IParseNodeValidator> _validatorTable;
+
+        public CodeModelValidator(IErrorHandler errorHandler) {
+            _errorHandler = errorHandler;
+            _validatorTable = new Dictionary<Type, IParseNodeValidator>();
+        }
+
+        private Type GetValidatorType(ParseNodeType nodeType, CompilerOptions options) {
+            switch (nodeType) {
+                case ParseNodeType.CompilationUnit:
+                    return typeof(CompilationUnitNodeValidator);
+                case ParseNodeType.Namespace:
+                    return typeof(NamespaceNodeValidator);
+                case ParseNodeType.Name:
+                case ParseNodeType.GenericName:
+                    return typeof(NameNodeValidator);
+                case ParseNodeType.Type:
+                    return typeof(CustomTypeNodeValidator);
+                case ParseNodeType.ArrayType:
+                    return typeof(ArrayTypeNodeValidator);
+                case ParseNodeType.FormalParameter:
+                    return typeof(ParameterNodeValidator);
+                case ParseNodeType.EnumerationFieldDeclaration:
+                    return typeof(EnumerationFieldNodeValidator);
+                case ParseNodeType.FieldDeclaration:
+                case ParseNodeType.ConstFieldDeclaration:
+                    return typeof(FieldDeclarationNodeValidator);
+                case ParseNodeType.IndexerDeclaration:
+                    return typeof(IndexerDeclarationNodeValidator);
+                case ParseNodeType.PropertyDeclaration:
+                    return typeof(PropertyDeclarationNodeValidator);
+                case ParseNodeType.EventDeclaration:
+                    return typeof(EventDeclarationNodeValidator);
+                case ParseNodeType.MethodDeclaration:
+                case ParseNodeType.ConstructorDeclaration:
+                    return typeof(MethodDeclarationNodeValidator);
+                case ParseNodeType.Throw:
+                    return typeof(ThrowNodeValidator);
+                case ParseNodeType.Try:
+                    return typeof(TryNodeValidator);
+                case ParseNodeType.ArrayNew:
+                    return typeof(ArrayNewNodeValidator);
+                case ParseNodeType.New:
+                    return typeof(NewNodeValidator);
+                case ParseNodeType.Catch:
+                case ParseNodeType.ArrayInitializer:
+                case ParseNodeType.Literal:
+                case ParseNodeType.AttributeBlock:
+                case ParseNodeType.Attribute:
+                case ParseNodeType.AccessorDeclaration:
+                case ParseNodeType.VariableDeclaration:
+                case ParseNodeType.ConstDeclaration:
+                case ParseNodeType.MultiPartName:
+                case ParseNodeType.UsingNamespace:
+                case ParseNodeType.PredefinedType:
+                case ParseNodeType.UnaryExpression:
+                case ParseNodeType.Conditional:
+                case ParseNodeType.Block:
+                case ParseNodeType.ExpressionStatement:
+                case ParseNodeType.EmptyStatement:
+                case ParseNodeType.VariableDeclarator:
+                case ParseNodeType.IfElse:
+                case ParseNodeType.Switch:
+                case ParseNodeType.SwitchSection:
+                case ParseNodeType.For:
+                case ParseNodeType.Foreach:
+                case ParseNodeType.While:
+                case ParseNodeType.DoWhile:
+                case ParseNodeType.CaseLabel:
+                case ParseNodeType.DefaultLabel:
+                case ParseNodeType.This:
+                case ParseNodeType.Base:
+                case ParseNodeType.Cast:
+                case ParseNodeType.ExpressionList:
+                case ParseNodeType.Break:
+                case ParseNodeType.Continue:
+                case ParseNodeType.Return:
+                case ParseNodeType.Typeof:
+                case ParseNodeType.Delegate:
+                case ParseNodeType.UsingAlias:
+                case ParseNodeType.AnonymousMethod:
+                case ParseNodeType.BinaryExpression:
+                    // No validation required
+                    break;
+                case ParseNodeType.PointerType:
+                case ParseNodeType.OperatorDeclaration:
+                case ParseNodeType.DestructorDeclaration:
+                case ParseNodeType.Goto:
+                case ParseNodeType.Lock:
+                case ParseNodeType.UnsafeStatement:
+                case ParseNodeType.YieldReturn:
+                case ParseNodeType.YieldBreak:
+                case ParseNodeType.LabeledStatement:
+                case ParseNodeType.Checked:
+                case ParseNodeType.Unchecked:
+                case ParseNodeType.Using:
+                case ParseNodeType.Sizeof:
+                case ParseNodeType.Fixed:
+                case ParseNodeType.StackAlloc:
+                case ParseNodeType.DefaultValueExpression:
+                case ParseNodeType.ExternAlias:
+                case ParseNodeType.AliasQualifiedName:
+                case ParseNodeType.TypeParameter:
+                case ParseNodeType.ConstraintClause:
+                    return typeof(UnsupportedParseNodeValidator);
+                default:
+                    Debug.Fail("Unexpected node type in validator: " + nodeType);
+                    break;
+            }
+
+            return null;
+        }
+
+        #region IParseNodeHandler Members
+        bool IParseNodeHandler.RequiresChildrenGrouping {
+            get {
+                return false;
+            }
+        }
+
+        bool IParseNodeHandler.HandleNode(ParseNode node, object context) {
+            CompilerOptions options = (CompilerOptions)context;
+
+            Type validatorType = GetValidatorType(node.NodeType, options);
+            if (validatorType == null) {
+                // valid; continue with children...
+                return true;
+            }
+
+            IParseNodeValidator validator = null;
+            if (_validatorTable.ContainsKey(validatorType)) {
+                validator = _validatorTable[validatorType];
+            }
+            else {
+                validator = (IParseNodeValidator)Activator.CreateInstance(validatorType);
+                _validatorTable[validatorType] = validator;
+            }
+
+            return validator.Validate(node, options, _errorHandler);
+        }
+
+        void IParseNodeHandler.StartChildren(string identifier) {
+        }
+
+        void IParseNodeHandler.EndChildren() {
+        }
+        #endregion
+    }
+}
diff --git a/src/Core/Compiler/Validator/CompilationUnitNodeValidator.cs b/src/Core/Compiler/Validator/CompilationUnitNodeValidator.cs
new file mode 100644
index 000000000..d03908f8b
--- /dev/null
+++ b/src/Core/Compiler/Validator/CompilationUnitNodeValidator.cs
@@ -0,0 +1,40 @@
+// CompilationUnitNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class CompilationUnitNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            CompilationUnitNode compilationUnitNode = (CompilationUnitNode)node;
+
+            foreach (AttributeBlockNode attribBlock in compilationUnitNode.Attributes) {
+                AttributeNode scriptNamespaceNode = AttributeNode.FindAttribute(attribBlock.Attributes, "ScriptNamespace");
+                if (scriptNamespaceNode != null) {
+                    string scriptNamespace = (string)((LiteralNode)scriptNamespaceNode.Arguments[0]).Value;
+
+                    if (Utility.IsValidScriptNamespace(scriptNamespace) == false) {
+                        errorHandler.ReportError("A script namespace must be a valid script identifier.",
+                                                 scriptNamespaceNode.Token.Location);
+                    }
+                }
+            } 
+
+            foreach (ParseNode childNode in compilationUnitNode.Members) {
+                if (!(childNode is NamespaceNode)) {
+                    errorHandler.ReportError("Non-namespaced types are not supported.",
+                                             childNode.Token.Location);
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/CustomTypeNodeValidator.cs b/src/Core/Compiler/Validator/CustomTypeNodeValidator.cs
new file mode 100644
index 000000000..7b0682487
--- /dev/null
+++ b/src/Core/Compiler/Validator/CustomTypeNodeValidator.cs
@@ -0,0 +1,194 @@
+// CustomTypeNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Diagnostics;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class CustomTypeNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            CustomTypeNode typeNode = (CustomTypeNode)node;
+
+            bool restrictToMethodMembers = false;
+            bool hasCodeMembers = false;
+            ParseNode codeMemberNode = null;
+
+            AttributeNode importedTypeAttribute = AttributeNode.FindAttribute(typeNode.Attributes, "Imported");
+            if (importedTypeAttribute != null) {
+                // This is an imported type definition... we'll assume its valid, since
+                // the set of restrictions for such types is fewer, and different, so
+                // for now that translates into skipping the members.
+
+                return false;
+            }
+
+            AttributeNode scriptNamespaceNode = AttributeNode.FindAttribute(typeNode.Attributes, "ScriptNamespace");
+            if (scriptNamespaceNode != null) {
+                string scriptNamespace = (string)((LiteralNode)scriptNamespaceNode.Arguments[0]).Value;
+
+                if (Utility.IsValidScriptNamespace(scriptNamespace) == false) {
+                    errorHandler.ReportError("A script namespace must be a valid script identifier.",
+                                             scriptNamespaceNode.Token.Location);
+                }
+            }
+
+            if (typeNode.Type == TokenType.Struct) {
+                errorHandler.ReportError("Struct types are not supported. Use classes annotated with the Record metadata attribute.",
+                                         typeNode.Token.Location);
+                return false;
+            }
+
+            if (((typeNode.Modifiers & Modifiers.Partial) != 0) &&
+                (typeNode.Type != TokenType.Class)) {
+                errorHandler.ReportError("Partial types can only be classes, not enumerations or interfaces.",
+                                         typeNode.Token.Location);
+                return false;
+            }
+
+            if ((typeNode.Type == TokenType.Interface) &&
+                (typeNode.BaseTypes.Count != 0)) {
+                errorHandler.ReportError("Derived interface types are not supported.",
+                                         typeNode.Token.Location);
+                return false;
+            }
+
+            if (typeNode.Type == TokenType.Class) {
+                if (typeNode.BaseTypes.Count != 0) {
+                    NameNode baseTypeNameNode = typeNode.BaseTypes[0] as NameNode;
+
+                    if (baseTypeNameNode != null) {
+                        if (String.CompareOrdinal(baseTypeNameNode.Name, "Record") == 0) {
+                            if ((typeNode.Modifiers & Modifiers.Sealed) == 0) {
+                                errorHandler.ReportError("Classes derived from the Record base class must be marked as sealed.",
+                                                         typeNode.Token.Location);
+                            }
+
+                            if (typeNode.BaseTypes.Count != 1) {
+                                errorHandler.ReportError("Classes derived from the Record base class cannot implement interfaces.",
+                                                         typeNode.Token.Location);
+                            }
+                        }
+                        else if (String.CompareOrdinal(baseTypeNameNode.Name, "TestClass") == 0) {
+                            if ((typeNode.Modifiers & Modifiers.Internal) == 0) {
+                                errorHandler.ReportError("Classes derived from TestClass must be marked as internal.",
+                                                         typeNode.Token.Location);
+                            }
+                            if ((typeNode.Modifiers & Modifiers.Static) != 0) {
+                                errorHandler.ReportError("Classes derived from TestClass must not be marked as static.",
+                                                         typeNode.Token.Location);
+                            }
+                            if ((typeNode.Modifiers & Modifiers.Sealed) == 0) {
+                                errorHandler.ReportError("Classes derived from TestClass must be marked as sealed.",
+                                                         typeNode.Token.Location);
+                            }
+                            if (typeNode.BaseTypes.Count != 1) {
+                                errorHandler.ReportError("Classes derived from TestClass cannot implement interfaces.",
+                                                         typeNode.Token.Location);
+                            }
+                        }
+                    }
+                }
+
+                AttributeNode globalMethodsAttribute = AttributeNode.FindAttribute(typeNode.Attributes, "GlobalMethods");
+                if (globalMethodsAttribute != null) {
+                    restrictToMethodMembers = true;
+
+                    if ((typeNode.Modifiers & Modifiers.Static) == 0) {
+                        errorHandler.ReportError("GlobalMethods attribute can only be set on static classes.",
+                                                 typeNode.Token.Location);
+                    }
+                }
+
+                AttributeNode mixinAttribute = AttributeNode.FindAttribute(typeNode.Attributes, "Mixin");
+                if (mixinAttribute != null) {
+                    restrictToMethodMembers = true;
+
+                    if ((typeNode.Modifiers & Modifiers.Static) == 0) {
+                        errorHandler.ReportError("Mixin attribute can only be set on static classes.",
+                                                 typeNode.Token.Location);
+                    }
+                }
+            }
+
+            if ((typeNode.Members != null) && (typeNode.Members.Count != 0)) {
+                Dictionary<string, object> memberNames = new Dictionary<string, object>();
+                bool hasCtor = false;
+
+                foreach (ParseNode genericMemberNode in typeNode.Members) {
+                    if (!(genericMemberNode is MemberNode)) {
+                        errorHandler.ReportError("Only members are allowed inside types. Nested types are not supported.",
+                                                 node.Token.Location);
+                        continue;
+                    }
+
+                    MemberNode memberNode = (MemberNode)genericMemberNode;
+
+                    if ((memberNode.Modifiers & Modifiers.Extern) != 0) {
+                        // Extern methods are placeholders for creating overload signatures
+                        continue;
+                    }
+
+                    if (restrictToMethodMembers &&
+                        (memberNode.NodeType != ParseNodeType.MethodDeclaration) &&
+                        (memberNode.NodeType != ParseNodeType.ConstructorDeclaration)) {
+                        errorHandler.ReportError("Classes marked with GlobalMethods or Mixin attribute should only have methods.",
+                                                 memberNode.Token.Location);
+                    }
+
+                    if (memberNode.NodeType == ParseNodeType.ConstructorDeclaration) {
+                        if ((memberNode.Modifiers & Modifiers.Static) == 0) {
+                            if (hasCtor) {
+                                errorHandler.ReportError("Constructor overloads are not supported.",
+                                                         memberNode.Token.Location);
+                            }
+                            hasCtor = true;
+                        }
+                        continue;
+                    }
+                    if (memberNode.NodeType == ParseNodeType.OperatorDeclaration) {
+                        // Operators don't have a name
+                        continue;
+                    }
+
+                    string name = memberNode.Name;
+                    if (memberNames.ContainsKey(name)) {
+                        errorHandler.ReportError("Duplicate-named member. Method overloads are not supported.",
+                                                 memberNode.Token.Location);
+                    }
+
+                    memberNames[name] = null;
+
+                    bool preserveCase = (AttributeNode.FindAttribute(memberNode.Attributes, "PreserveCase") != null);
+                    if (Utility.IsKeyword(name, /* testCamelCase */ (preserveCase == false))) {
+                        errorHandler.ReportError("Invalid member name. Member names should not use keywords.",
+                                                 memberNode.Token.Location);
+                    }
+             
+                    if (hasCodeMembers == false) {
+                        hasCodeMembers = ((memberNode.NodeType == ParseNodeType.PropertyDeclaration) ||
+                                          (memberNode.NodeType == ParseNodeType.MethodDeclaration) ||
+                                          (memberNode.NodeType == ParseNodeType.EventDeclaration) ||
+                                          (memberNode.NodeType == ParseNodeType.IndexerDeclaration));
+                        codeMemberNode = memberNode;
+                    }
+                }
+            }
+
+            if ((typeNode.Type == TokenType.Struct) && hasCodeMembers) {
+                errorHandler.ReportError("A struct type is limited to field and constructor members.",
+                                         codeMemberNode.Token.Location);
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/EnumerationFieldNodeValidator.cs b/src/Core/Compiler/Validator/EnumerationFieldNodeValidator.cs
new file mode 100644
index 000000000..8a64b3b5b
--- /dev/null
+++ b/src/Core/Compiler/Validator/EnumerationFieldNodeValidator.cs
@@ -0,0 +1,32 @@
+// EnumerationFieldNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class EnumerationFieldNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            EnumerationFieldNode enumFieldNode = (EnumerationFieldNode)node;
+
+            object fieldValue = enumFieldNode.Value;
+            if (fieldValue == null) {
+                errorHandler.ReportError("Enumeration fields must have an explicit constant value specified.",
+                                         enumFieldNode.Token.Location);
+                return false;
+            }
+
+            if ((fieldValue is long) || (fieldValue is ulong)) {
+                errorHandler.ReportError("Enumeration fields cannot have long or ulong underlying type.",
+                                         enumFieldNode.Token.Location);
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/EventDeclarationNodeValidator.cs b/src/Core/Compiler/Validator/EventDeclarationNodeValidator.cs
new file mode 100644
index 000000000..562ab045f
--- /dev/null
+++ b/src/Core/Compiler/Validator/EventDeclarationNodeValidator.cs
@@ -0,0 +1,28 @@
+// EventDeclarationNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class EventDeclarationNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            EventDeclarationNode eventNode = (EventDeclarationNode)node;
+
+            if (((eventNode.Modifiers & Modifiers.Static) == 0) &&
+                ((eventNode.Modifiers & Modifiers.New) != 0)) {
+                errorHandler.ReportError("The new modifier is not supported on instance members.",
+                                         eventNode.Token.Location);
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/FieldDeclarationNodeValidator.cs b/src/Core/Compiler/Validator/FieldDeclarationNodeValidator.cs
new file mode 100644
index 000000000..edeb3a4d2
--- /dev/null
+++ b/src/Core/Compiler/Validator/FieldDeclarationNodeValidator.cs
@@ -0,0 +1,26 @@
+// FieldDeclarationNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class FieldDeclarationNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            FieldDeclarationNode fieldNode = (FieldDeclarationNode)node;
+
+            if (fieldNode.Initializers.Count > 1) {
+                errorHandler.ReportError("Field declarations are limited to a single field per declaration.",
+                                         fieldNode.Token.Location);
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/IParseNodeValidator.cs b/src/Core/Compiler/Validator/IParseNodeValidator.cs
new file mode 100644
index 000000000..8850b420b
--- /dev/null
+++ b/src/Core/Compiler/Validator/IParseNodeValidator.cs
@@ -0,0 +1,19 @@
+// IParseNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    /// <summary>
+    /// Defines a parse node validator
+    /// </summary>
+    internal interface IParseNodeValidator {
+
+        bool Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler);
+    }
+}
diff --git a/src/Core/Compiler/Validator/IndexerDeclarationNodeValidator.cs b/src/Core/Compiler/Validator/IndexerDeclarationNodeValidator.cs
new file mode 100644
index 000000000..129b64f78
--- /dev/null
+++ b/src/Core/Compiler/Validator/IndexerDeclarationNodeValidator.cs
@@ -0,0 +1,34 @@
+// IndexerDeclarationNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class IndexerDeclarationNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            IndexerDeclarationNode indexerNode = (IndexerDeclarationNode)node;
+
+            if ((indexerNode.Modifiers & Modifiers.New) != 0) {
+
+                errorHandler.ReportError("The new modifier is not supported.",
+                                         indexerNode.Token.Location);
+                
+                return false;
+            }
+
+            if (indexerNode.GetAccessor == null) {
+                errorHandler.ReportError("Set-only properties are not supported. Use a set method instead.",
+                                         indexerNode.Token.Location);
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/MethodDeclarationNodeValidator.cs b/src/Core/Compiler/Validator/MethodDeclarationNodeValidator.cs
new file mode 100644
index 000000000..6020b67a8
--- /dev/null
+++ b/src/Core/Compiler/Validator/MethodDeclarationNodeValidator.cs
@@ -0,0 +1,72 @@
+// MethodDeclarationNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class MethodDeclarationNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            MethodDeclarationNode methodNode = (MethodDeclarationNode)node;
+
+            if (((methodNode.Modifiers & Modifiers.Static) == 0) &&
+                ((methodNode.Modifiers & Modifiers.New) != 0)) {
+                errorHandler.ReportError("The new modifier is not supported on instance members.",
+                                         methodNode.Token.Location);
+                return false;
+            }
+
+            if ((methodNode.Modifiers & Modifiers.Extern) != 0) {
+                AttributeNode altSigAttribute
+                    = AttributeNode.FindAttribute(methodNode.Attributes, "AlternateSignature");
+                if (altSigAttribute == null) {
+                    errorHandler.ReportError("Extern methods should only be used to declare alternate signatures and marked with [AlternateSignature].",
+                                             methodNode.Token.Location);
+                    return false;
+                }
+
+                CustomTypeNode typeNode = (CustomTypeNode)methodNode.Parent;
+                MethodDeclarationNode implMethodNode = null;
+
+                if (methodNode.NodeType == ParseNodeType.MethodDeclaration) {
+                    foreach (MemberNode memberNode in typeNode.Members) {
+                        if ((memberNode.NodeType == ParseNodeType.MethodDeclaration) &&
+                            ((memberNode.Modifiers & Modifiers.Extern) == 0) &&
+                            memberNode.Name.Equals(methodNode.Name, StringComparison.Ordinal)) {
+                            implMethodNode = (MethodDeclarationNode)memberNode;
+                            break;
+                        }
+                    }
+                }
+                else if (methodNode.NodeType == ParseNodeType.ConstructorDeclaration) {
+                    foreach (MemberNode memberNode in typeNode.Members) {
+                        if ((memberNode.NodeType == ParseNodeType.ConstructorDeclaration) &&
+                            ((memberNode.Modifiers & Modifiers.Extern) == 0)) {
+                            implMethodNode = (MethodDeclarationNode)memberNode;
+                            break;
+                        }
+                    }
+                }
+
+                if (implMethodNode == null) {
+                    errorHandler.ReportError("Extern methods used to declare alternate signatures should have a corresponding non-extern implementation as well.",
+                                             methodNode.Token.Location);
+                    return false;
+                }
+
+                if ((methodNode.Modifiers & (Modifiers.Static | Modifiers.AccessMask)) !=
+                    (implMethodNode.Modifiers & (Modifiers.Static | Modifiers.AccessMask))) {
+                    errorHandler.ReportError("The implemenation method and associated alternate signature methods should have the same access type.",
+                                             methodNode.Token.Location);
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/NameNodeValidator.cs b/src/Core/Compiler/Validator/NameNodeValidator.cs
new file mode 100644
index 000000000..01edcc2bc
--- /dev/null
+++ b/src/Core/Compiler/Validator/NameNodeValidator.cs
@@ -0,0 +1,25 @@
+// NameNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class NameNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            NameNode nameNode = (NameNode)node;
+
+            if (Utility.IsKeyword(nameNode.Name)) {
+                errorHandler.ReportError(nameNode.Name + " is a reserved word.",
+                                         nameNode.Token.Location);
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/NamespaceNodeValidator.cs b/src/Core/Compiler/Validator/NamespaceNodeValidator.cs
new file mode 100644
index 000000000..8ad4bb978
--- /dev/null
+++ b/src/Core/Compiler/Validator/NamespaceNodeValidator.cs
@@ -0,0 +1,54 @@
+// NamespaceNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class NamespaceNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            NamespaceNode namespaceNode = (NamespaceNode)node;
+
+            bool valid = true;
+
+            foreach (ParseNode childNode in namespaceNode.Members) {
+                if (childNode is NamespaceNode) {
+                    errorHandler.ReportError("Nested namespaces are not supported.",
+                                             childNode.Token.Location);
+                    valid = false;
+                }
+            }
+
+            if (namespaceNode.Name.Equals("System") ||
+                namespaceNode.Name.StartsWith("System.")) {
+
+                // Usage of the System namespace is limited to imported types.
+
+                foreach (ParseNode childNode in namespaceNode.Members) {
+                    bool allowed = false;
+
+                    if (childNode is UserTypeNode) {
+                        ParseNodeList attributes = ((UserTypeNode)childNode).Attributes;
+                        if (AttributeNode.FindAttribute(attributes, "Imported") != null) {
+                            allowed = true;
+                        }
+                    }
+
+                    if (allowed == false) {
+                        errorHandler.ReportError("Only types marked as Imported are allowed within the System namespace.",
+                                                 namespaceNode.Token.Location);
+                        valid = false;
+                        break;
+                    }
+                }
+            }
+
+            return valid;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/NewNodeValidator.cs b/src/Core/Compiler/Validator/NewNodeValidator.cs
new file mode 100644
index 000000000..4a21e91b5
--- /dev/null
+++ b/src/Core/Compiler/Validator/NewNodeValidator.cs
@@ -0,0 +1,50 @@
+// NewNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class NewNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            NewNode newNode = (NewNode)node;
+
+            // TODO: This is somewhat hacky - it only looks for any type named Dictionary
+            //       rather than resolving the type and checking if its actually
+            //       System.Dictionary.
+            //       This is because validators don't have a reference to the SymbolSet.
+
+            NameNode typeNode = newNode.TypeReference as NameNode;
+            if ((typeNode != null) && (typeNode.Name.Equals("Dictionary"))) {
+                if (newNode.Arguments != null) {
+                    Debug.Assert(newNode.Arguments is ExpressionListNode);
+                    ParseNodeList arguments = ((ExpressionListNode)newNode.Arguments).Expressions;
+
+                    if (arguments.Count != 0) {
+                        if (arguments.Count % 2 != 0) {
+                            errorHandler.ReportError("Missing value parameter for the last name parameter in Dictionary instantiation.",
+                                                     newNode.Token.Location);
+                        }
+
+                        for (int i = 0; i < arguments.Count; i += 2) {
+                            ParseNode nameArgumentNode = arguments[i];
+                            if ((nameArgumentNode.NodeType != ParseNodeType.Literal) ||
+                                (((LiteralNode)nameArgumentNode).Literal.LiteralType != LiteralTokenType.String)) {
+                                errorHandler.ReportError("Name parameters in Dictionary instantiation must be string literals.",
+                                                         nameArgumentNode.Token.Location);
+                            }
+                        }
+                    }
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/ParameterNodeValidator.cs b/src/Core/Compiler/Validator/ParameterNodeValidator.cs
new file mode 100644
index 000000000..744df52ce
--- /dev/null
+++ b/src/Core/Compiler/Validator/ParameterNodeValidator.cs
@@ -0,0 +1,26 @@
+// ParameterNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class ParameterNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            ParameterNode paramNode = (ParameterNode)node;
+
+            if (paramNode.Flags != ParameterFlags.None) {
+                errorHandler.ReportError("Out, Ref and Params style of parameters are not yet implemented.",
+                                         paramNode.Token.Location);
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/PropertyDeclarationNodeValidator.cs b/src/Core/Compiler/Validator/PropertyDeclarationNodeValidator.cs
new file mode 100644
index 000000000..d94ba11f6
--- /dev/null
+++ b/src/Core/Compiler/Validator/PropertyDeclarationNodeValidator.cs
@@ -0,0 +1,33 @@
+// PropertyDeclarationNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class PropertyDeclarationNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            PropertyDeclarationNode propertyNode = (PropertyDeclarationNode)node;
+
+            if (((propertyNode.Modifiers & Modifiers.Static) == 0) &&
+                ((propertyNode.Modifiers & Modifiers.New) != 0)) {
+                errorHandler.ReportError("The new modifier is not supported on instance members.",
+                                         propertyNode.Token.Location);
+                return false;
+            }
+
+            if (propertyNode.GetAccessor == null) {
+                errorHandler.ReportError("Set-only properties are not supported. Use a set method instead.",
+                                         propertyNode.Token.Location);
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/ThrowNodeValidator.cs b/src/Core/Compiler/Validator/ThrowNodeValidator.cs
new file mode 100644
index 000000000..91d599df9
--- /dev/null
+++ b/src/Core/Compiler/Validator/ThrowNodeValidator.cs
@@ -0,0 +1,26 @@
+// ThrowNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class ThrowNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            ThrowNode throwNode = (ThrowNode)node;
+
+            if (throwNode.Value == null) {
+                errorHandler.ReportError("Throw statements must specify an exception object.",
+                                         throwNode.Token.Location);
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/TryNodeValidator.cs b/src/Core/Compiler/Validator/TryNodeValidator.cs
new file mode 100644
index 000000000..6cc5a6040
--- /dev/null
+++ b/src/Core/Compiler/Validator/TryNodeValidator.cs
@@ -0,0 +1,26 @@
+// TryNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    internal sealed class TryNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            TryNode tryNode = (TryNode)node;
+
+            if ((tryNode.CatchClauses != null) && (tryNode.CatchClauses.Count > 1)) {
+                errorHandler.ReportError("Try/Catch statements are limited to a single catch clause.",
+                                         tryNode.Token.Location);
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/src/Core/Compiler/Validator/UnsupportedParseNodeValidator.cs b/src/Core/Compiler/Validator/UnsupportedParseNodeValidator.cs
new file mode 100644
index 000000000..b340364e1
--- /dev/null
+++ b/src/Core/Compiler/Validator/UnsupportedParseNodeValidator.cs
@@ -0,0 +1,98 @@
+// UnsupportedParseNodeValidator.cs
+// Script#/Core/Compiler
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using ScriptSharp;
+using ScriptSharp.CodeModel;
+
+namespace ScriptSharp.Validator {
+
+    /// <summary>
+    /// Raises errors for unsupported and not-yet-implemented C# constructs.
+    /// </summary>
+    internal sealed class UnsupportedParseNodeValidator : IParseNodeValidator {
+
+        bool IParseNodeValidator.Validate(ParseNode node, CompilerOptions options, IErrorHandler errorHandler) {
+            string message = String.Empty;
+            bool notYetImplemented = false;
+
+            switch (node.NodeType) {
+                case ParseNodeType.PointerType:
+                    message = "Pointer types";
+                    break;
+                case ParseNodeType.OperatorDeclaration:
+                    message = "Operator overloads";
+                    break;
+                case ParseNodeType.DestructorDeclaration:
+                    message = "Type destructors";
+                    break;
+                case ParseNodeType.Goto:
+                    message = "Goto statements";
+                    break;
+                case ParseNodeType.Using:
+                    message = "Using statements";
+                    break;
+                case ParseNodeType.Lock:
+                    message = "Lock statements";
+                    break;
+                case ParseNodeType.UnsafeStatement:
+                    message = "Unsafe statements";
+                    break;
+                case ParseNodeType.LabeledStatement:
+                    message = "Labeled statements";
+                    break;
+                case ParseNodeType.YieldReturn:
+                    message = "Yield return statements";
+                    break;
+                case ParseNodeType.YieldBreak:
+                    message = "Yield break statements";
+                    break;
+                case ParseNodeType.Checked:
+                    message = "Checked expressions";
+                    break;
+                case ParseNodeType.Unchecked:
+                    message = "Unchecked expressions";
+                    break;
+                case ParseNodeType.Sizeof:
+                    message = "Sizeof expressions";
+                    break;
+                case ParseNodeType.Fixed:
+                    message = "Fixed expressions";
+                    break;
+                case ParseNodeType.StackAlloc:
+                    message = "Stackalloc expressions";
+                    break;
+                case ParseNodeType.DefaultValueExpression:
+                    message = "Default value expressions";
+                    break;
+                case ParseNodeType.ExternAlias:
+                    message = "Extern aliases";
+                    break;
+                case ParseNodeType.AliasQualifiedName:
+                    message = "Alias-qualified identifiers";
+                    break;
+                case ParseNodeType.TypeParameter:
+                    message = "Generic type parameters";
+                    break;
+                case ParseNodeType.ConstraintClause:
+                    message = "Generic type constraints";
+                    break;
+                case ParseNodeType.GenericName:
+                    message = "Generic types";
+                    break;
+            }
+
+            if (notYetImplemented) {
+                message += " are not yet implemented.";
+            }
+            else {
+                message = message + " are not supported.";
+            }
+
+            errorHandler.ReportError(message, node.Token.Location);
+            return false;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Action.cs b/src/Core/CoreLib/Action.cs
new file mode 100644
index 000000000..10e69032a
--- /dev/null
+++ b/src/Core/CoreLib/Action.cs
@@ -0,0 +1,45 @@
+// Action.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void Action();
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void Action<T>(T arg);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void Action<T1, T2>(T1 arg1, T2 arg2);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void Action<T1, T2, T3>(T1 arg1, T2 arg2, T3 arg3);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void Action<T1, T2, T3, T4>(T1 arg1, T2 arg2, T3 arg3, T4 arg4);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void Action<T1, T2, T3, T4, T5>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void Action<T1, T2, T3, T4, T5, T6>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void Action<T1, T2, T3, T4, T5, T6, T7>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void Action<T1, T2, T3, T4, T5, T6, T7, T8>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8);
+}
diff --git a/src/Core/CoreLib/Arguments.cs b/src/Core/CoreLib/Arguments.cs
new file mode 100644
index 000000000..7049210d3
--- /dev/null
+++ b/src/Core/CoreLib/Arguments.cs
@@ -0,0 +1,68 @@
+// Arguments.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// Provides access to the arguments of the current function.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("arguments")]
+    public static class Arguments {
+
+        /// <summary>
+        /// Retrieves the arguments list.
+        /// </summary>
+        /// <returns>The arguments list.</returns>
+        [ScriptAlias("arguments")]
+        [IntrinsicProperty]
+        public static object[] Current {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the number of actual arguments passed to the function.
+        /// </summary>
+        /// <returns>The count of arguments.</returns>
+        [IntrinsicProperty]
+        public static int Length {
+            get {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the specified actual argument value passed to the
+        /// function by index.
+        /// </summary>
+        /// <param name="index">The index of the argument to retrieve.</param>
+        /// <returns>The value of the specified argument.</returns>
+        public static object GetArgument(int index) {
+            return null;
+        }
+
+        /// <summary>
+        /// Retrieves the specified actual argument value passed to the
+        /// function by index.
+        /// </summary>
+        /// <param name="index">The index of the argument to retrieve.</param>
+        /// <typeparam name="T">The type of the return value.</typeparam>
+        /// <returns>The value of the specified argument.</returns>
+        public static T GetArgument<T>(int index) {
+            return default(T);
+        }
+
+        [ScriptAlias("Array.toArray")]
+        public static Array ToArray() {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Array.cs b/src/Core/CoreLib/Array.cs
new file mode 100644
index 000000000..346c4b6c4
--- /dev/null
+++ b/src/Core/CoreLib/Array.cs
@@ -0,0 +1,200 @@
+// Array.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    // NOTE: Keep in sync with ArrayGrouping and ArrayList
+
+    /// <summary>
+    /// Equivalent to the Array type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    public sealed class Array : IEnumerable {
+
+        [IntrinsicProperty]
+        public int Length {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public object this[int index] {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        public Array Clone() {
+            return null;
+        }
+
+        public Array Concat(params object[] objects) {
+            return null;
+        }
+
+        public bool Contains(object item) {
+            return false;
+        }
+
+        public bool Every(ArrayFilterCallback filterCallback) {
+            return false;
+        }
+
+        public bool Every(ArrayItemFilterCallback itemFilterCallback) {
+            return false;
+        }
+
+        public Array Extract(int index) {
+            return null;
+        }
+
+        public Array Extract(int index, int count) {
+            return null;
+        }
+
+        public Array Filter(ArrayFilterCallback filterCallback) {
+            return null;
+        }
+
+        public Array Filter(ArrayItemFilterCallback itemFilterCallback) {
+            return null;
+        }
+
+        public void ForEach(ArrayCallback callback) {
+        }
+
+        public void ForEach(ArrayItemCallback itemCallback) {
+        }
+
+        public IEnumerator GetEnumerator() {
+            return null;
+        }
+
+        public ArrayGrouping[] GroupBy(ArrayItemKeyGenerator keyCallback) {
+            return null;
+        }
+
+        public Dictionary Index(ArrayItemKeyGenerator keyCallback) {
+            return null;
+        }
+
+        public int IndexOf(object item) {
+            return 0;
+        }
+
+        public int IndexOf(object item, int startIndex) {
+            return 0;
+        }
+
+        public string Join() {
+            return null;
+        }
+
+        public string Join(string delimiter) {
+            return null;
+        }
+
+        public int LastIndexOf(object item) {
+            return 0;
+        }
+
+        public int LastIndexOf(object item, int fromIndex) {
+            return 0;
+        }
+
+        public Array Map(ArrayMapCallback mapCallback) {
+            return null;
+        }
+
+        public Array Map(ArrayItemMapCallback mapItemCallback) {
+            return null;
+        }
+
+        public static Array Parse(string s) {
+            return null;
+        }
+
+        public object Reduce(ArrayReduceCallback callback) {
+            return null;
+        }
+
+        public object Reduce(ArrayReduceCallback callback, object initialValue) {
+            return null;
+        }
+
+        public object Reduce(ArrayItemReduceCallback callback) {
+            return null;
+        }
+
+        public object Reduce(ArrayItemReduceCallback callback, object initialValue) {
+            return null;
+        }
+
+        public object ReduceRight(ArrayReduceCallback callback) {
+            return null;
+        }
+
+        public object ReduceRight(ArrayReduceCallback callback, object initialValue) {
+            return null;
+        }
+
+        public object ReduceRight(ArrayItemReduceCallback callback) {
+            return null;
+        }
+
+        public object ReduceRight(ArrayItemReduceCallback callback, object initialValue) {
+            return null;
+        }
+
+        public void Reverse() {
+        }
+
+        public object Shift() {
+            return null;
+        }
+
+        public Array Slice(int start) {
+            return null;
+        }
+
+        public Array Slice(int start, int end) {
+            return null;
+        }
+
+        public bool Some(ArrayFilterCallback filterCallback) {
+            return false;
+        }
+
+        public bool Some(ArrayItemFilterCallback itemFilterCallback) {
+            return false;
+        }
+
+        public void Sort() {
+        }
+
+        public void Sort(CompareCallback compareCallback) {
+        }
+
+        public void Splice(int start, int deleteCount) {
+        }
+
+        public void Splice(int start, int deleteCount, params object[] itemsToInsert) {
+        }
+
+        public static Array ToArray(object o) {
+            return null;
+        }
+
+        public void Unshift(params object[] items) {
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Boolean.cs b/src/Core/CoreLib/Boolean.cs
new file mode 100644
index 000000000..1ee623d22
--- /dev/null
+++ b/src/Core/CoreLib/Boolean.cs
@@ -0,0 +1,26 @@
+// Boolean.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// Equivalent to the Boolean type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    public struct Boolean {
+
+        /// <summary>
+        /// Enables you to parse a string representation of a boolean value.
+        /// </summary>
+        /// <param name="s">The string to be parsed.</param>
+        /// <returns>The resulting boolean value.</returns>
+        public static bool Parse(string s) {
+            return false;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Byte.cs b/src/Core/CoreLib/Byte.cs
new file mode 100644
index 000000000..d58139790
--- /dev/null
+++ b/src/Core/CoreLib/Byte.cs
@@ -0,0 +1,40 @@
+// Byte.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The byte data type which is mapped to the Number type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Number")]
+    public struct Byte {
+
+        public string Format(string format) {
+            return null;
+        }
+
+        public string LocaleFormat(string format) {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the value to its string representation.
+        /// </summary>
+        /// <param name="radix">The radix used in the conversion (eg. 10 for decimal, 16 for hexadecimal)</param>
+        /// <returns>The string representation of the value.</returns>
+        public string ToString(int radix) {
+            return null;
+        }
+
+        /// <internalonly />
+        public static implicit operator Number(byte i) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Callback.cs b/src/Core/CoreLib/Callback.cs
new file mode 100644
index 000000000..96c17b502
--- /dev/null
+++ b/src/Core/CoreLib/Callback.cs
@@ -0,0 +1,13 @@
+// Action.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void Callback(object arg);
+}
diff --git a/src/Core/CoreLib/CancelEventArgs.cs b/src/Core/CoreLib/CancelEventArgs.cs
new file mode 100644
index 000000000..c8dfdc2e8
--- /dev/null
+++ b/src/Core/CoreLib/CancelEventArgs.cs
@@ -0,0 +1,30 @@
+// CancelEventArgs.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The event argument associated with cancelable events.
+    /// </summary>
+    [ScriptNamespace("ss")]
+    [Imported]
+    public class CancelEventArgs : EventArgs {
+
+        /// <summary>
+        /// Whether the event has been canceled.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Cancel {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Char.cs b/src/Core/CoreLib/Char.cs
new file mode 100644
index 000000000..568f5151d
--- /dev/null
+++ b/src/Core/CoreLib/Char.cs
@@ -0,0 +1,23 @@
+// Char.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The char data type which is mapped to the String type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("String")]
+    public struct Char {
+
+        /// <internalonly />
+        public static explicit operator String(char ch) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/ArrayCallback.cs b/src/Core/CoreLib/Collections/ArrayCallback.cs
new file mode 100644
index 000000000..66fae5390
--- /dev/null
+++ b/src/Core/CoreLib/Collections/ArrayCallback.cs
@@ -0,0 +1,14 @@
+// ArrayCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void ArrayCallback(object value, int index, Array array);
+}
diff --git a/src/Core/CoreLib/Collections/ArrayFilterCallback.cs b/src/Core/CoreLib/Collections/ArrayFilterCallback.cs
new file mode 100644
index 000000000..4bdcd1a4a
--- /dev/null
+++ b/src/Core/CoreLib/Collections/ArrayFilterCallback.cs
@@ -0,0 +1,14 @@
+// ArrayFilterCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate bool ArrayFilterCallback(object value, int index, Array array);
+}
diff --git a/src/Core/CoreLib/Collections/ArrayGrouping.cs b/src/Core/CoreLib/Collections/ArrayGrouping.cs
new file mode 100644
index 000000000..a458697ef
--- /dev/null
+++ b/src/Core/CoreLib/Collections/ArrayGrouping.cs
@@ -0,0 +1,147 @@
+// ArrayGrouping.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    // NOTE: Keep in sync with Array
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Array")]
+    public sealed class ArrayGrouping : IEnumerable {
+
+        private ArrayGrouping() {
+        }
+
+        [IntrinsicProperty]
+        public string Key {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public int Length {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public object this[int index] {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        public Array Clone() {
+            return null;
+        }
+
+        public Array Concat(params object[] objects) {
+            return null;
+        }
+
+        public bool Contains(object item) {
+            return false;
+        }
+
+        public bool Every(ArrayFilterCallback filterCallback) {
+            return false;
+        }
+
+        public bool Every(ArrayItemFilterCallback itemFilterCallback) {
+            return false;
+        }
+
+        public Array Extract(int index) {
+            return null;
+        }
+
+        public Array Extract(int index, int count) {
+            return null;
+        }
+
+        public Array Filter(ArrayFilterCallback filterCallback) {
+            return null;
+        }
+
+        public Array Filter(ArrayItemFilterCallback itemFilterCallback) {
+            return null;
+        }
+
+        public void ForEach(ArrayCallback callback) {
+        }
+
+        public void ForEach(ArrayItemCallback itemCallback) {
+        }
+
+        public IEnumerator GetEnumerator() {
+            return null;
+        }
+
+        public ArrayGrouping[] GroupBy(ArrayItemKeyGenerator keyCallback) {
+            return null;
+        }
+
+        public Dictionary Index(ArrayItemKeyGenerator keyCallback) {
+            return null;
+        }
+
+        public int IndexOf(object item) {
+            return 0;
+        }
+
+        public int IndexOf(object item, int startIndex) {
+            return 0;
+        }
+
+        public string Join() {
+            return null;
+        }
+
+        public string Join(string delimiter) {
+            return null;
+        }
+
+        public int LastIndexOf(object item) {
+            return 0;
+        }
+
+        public int LastIndexOf(object item, int fromIndex) {
+            return 0;
+        }
+
+        public Array Map(ArrayMapCallback mapCallback) {
+            return null;
+        }
+
+        public Array Map(ArrayItemMapCallback mapItemCallback) {
+            return null;
+        }
+
+        public void Reverse() {
+        }
+
+        public bool Some(ArrayFilterCallback filterCallback) {
+            return false;
+        }
+
+        public bool Some(ArrayItemFilterCallback itemFilterCallback) {
+            return false;
+        }
+
+        public void Sort() {
+        }
+
+        public void Sort(CompareCallback compareCallback) {
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/ArrayItemCallback.cs b/src/Core/CoreLib/Collections/ArrayItemCallback.cs
new file mode 100644
index 000000000..0c764e143
--- /dev/null
+++ b/src/Core/CoreLib/Collections/ArrayItemCallback.cs
@@ -0,0 +1,14 @@
+// ArrayItemCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void ArrayItemCallback(object value);
+}
diff --git a/src/Core/CoreLib/Collections/ArrayItemFilterCallback.cs b/src/Core/CoreLib/Collections/ArrayItemFilterCallback.cs
new file mode 100644
index 000000000..836d9b5b9
--- /dev/null
+++ b/src/Core/CoreLib/Collections/ArrayItemFilterCallback.cs
@@ -0,0 +1,14 @@
+// ArrayItemFilterCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate bool ArrayItemFilterCallback(object value);
+}
diff --git a/src/Core/CoreLib/Collections/ArrayItemKeyGenerator.cs b/src/Core/CoreLib/Collections/ArrayItemKeyGenerator.cs
new file mode 100644
index 000000000..3b737c896
--- /dev/null
+++ b/src/Core/CoreLib/Collections/ArrayItemKeyGenerator.cs
@@ -0,0 +1,14 @@
+// ArrayItemKeyGenerator.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate string ArrayItemKeyGenerator(object value, int index);
+}
diff --git a/src/Core/CoreLib/Collections/ArrayItemMapCallback.cs b/src/Core/CoreLib/Collections/ArrayItemMapCallback.cs
new file mode 100644
index 000000000..a388c2cd1
--- /dev/null
+++ b/src/Core/CoreLib/Collections/ArrayItemMapCallback.cs
@@ -0,0 +1,14 @@
+// ArrayItemMapCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate object ArrayItemMapCallback(object value);
+}
diff --git a/src/Core/CoreLib/Collections/ArrayItemReduceCallback.cs b/src/Core/CoreLib/Collections/ArrayItemReduceCallback.cs
new file mode 100644
index 000000000..3685de1f0
--- /dev/null
+++ b/src/Core/CoreLib/Collections/ArrayItemReduceCallback.cs
@@ -0,0 +1,14 @@
+// ArrayItemReduceCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate object ArrayItemReduceCallback(object previousValue, object value);
+}
diff --git a/src/Core/CoreLib/Collections/ArrayList.cs b/src/Core/CoreLib/Collections/ArrayList.cs
new file mode 100644
index 000000000..a2b906762
--- /dev/null
+++ b/src/Core/CoreLib/Collections/ArrayList.cs
@@ -0,0 +1,240 @@
+// ArrayList.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    // NOTE: Keep in sync with ArrayGrouping and Array
+
+    /// <summary>
+    /// Equivalent to the Array type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Array")]
+    public sealed class ArrayList : IEnumerable {
+
+        public ArrayList() {
+        }
+
+        public ArrayList(int capacity) {
+        }
+
+        public ArrayList(params object[] items) {
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("length")]
+        public int Count {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public object this[int index] {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        public void Add(object item) {
+        }
+
+        public void AddRange(object[] items) {
+        }
+
+        public void AddRange(ArrayList items) {
+        }
+
+        public ArrayList Clone() {
+            return null;
+        }
+
+        public void Clear() {
+        }
+
+        public ArrayList Concat(params object[] objects) {
+            return null;
+        }
+
+        public bool Contains(object item) {
+            return false;
+        }
+
+        public bool Every(ArrayFilterCallback filterCallback) {
+            return false;
+        }
+
+        public bool Every(ArrayItemFilterCallback itemFilterCallback) {
+            return false;
+        }
+
+        public Array Extract(int index) {
+            return null;
+        }
+
+        public Array Extract(int index, int count) {
+            return null;
+        }
+
+        public Array Filter(ArrayFilterCallback filterCallback) {
+            return null;
+        }
+
+        public Array Filter(ArrayItemFilterCallback itemFilterCallback) {
+            return null;
+        }
+
+        public void ForEach(ArrayCallback callback) {
+        }
+
+        public void ForEach(ArrayItemCallback itemCallback) {
+        }
+
+        public IEnumerator GetEnumerator() {
+            return null;
+        }
+
+        public ArrayGrouping[] GroupBy(ArrayItemKeyGenerator keyCallback) {
+            return null;
+        }
+
+        public Dictionary Index(ArrayItemKeyGenerator keyCallback) {
+            return null;
+        }
+
+        public int IndexOf(object item) {
+            return 0;
+        }
+
+        public int IndexOf(object item, int startIndex) {
+            return 0;
+        }
+
+        public void Insert(int index, object item) {
+        }
+
+        public void InsertRange(int index, object[] items) {
+        }
+
+        public string Join() {
+            return null;
+        }
+
+        public string Join(string delimiter) {
+            return null;
+        }
+
+        public int LastIndexOf(object item) {
+            return 0;
+        }
+
+        public int LastIndexOf(object item, int fromIndex) {
+            return 0;
+        }
+
+        public Array Map(ArrayMapCallback mapCallback) {
+            return null;
+        }
+
+        public Array Map(ArrayItemMapCallback mapItemCallback) {
+            return null;
+        }
+
+        public static ArrayList Parse(string s) {
+            return null;
+        }
+
+        public object Reduce(ArrayReduceCallback callback) {
+            return null;
+        }
+
+        public object Reduce(ArrayReduceCallback callback, object initialValue) {
+            return null;
+        }
+
+        public object Reduce(ArrayItemReduceCallback callback) {
+            return null;
+        }
+
+        public object Reduce(ArrayItemReduceCallback callback, object initialValue) {
+            return null;
+        }
+
+        public object ReduceRight(ArrayReduceCallback callback) {
+            return null;
+        }
+
+        public object ReduceRight(ArrayReduceCallback callback, object initialValue) {
+            return null;
+        }
+
+        public object ReduceRight(ArrayItemReduceCallback callback) {
+            return null;
+        }
+
+        public object ReduceRight(ArrayItemReduceCallback callback, object initialValue) {
+            return null;
+        }
+
+        public bool Remove(object item) {
+            return false;
+        }
+
+        public void RemoveAt(int index) {
+        }
+
+        public Array RemoveRange(int index, int count) {
+            return null;
+        }
+
+        public void Reverse() {
+        }
+
+        public object Shift() {
+            return null;
+        }
+
+        public Array Slice(int start) {
+            return null;
+        }
+
+        public Array Slice(int start, int end) {
+            return null;
+        }
+
+        public bool Some(ArrayFilterCallback filterCallback) {
+            return false;
+        }
+
+        public bool Some(ArrayItemFilterCallback itemFilterCallback) {
+            return false;
+        }
+
+        public void Sort() {
+        }
+
+        public void Sort(CompareCallback compareCallback) {
+        }
+
+        public void Splice(int start, int deleteCount) {
+        }
+
+        public void Splice(int start, int deleteCount, params object[] itemsToInsert) {
+        }
+
+        public void Unshift(params object[] items) {
+        }
+
+        public static explicit operator Array(ArrayList list) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/ArrayMapCallback.cs b/src/Core/CoreLib/Collections/ArrayMapCallback.cs
new file mode 100644
index 000000000..a6c55e06a
--- /dev/null
+++ b/src/Core/CoreLib/Collections/ArrayMapCallback.cs
@@ -0,0 +1,14 @@
+// ArrayMapCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate object ArrayMapCallback(object value, int index, Array array);
+}
diff --git a/src/Core/CoreLib/Collections/ArrayReduceCallback.cs b/src/Core/CoreLib/Collections/ArrayReduceCallback.cs
new file mode 100644
index 000000000..b320b009e
--- /dev/null
+++ b/src/Core/CoreLib/Collections/ArrayReduceCallback.cs
@@ -0,0 +1,14 @@
+// ArrayReduceCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate object ArrayReduceCallback(object previousValue, object value, int index, Array array);
+}
diff --git a/src/Core/CoreLib/Collections/Dictionary.cs b/src/Core/CoreLib/Collections/Dictionary.cs
new file mode 100644
index 000000000..d14823d47
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Dictionary.cs
@@ -0,0 +1,64 @@
+// Dictionary.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    /// <summary>
+    /// The Dictionary data type which is mapped to the Object type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Object")]
+    public sealed class Dictionary : IEnumerable {
+
+        public Dictionary() {
+        }
+
+        public Dictionary(params object[] nameValuePairs) {
+        }
+
+        public int Count {
+            get {
+                return 0;
+            }
+        }
+
+        public string[] Keys {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public object this[string key] {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        public void Clear() {
+        }
+
+        public bool ContainsKey(string key) {
+            return false;
+        }
+
+        public static Dictionary GetDictionary(object o) {
+            return null;
+        }
+
+        public void Remove(string key) {
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/DictionaryEntry.cs b/src/Core/CoreLib/Collections/DictionaryEntry.cs
new file mode 100644
index 000000000..d9f5c0cb0
--- /dev/null
+++ b/src/Core/CoreLib/Collections/DictionaryEntry.cs
@@ -0,0 +1,32 @@
+// DictionaryEntry.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [IgnoreNamespace]
+    [Imported]
+    public sealed class DictionaryEntry {
+
+        internal DictionaryEntry() {
+        }
+
+        [IntrinsicProperty]
+        public string Key {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Value {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/Generic/CompareCallback.cs b/src/Core/CoreLib/Collections/Generic/CompareCallback.cs
new file mode 100644
index 000000000..050193a4b
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/CompareCallback.cs
@@ -0,0 +1,13 @@
+// CompareCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate int CompareCallback<T>(T x, T y);
+}
diff --git a/src/Core/CoreLib/Collections/Generic/Dictionary.cs b/src/Core/CoreLib/Collections/Generic/Dictionary.cs
new file mode 100644
index 000000000..fd177f233
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/Dictionary.cs
@@ -0,0 +1,85 @@
+// Dictionary.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    /// <summary>
+    /// The Dictionary data type which is mapped to the Object type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Object")]
+    public sealed class Dictionary<TKey, TValue> : IEnumerable<KeyValuePair<TKey, TValue>> {
+
+        public Dictionary() {
+        }
+
+        public Dictionary(params object[] nameValuePairs) {
+        }
+
+        [Obsolete("This is only for use by the c# compiler, and cannot be used for generating script.", /* error */ true)]
+        public Dictionary(int count) {
+        }
+
+        public int Count {
+            get {
+                return 0;
+            }
+        }
+
+        public IReadonlyCollection<TKey> Keys {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public TValue this[TKey key] {
+            get {
+                return default(TValue);
+            }
+            set {
+            }
+        }
+
+        [Obsolete("This is only for use by the c# compiler, and cannot be used for generating script.", /* error */ true)]
+        public void Add(TKey key, TValue value) {
+        }
+
+        public void Clear() {
+        }
+
+        public bool ContainsKey(TKey key) {
+            return false;
+        }
+
+        public static Dictionary<TKey, TValue> GetDictionary(object o) {
+            return null;
+        }
+
+        public IEnumerator<KeyValuePair<TKey, TValue>> GetEnumerator() {
+            return null;
+        }
+
+        public void Remove(TKey key) {
+        }
+
+        [Obsolete("This is only for use by the c# compiler, and cannot be used for generating script.", /* error */ true)]
+        public bool TryGetValue(TKey key, out TValue value) {
+            value = default(TValue);
+            return false;
+        }
+
+        public static implicit operator Dictionary(Dictionary<TKey, TValue> dictionary) {
+            return null;
+        }
+
+        public static implicit operator Dictionary<TKey, TValue>(Dictionary dictionary) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/Generic/ICollection.cs b/src/Core/CoreLib/Collections/Generic/ICollection.cs
new file mode 100644
index 000000000..c5d8fe3fa
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/ICollection.cs
@@ -0,0 +1,27 @@
+// ICollection.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("ICollection")]
+    public interface ICollection<T> : IEnumerable<T> {
+
+        [IntrinsicProperty]
+        [ScriptName("length")]
+        int Count {
+            get;
+        }
+
+        [IntrinsicProperty]
+        T this[int index] {
+            get;
+            set;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/Generic/IEnumerable.cs b/src/Core/CoreLib/Collections/Generic/IEnumerable.cs
new file mode 100644
index 000000000..0204fe624
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/IEnumerable.cs
@@ -0,0 +1,17 @@
+// IEnumerable.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("IEnumerable")]
+    public interface IEnumerable<T> {
+
+        IEnumerator<T> GetEnumerator();
+    }
+}
diff --git a/src/Core/CoreLib/Collections/Generic/IEnumerator.cs b/src/Core/CoreLib/Collections/Generic/IEnumerator.cs
new file mode 100644
index 000000000..c5fe31031
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/IEnumerator.cs
@@ -0,0 +1,24 @@
+// IEnumerator.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("IEnumerator")]
+    public interface IEnumerator<T> {
+
+        [IntrinsicProperty]
+        T Current {
+            get;
+        }
+
+        bool MoveNext();
+
+        void Reset();
+    }
+}
diff --git a/src/Core/CoreLib/Collections/Generic/IReadonlyCollection.cs b/src/Core/CoreLib/Collections/Generic/IReadonlyCollection.cs
new file mode 100644
index 000000000..f32938f80
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/IReadonlyCollection.cs
@@ -0,0 +1,26 @@
+// IReadonlyCollection.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("ICollection")]
+    public interface IReadonlyCollection<T> : IEnumerable<T> {
+
+        [IntrinsicProperty]
+        [ScriptName("length")]
+        int Count {
+            get;
+        }
+
+        [IntrinsicProperty]
+        T this[int index] {
+            get;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/Generic/KeyValuePair.cs b/src/Core/CoreLib/Collections/Generic/KeyValuePair.cs
new file mode 100644
index 000000000..fa9b564f1
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/KeyValuePair.cs
@@ -0,0 +1,32 @@
+// KeyValuePair.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Object")]
+    public sealed class KeyValuePair<TKey, TValue> {
+
+        internal KeyValuePair() {
+        }
+
+        [IntrinsicProperty]
+        public TKey Key {
+            get {
+                return default(TKey);
+            }
+        }
+
+        [IntrinsicProperty]
+        public TValue Value {
+            get {
+                return default(TValue);
+            }
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/Generic/List.cs b/src/Core/CoreLib/Collections/Generic/List.cs
new file mode 100644
index 000000000..b27784457
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/List.cs
@@ -0,0 +1,237 @@
+// List.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    /// <summary>
+    /// Equivalent to the Array type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Array")]
+    public sealed class List<T> : ICollection<T> {
+
+        public List() {
+        }
+
+        public List(int capacity) {
+        }
+
+        public List(params T[] items) {
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("length")]
+        public int Count {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public T this[int index] {
+            get {
+                return default(T);
+            }
+            set {
+            }
+        }
+
+        public void Add(T item) {
+        }
+
+        public void AddRange(T[] items) {
+        }
+
+        public void AddRange(List<T> items) {
+        }
+
+        public List<T> Clone() {
+            return null;
+        }
+
+        public void Clear() {
+        }
+
+        public List<T> Concat(params T[] objects) {
+            return null;
+        }
+
+        public bool Contains(object item) {
+            return false;
+        }
+
+        public bool Every(ListFilterCallback<T> filterCallback) {
+            return false;
+        }
+
+        public bool Every(ListItemFilterCallback<T> itemFilterCallback) {
+            return false;
+        }
+
+        public List<T> Extract(int index) {
+            return null;
+        }
+
+        public List<T> Extract(int index, int count) {
+            return null;
+        }
+
+        public List<T> Filter(ListFilterCallback<T> filterCallback) {
+            return null;
+        }
+
+        public List<T> Filter(ListItemFilterCallback<T> itemFilterCallback) {
+            return null;
+        }
+
+        public void ForEach(ListCallback<T> callback) {
+        }
+
+        public void ForEach(ListItemCallback<T> itemCallback) {
+        }
+
+        public IEnumerator<T> GetEnumerator() {
+            return null;
+        }
+
+        public ListGrouping<T>[] GroupBy(ListItemKeyGenerator<T> keyCallback) {
+            return null;
+        }
+
+        /*
+        // HACK: This should be T instead of object, but we have a problem
+        //       handling partial generic types in the compiler.
+        public Dictionary<string, object> Index(ListItemKeyGenerator<T> keyCallback) {
+            return null;
+        }
+        */
+
+        public int IndexOf(T item) {
+            return 0;
+        }
+
+        public int IndexOf(T item, int startIndex) {
+            return 0;
+        }
+
+        public void Insert(int index, T item) {
+        }
+
+        public void InsertRange(int index, T[] items) {
+        }
+
+        public string Join() {
+            return null;
+        }
+
+        public string Join(string delimiter) {
+            return null;
+        }
+
+        public int LastIndexOf(object item) {
+            return 0;
+        }
+
+        public int LastIndexOf(object item, int fromIndex) {
+            return 0;
+        }
+
+        public List<TTarget> Map<TTarget>(ListMapCallback<T, TTarget> mapCallback) {
+            return null;
+        }
+
+        public List<TTarget> Map<TTarget>(ListItemMapCallback<T, TTarget> mapItemCallback) {
+            return null;
+        }
+
+        public static List<T> Parse(string s) {
+            return null;
+        }
+
+        public TReduced Reduce<TReduced>(ListReduceCallback<TReduced, T> callback) {
+            return default(TReduced);
+        }
+
+        public TReduced Reduce<TReduced>(ListReduceCallback<TReduced, T> callback, TReduced initialValue) {
+            return default(TReduced);
+        }
+
+        public TReduced Reduce<TReduced>(ListItemReduceCallback<TReduced, T> callback) {
+            return default(TReduced);
+        }
+
+        public TReduced Reduce<TReduced>(ListItemReduceCallback<TReduced, T> callback, TReduced initialValue) {
+            return default(TReduced);
+        }
+
+        public TReduced ReduceRight<TReduced>(ListReduceCallback<TReduced, T> callback) {
+            return default(TReduced);
+        }
+
+        public TReduced ReduceRight<TReduced>(ListReduceCallback<TReduced, T> callback, TReduced initialValue) {
+            return default(TReduced);
+        }
+
+        public TReduced ReduceRight<TReduced>(ListItemReduceCallback<TReduced, T> callback) {
+            return default(TReduced);
+        }
+
+        public TReduced ReduceRight<TReduced>(ListItemReduceCallback<TReduced, T> callback, TReduced initialValue) {
+            return default(TReduced);
+        }
+
+        public bool Remove(T item) {
+            return false;
+        }
+
+        public void RemoveAt(int index) {
+        }
+
+        public List<T> RemoveRange(int index, int count) {
+            return null;
+        }
+
+        public void Reverse() {
+        }
+
+        public List<T> Slice(int start) {
+            return null;
+        }
+
+        public List<T> Slice(int start, int end) {
+            return null;
+        }
+
+        public bool Some(ListFilterCallback<T> filterCallback) {
+            return false;
+        }
+
+        public bool Some(ListItemFilterCallback<T> itemFilterCallback) {
+            return false;
+        }
+
+        public void Sort() {
+        }
+
+        public void Sort(CompareCallback<T> compareCallback) {
+        }
+
+        public void Splice(int start, int deleteCount) {
+        }
+
+        public void Splice(int start, int deleteCount, params T[] itemsToInsert) {
+        }
+
+        public void Unshift(params T[] items) {
+        }
+
+        public static explicit operator Array(List<T> list) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/Generic/ListCallback.cs b/src/Core/CoreLib/Collections/Generic/ListCallback.cs
new file mode 100644
index 000000000..6025a0f84
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/ListCallback.cs
@@ -0,0 +1,13 @@
+// ListCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void ListCallback<T>(T value, int index, IReadonlyCollection<T> list);
+}
diff --git a/src/Core/CoreLib/Collections/Generic/ListFilterCallback.cs b/src/Core/CoreLib/Collections/Generic/ListFilterCallback.cs
new file mode 100644
index 000000000..84381bf45
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/ListFilterCallback.cs
@@ -0,0 +1,13 @@
+// ListFilterCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate bool ListFilterCallback<T>(T value, int index, IReadonlyCollection<T> list);
+}
diff --git a/src/Core/CoreLib/Collections/Generic/ListGrouping.cs b/src/Core/CoreLib/Collections/Generic/ListGrouping.cs
new file mode 100644
index 000000000..543ab994e
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/ListGrouping.cs
@@ -0,0 +1,133 @@
+// ListGrouping.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Array")]
+    public sealed class ListGrouping<T> : IReadonlyCollection<T> {
+
+        private ListGrouping() {
+        }
+
+        [IntrinsicProperty]
+        public string Key {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("length")]
+        public int Count {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public T this[int index] {
+            get {
+                return default(T);
+            }
+        }
+
+        public bool Contains(T item) {
+            return false;
+        }
+
+        public bool Every(ListFilterCallback<T> filterCallback) {
+            return false;
+        }
+
+        public bool Every(ListItemFilterCallback<T> itemFilterCallback) {
+            return false;
+        }
+
+        public List<T> Extract(int index) {
+            return null;
+        }
+
+        public List<T> Extract(int index, int count) {
+            return null;
+        }
+
+        public List<T> Filter(ListFilterCallback<T> filterCallback) {
+            return null;
+        }
+
+        public List<T> Filter(ListItemFilterCallback<T> itemFilterCallback) {
+            return null;
+        }
+
+        public void ForEach(ListCallback<T> callback) {
+        }
+
+        public void ForEach(ListItemCallback<T> itemCallback) {
+        }
+
+        public IEnumerator<T> GetEnumerator() {
+            return null;
+        }
+
+        public ListGrouping<T>[] GroupBy(ListItemKeyGenerator<T> keyCallback) {
+            return null;
+        }
+
+        /*
+        // HACK: This should be T instead of object, but we have a problem
+        //       handling partial generic types in the compiler.
+        public Dictionary<string, object> Index(ListItemKeyGenerator<T> keyCallback) {
+            return null;
+        }
+        */
+
+        public int IndexOf(T item) {
+            return 0;
+        }
+
+        public int IndexOf(T item, int startIndex) {
+            return 0;
+        }
+
+        public string Join() {
+            return null;
+        }
+
+        public string Join(string delimiter) {
+            return null;
+        }
+
+        public int LastIndexOf(object item) {
+            return 0;
+        }
+
+        public int LastIndexOf(object item, int fromIndex) {
+            return 0;
+        }
+
+        public List<TTarget> Map<TTarget>(ListMapCallback<T, TTarget> mapCallback) {
+            return null;
+        }
+
+        public List<TTarget> Map<TTarget>(ListItemMapCallback<T, TTarget> mapItemCallback) {
+            return null;
+        }
+
+        public void Reverse() {
+        }
+
+        public bool Some(ListFilterCallback<T> filterCallback) {
+            return false;
+        }
+
+        public bool Some(ListItemFilterCallback<T> itemFilterCallback) {
+            return false;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/Generic/ListItemCallback.cs b/src/Core/CoreLib/Collections/Generic/ListItemCallback.cs
new file mode 100644
index 000000000..fc13e08f0
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/ListItemCallback.cs
@@ -0,0 +1,13 @@
+// ListItemCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void ListItemCallback<T>(T value);
+}
diff --git a/src/Core/CoreLib/Collections/Generic/ListItemFilterCallback.cs b/src/Core/CoreLib/Collections/Generic/ListItemFilterCallback.cs
new file mode 100644
index 000000000..bb28466d6
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/ListItemFilterCallback.cs
@@ -0,0 +1,13 @@
+// ListItemFilterCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate bool ListItemFilterCallback<T>(T value);
+}
diff --git a/src/Core/CoreLib/Collections/Generic/ListItemKeyGenerator.cs b/src/Core/CoreLib/Collections/Generic/ListItemKeyGenerator.cs
new file mode 100644
index 000000000..08cc715c4
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/ListItemKeyGenerator.cs
@@ -0,0 +1,13 @@
+// ListItemKeyGenerator.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate string ListItemKeyGenerator<T>(T value, int index);
+}
diff --git a/src/Core/CoreLib/Collections/Generic/ListItemMapCallback.cs b/src/Core/CoreLib/Collections/Generic/ListItemMapCallback.cs
new file mode 100644
index 000000000..a5403956e
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/ListItemMapCallback.cs
@@ -0,0 +1,13 @@
+// ListItemMapCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate TTarget ListItemMapCallback<TSource, TTarget>(TSource value);
+}
diff --git a/src/Core/CoreLib/Collections/Generic/ListItemReduceCallback.cs b/src/Core/CoreLib/Collections/Generic/ListItemReduceCallback.cs
new file mode 100644
index 000000000..b4c398ee2
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/ListItemReduceCallback.cs
@@ -0,0 +1,13 @@
+// ListItemReduceCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate TReduced ListItemReduceCallback<TReduced, TValue>(TReduced previousValue, TValue value);
+}
diff --git a/src/Core/CoreLib/Collections/Generic/ListMapCallback.cs b/src/Core/CoreLib/Collections/Generic/ListMapCallback.cs
new file mode 100644
index 000000000..ce3f4b557
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/ListMapCallback.cs
@@ -0,0 +1,13 @@
+// ListMapCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate TTarget ListMapCallback<TSource, TTarget>(TSource value, int index, IReadonlyCollection<TSource> list);
+}
diff --git a/src/Core/CoreLib/Collections/Generic/ListReduceCallback.cs b/src/Core/CoreLib/Collections/Generic/ListReduceCallback.cs
new file mode 100644
index 000000000..0179c0797
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/ListReduceCallback.cs
@@ -0,0 +1,13 @@
+// ListReduceCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate TReduced ListReduceCallback<TReduced, TValue>(TReduced previousValue, TValue value, int index, List<TValue> list);
+}
diff --git a/src/Core/CoreLib/Collections/Generic/ObservableCollection.cs b/src/Core/CoreLib/Collections/Generic/ObservableCollection.cs
new file mode 100644
index 000000000..94d22451e
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/ObservableCollection.cs
@@ -0,0 +1,69 @@
+// ObservableCollection.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("ObservableCollection")]
+    public sealed class ObservableCollection<T> : IEnumerable<T> {
+
+        public ObservableCollection() {
+        }
+
+        public ObservableCollection(T[] items) {
+        }
+
+        [ScriptName("length")]
+        public int Count {
+            get {
+                return 0;
+            }
+        }
+
+        public T this[int index] {
+            get {
+                return default(T);
+            }
+            set {
+            }
+        }
+
+        public void Add(T item) {
+        }
+
+        public void Clear() {
+        }
+
+        public bool Contains(T item) {
+            return false;
+        }
+
+        public IEnumerator<T> GetEnumerator() {
+            return null;
+        }
+
+        public int IndexOf(T item) {
+            return 0;
+        }
+
+        public void Insert(int index, T item) {
+        }
+
+        public bool Remove(T item) {
+            return false;
+        }
+
+        public void RemoveAt(int index) {
+        }
+
+        public T[] ToArray() {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/Generic/Queue.cs b/src/Core/CoreLib/Collections/Generic/Queue.cs
new file mode 100644
index 000000000..a95151422
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/Queue.cs
@@ -0,0 +1,44 @@
+// Queue.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    /// <summary>
+    /// The Queue data type which is mapped to the Array type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Array")]
+    public sealed class Queue<T> {
+
+        [IntrinsicProperty]
+        [ScriptName("length")]
+        public int Count {
+            get {
+                return 0;
+            }
+        }
+
+        public void Clear() {
+        }
+
+        public bool Contains(T item) {
+            return false;
+        }
+
+        public T Dequeue() {
+            return default(T);
+        }
+
+        public void Enqueue(T item) {
+        }
+
+        public T Peek() {
+            return default(T);
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/Generic/Stack.cs b/src/Core/CoreLib/Collections/Generic/Stack.cs
new file mode 100644
index 000000000..4da84b79e
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Generic/Stack.cs
@@ -0,0 +1,44 @@
+// Stack.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections.Generic {
+
+    /// <summary>
+    /// The Stack data type which is mapped to the Array type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Array")]
+    public sealed class Stack<T> {
+
+        [IntrinsicProperty]
+        [ScriptName("length")]
+        public int Count {
+            get {
+                return 0;
+            }
+        }
+
+        public void Clear() {
+        }
+
+        public bool Contains(T item) {
+            return false;
+        }
+
+        public T Peek() {
+            return default(T);
+        }
+
+        public T Pop() {
+            return default(T);
+        }
+
+        public void Push(T item) {
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/ICollection.cs b/src/Core/CoreLib/Collections/ICollection.cs
new file mode 100644
index 000000000..9e386bae7
--- /dev/null
+++ b/src/Core/CoreLib/Collections/ICollection.cs
@@ -0,0 +1,27 @@
+// ICollection.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("ICollection")]
+    public interface ICollection : IEnumerable {
+
+        [IntrinsicProperty]
+        [ScriptName("length")]
+        int Count {
+            get;
+        }
+
+        [IntrinsicProperty]
+        object this[int index] {
+            get;
+            set;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/IEnumerable.cs b/src/Core/CoreLib/Collections/IEnumerable.cs
new file mode 100644
index 000000000..2a33d13c4
--- /dev/null
+++ b/src/Core/CoreLib/Collections/IEnumerable.cs
@@ -0,0 +1,16 @@
+// IEnumerable.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    public interface IEnumerable {
+
+        IEnumerator GetEnumerator();
+    }
+}
diff --git a/src/Core/CoreLib/Collections/IEnumerator.cs b/src/Core/CoreLib/Collections/IEnumerator.cs
new file mode 100644
index 000000000..4127b595b
--- /dev/null
+++ b/src/Core/CoreLib/Collections/IEnumerator.cs
@@ -0,0 +1,23 @@
+// IEnumerator.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    public interface IEnumerator {
+
+        [IntrinsicProperty]
+        object Current {
+            get;
+        }
+
+        bool MoveNext();
+
+        void Reset();
+    }
+}
diff --git a/src/Core/CoreLib/Collections/IReadonlyCollection.cs b/src/Core/CoreLib/Collections/IReadonlyCollection.cs
new file mode 100644
index 000000000..07901b436
--- /dev/null
+++ b/src/Core/CoreLib/Collections/IReadonlyCollection.cs
@@ -0,0 +1,26 @@
+// IReadonlyCollection.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("ICollection")]
+    public interface IReadonlyCollection : IEnumerable {
+
+        [IntrinsicProperty]
+        [ScriptName("length")]
+        int Count {
+            get;
+        }
+
+        [IntrinsicProperty]
+        object this[int index] {
+            get;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/ObservableCollection.cs b/src/Core/CoreLib/Collections/ObservableCollection.cs
new file mode 100644
index 000000000..f2ae87ba9
--- /dev/null
+++ b/src/Core/CoreLib/Collections/ObservableCollection.cs
@@ -0,0 +1,69 @@
+// ObservableCollection.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("ObservableCollection")]
+    public sealed class ObservableCollection : IEnumerable {
+
+        public ObservableCollection() {
+        }
+
+        public ObservableCollection(Array items) {
+        }
+
+        [ScriptName("length")]
+        public int Count {
+            get {
+                return 0;
+            }
+        }
+
+        public object this[int index] {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        public void Add(object item) {
+        }
+
+        public void Clear() {
+        }
+
+        public bool Contains(object item) {
+            return false;
+        }
+
+        public IEnumerator GetEnumerator() {
+            return null;
+        }
+
+        public int IndexOf(object item) {
+            return 0;
+        }
+
+        public void Insert(int index, object item) {
+        }
+
+        public bool Remove(object item) {
+            return false;
+        }
+
+        public void RemoveAt(int index) {
+        }
+
+        public Array ToArray() {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/Queue.cs b/src/Core/CoreLib/Collections/Queue.cs
new file mode 100644
index 000000000..9b7772218
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Queue.cs
@@ -0,0 +1,45 @@
+// Queue.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    /// <summary>
+    /// The Queue data type which is mapped to the Array type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Array")]
+    public sealed class Queue {
+
+        [IntrinsicProperty]
+        [ScriptName("length")]
+        public int Count {
+            get {
+                return 0;
+            }
+        }
+
+        public void Clear() {
+        }
+
+        public bool Contains(object item) {
+            return false;
+        }
+
+        public object Dequeue() {
+            return null;
+        }
+
+        public void Enqueue(object item) {
+        }
+
+        public object Peek() {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Collections/Stack.cs b/src/Core/CoreLib/Collections/Stack.cs
new file mode 100644
index 000000000..53515bf54
--- /dev/null
+++ b/src/Core/CoreLib/Collections/Stack.cs
@@ -0,0 +1,45 @@
+// Stack.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Collections {
+
+    /// <summary>
+    /// The Stack data type which is mapped to the Array type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Array")]
+    public sealed class Stack {
+
+        [IntrinsicProperty]
+        [ScriptName("length")]
+        public int Count {
+            get {
+                return 0;
+            }
+        }
+
+        public void Clear() {
+        }
+
+        public bool Contains(object item) {
+            return false;
+        }
+
+        public object Peek() {
+            return null;
+        }
+
+        public object Pop() {
+            return null;
+        }
+
+        public void Push(object item) {
+        }
+    }
+}
diff --git a/src/Core/CoreLib/CompareCallback.cs b/src/Core/CoreLib/CompareCallback.cs
new file mode 100644
index 000000000..11aa154a0
--- /dev/null
+++ b/src/Core/CoreLib/CompareCallback.cs
@@ -0,0 +1,13 @@
+// CompareCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate int CompareCallback(object x, object y);
+}
diff --git a/src/Core/CoreLib/ComponentModel/DependencyAttribute.cs b/src/Core/CoreLib/ComponentModel/DependencyAttribute.cs
new file mode 100644
index 000000000..60048593e
--- /dev/null
+++ b/src/Core/CoreLib/ComponentModel/DependencyAttribute.cs
@@ -0,0 +1,35 @@
+// DependencyAttribute.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.ComponentModel {
+
+    /// <summary>
+    /// This attribute can be placed on a property, or constructor parameter.
+    /// When placed on a property or parameter this can be used to mark a dependency
+    /// and whether it is optional or not.
+    /// </summary>
+    [Imported]
+    [NonScriptable]
+    [AttributeUsage(AttributeTargets.Property | AttributeTargets.Parameter, Inherited = true, AllowMultiple = false)]
+    public sealed class DependencyAttribute : Attribute {
+
+        private bool _optional;
+
+        /// <summary>
+        /// Gets or sets whether the dependency is optional.
+        /// </summary>
+        public bool Optional {
+            get {
+                return _optional;
+            }
+            set {
+                _optional = value;
+            }
+        }
+    }
+}
diff --git a/src/Core/CoreLib/ComponentModel/IApplication.cs b/src/Core/CoreLib/ComponentModel/IApplication.cs
new file mode 100644
index 000000000..02c4a0e3b
--- /dev/null
+++ b/src/Core/CoreLib/ComponentModel/IApplication.cs
@@ -0,0 +1,25 @@
+// IApplication.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.ComponentModel {
+
+    /// <summary>
+    /// Defines contextual information about the current application.
+    /// </summary>
+    [Imported]
+    [ScriptNamespace("ss")]
+    public interface IApplication {
+
+        /// <summary>
+        /// Gets the value of the specified setting value.
+        /// </summary>
+        /// <param name="name">The name of the setting.</param>
+        /// <returns>The value of the setting if it is available.</returns>
+        string GetSetting(string name);
+    }
+}
diff --git a/src/Core/CoreLib/ComponentModel/IContainer.cs b/src/Core/CoreLib/ComponentModel/IContainer.cs
new file mode 100644
index 000000000..ad1fc4b5a
--- /dev/null
+++ b/src/Core/CoreLib/ComponentModel/IContainer.cs
@@ -0,0 +1,40 @@
+// IContainer.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.ComponentModel {
+
+    /// <summary>
+    /// Encapsulates the functionality of a container that defines a scope of
+    /// composition where objects can be registered and dependencies can be resolved.
+    /// </summary>
+    [Imported]
+    [ScriptNamespace("ss")]
+    public interface IContainer {
+
+        /// <summary>
+        /// Gets an instance of an object for the specified object type.
+        /// </summary>
+        /// <param name="objectType">The type of object to retrieve.</param>
+        /// <returns>The resulting object; null if the object could not be retrieved.</returns>
+        object GetObject(Type objectType);
+
+        /// <summary>
+        /// Registers an object instance for the specified type with the container.
+        /// </summary>
+        /// <param name="objectType">The type of object this instance corresponds to.</param>
+        /// <param name="objectInstance">The object to register.</param>
+        void RegisterObject(Type objectType, object objectInstance);
+
+        /// <summary>
+        /// Registers an object factory for the specified type with the container.
+        /// </summary>
+        /// <param name="objectType">The type of object this factory corresponds to.</param>
+        /// <param name="objectFactory">The factory to register.</param>
+        void RegisterFactory(Type objectType, Func<IContainer, Type, object> objectFactory);
+    }
+}
diff --git a/src/Core/CoreLib/ComponentModel/IEventManager.cs b/src/Core/CoreLib/ComponentModel/IEventManager.cs
new file mode 100644
index 000000000..e1b595fa1
--- /dev/null
+++ b/src/Core/CoreLib/ComponentModel/IEventManager.cs
@@ -0,0 +1,40 @@
+// IEventManager.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.ComponentModel {
+
+    /// <summary>
+    /// Provides a simple pub/sub mechanism to allow objects to broadcast and
+    /// listen to messages or events without being coupled to each other.
+    /// </summary>
+    [Imported]
+    [ScriptNamespace("ss")]
+    public interface IEventManager {
+
+        /// <summary>
+        /// Broadcasts an event. The event is sequentially handled by all subscribers.
+        /// Any errors that occur are ignored.
+        /// </summary>
+        /// <param name="eventArgs">The data associated with the event.</param>
+        void PublishEvent(EventArgs eventArgs);
+
+        /// <summary>
+        /// Subscribes the specified handler to listen to events of the specified type.
+        /// </summary>
+        /// <param name="eventType">The type of the event to listen to.</param>
+        /// <param name="eventHandler">The event handler to be invoked when the event occurs.</param>
+        /// <returns>An opaque cookie that can be used to unsubscribe subsequently.</returns>
+        object SubscribeEvent(Type eventType, Callback eventHandler);
+
+        /// <summary>
+        /// Unsubscribes a previous event handler from subsequent events.
+        /// </summary>
+        /// <param name="subscriptionCookie">The cookie that represents the subscription.</param>
+        void UnsubscribeEvent(object subscriptionCookie);
+    }
+}
diff --git a/src/Core/CoreLib/ComponentModel/IInitializable.cs b/src/Core/CoreLib/ComponentModel/IInitializable.cs
new file mode 100644
index 000000000..a8a948470
--- /dev/null
+++ b/src/Core/CoreLib/ComponentModel/IInitializable.cs
@@ -0,0 +1,31 @@
+// IInitializable.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace System.ComponentModel {
+
+    /// <summary>
+    /// Implemented by objects that supports a simple, transacted notification for batch
+    /// initialization. 
+    /// </summary>
+    [Imported]
+    [ScriptNamespace("ss")]
+    public interface IInitializable {
+
+        /// <summary>
+        /// Signals the object that initialization is starting.
+        /// </summary>
+        /// <param name="options">An optional set of name/value pairs containing initialization data.</param>
+        void BeginInitialization(Dictionary<string, object> options);
+
+        /// <summary>
+        /// Signals the object that initialization is complete.
+        /// </summary>
+        void EndInitialization();
+    }
+}
diff --git a/src/Core/CoreLib/ComponentModel/IObserver.cs b/src/Core/CoreLib/ComponentModel/IObserver.cs
new file mode 100644
index 000000000..57e8ad57a
--- /dev/null
+++ b/src/Core/CoreLib/ComponentModel/IObserver.cs
@@ -0,0 +1,18 @@
+// IObserver.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.ComponentModel {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("IObserver")]
+    public interface IObserver {
+
+        void InvalidateObserver();
+    }
+}
diff --git a/src/Core/CoreLib/ComponentModel/Observable.cs b/src/Core/CoreLib/ComponentModel/Observable.cs
new file mode 100644
index 000000000..53765677c
--- /dev/null
+++ b/src/Core/CoreLib/ComponentModel/Observable.cs
@@ -0,0 +1,29 @@
+// Observable.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.ComponentModel {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("Observable")]
+    public sealed class Observable<T> {
+
+        public Observable() {
+        }
+
+        public Observable(T value) {
+        }
+
+        public T GetValue() {
+            return default(T);
+        }
+
+        public void SetValue(T value) {
+        }
+    }
+}
diff --git a/src/Core/CoreLib/ComponentModel/ObserverManager.cs b/src/Core/CoreLib/ComponentModel/ObserverManager.cs
new file mode 100644
index 000000000..473235a55
--- /dev/null
+++ b/src/Core/CoreLib/ComponentModel/ObserverManager.cs
@@ -0,0 +1,20 @@
+// ObserverManager.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.ComponentModel {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("Observable")]
+    public static class ObserverManager {
+
+        public static IDisposable RegisterObserver(IObserver observer) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/CoreLib.csproj b/src/Core/CoreLib/CoreLib.csproj
new file mode 100644
index 000000000..f8dd6d256
--- /dev/null
+++ b/src/Core/CoreLib/CoreLib.csproj
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{36D4B098-A21C-4725-ACD3-400922885F38}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>System</RootNamespace>
+    <AssemblyName>mscorlib</AssemblyName>
+    <NoStdLib>True</NoStdLib>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>false</DelaySign>
+    <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\bin\Debug\mscorlib.xml</DocumentationFile>
+    <NoWarn>1591, 0661, 0660</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NoWarn>1591, 0661, 0660</NoWarn>
+    <DocumentationFile>..\..\..\bin\Release\mscorlib.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Collections\ArrayReduceCallback.cs" />
+    <Compile Include="Collections\ArrayItemReduceCallback.cs" />
+    <Compile Include="Collections\Generic\ListReduceCallback.cs" />
+    <Compile Include="Collections\Generic\ListItemReduceCallback.cs" />
+    <Compile Include="Collections\Generic\ListMapCallback.cs" />
+    <Compile Include="Collections\Generic\ListItemMapCallback.cs" />
+    <Compile Include="Collections\Generic\CompareCallback.cs" />
+    <Compile Include="Collections\Generic\ListItemKeyGenerator.cs" />
+    <Compile Include="Collections\Generic\ListItemCallback.cs" />
+    <Compile Include="Collections\Generic\ListCallback.cs" />
+    <Compile Include="Collections\Generic\ListItemFilterCallback.cs" />
+    <Compile Include="Collections\Generic\ListFilterCallback.cs" />
+    <Compile Include="Collections\Generic\ObservableCollection.cs" />
+    <Compile Include="Collections\Generic\Stack.cs" />
+    <Compile Include="Collections\Generic\Queue.cs" />
+    <Compile Include="Collections\Generic\Dictionary.cs" />
+    <Compile Include="Collections\Generic\KeyValuePair.cs" />
+    <Compile Include="Collections\Generic\ListGrouping.cs" />
+    <Compile Include="Collections\Generic\List.cs" />
+    <Compile Include="Collections\Generic\IReadonlyCollection.cs" />
+    <Compile Include="Collections\Generic\ICollection.cs" />
+    <Compile Include="Collections\Generic\IEnumerable.cs" />
+    <Compile Include="Collections\Generic\IEnumerator.cs" />
+    <Compile Include="Collections\ICollection.cs" />
+    <Compile Include="Collections\IReadonlyCollection.cs" />
+    <Compile Include="Collections\ObservableCollection.cs" />
+    <Compile Include="Callback.cs" />
+    <Compile Include="ComponentModel\IApplication.cs" />
+    <Compile Include="ComponentModel\IEventManager.cs" />
+    <Compile Include="ComponentModel\DependencyAttribute.cs" />
+    <Compile Include="ComponentModel\IInitializable.cs" />
+    <Compile Include="ComponentModel\IContainer.cs" />
+    <Compile Include="ComponentModel\ObserverManager.cs" />
+    <Compile Include="ComponentModel\IObserver.cs" />
+    <Compile Include="ComponentModel\Observable.cs" />
+    <Compile Include="Diagnostics\SyntaxValidationAttribute.cs" />
+    <Compile Include="Threading\Deferred.cs" />
+    <Compile Include="Threading\TaskStatus.cs" />
+    <Compile Include="Threading\Task.cs" />
+    <Compile Include="Tuple.cs" />
+    <Compile Include="Nullable.cs" />
+    <Compile Include="Diagnostics\ConditionalAttribute.cs" />
+    <Compile Include="Diagnostics\SuppressMessageAttribute.cs" />
+    <Compile Include="Runtime.cs" />
+    <Compile Include="ScriptMetadata.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Globalization\CultureInfo.cs" />
+    <Compile Include="Globalization\DateFormatInfo.cs" />
+    <Compile Include="Globalization\NumberFormatInfo.cs" />
+    <Compile Include="Serialization\JsonStringifyCallback.cs" />
+    <Compile Include="Serialization\JsonParseCallback.cs" />
+    <Compile Include="Serialization\Json.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Array.cs" />
+    <Compile Include="Collections\ArrayCallback.cs" />
+    <Compile Include="Collections\ArrayFilterCallback.cs" />
+    <Compile Include="Collections\ArrayGrouping.cs" />
+    <Compile Include="Collections\ArrayItemCallback.cs" />
+    <Compile Include="Collections\ArrayItemFilterCallback.cs" />
+    <Compile Include="Collections\ArrayItemKeyGenerator.cs" />
+    <Compile Include="Collections\ArrayItemMapCallback.cs" />
+    <Compile Include="Collections\ArrayList.cs" />
+    <Compile Include="Collections\ArrayMapCallback.cs" />
+    <Compile Include="Boolean.cs" />
+    <Compile Include="Byte.cs" />
+    <Compile Include="CancelEventArgs.cs" />
+    <Compile Include="Char.cs" />
+    <Compile Include="CompareCallback.cs" />
+    <Compile Include="Arguments.cs" />
+    <Compile Include="Action.cs" />
+    <Compile Include="Testing\Assert.cs" />
+    <Compile Include="Func.cs" />
+    <Compile Include="Record.cs" />
+    <Compile Include="Date.cs" />
+    <Compile Include="Diagnostics\Debug.cs" />
+    <Compile Include="Decimal.cs" />
+    <Compile Include="Delegate.cs" />
+    <Compile Include="Collections\Dictionary.cs" />
+    <Compile Include="Collections\DictionaryEntry.cs" />
+    <Compile Include="Double.cs" />
+    <Compile Include="Enum.cs" />
+    <Compile Include="EventArgs.cs" />
+    <Compile Include="EventHandler.cs" />
+    <Compile Include="Exception.cs" />
+    <Compile Include="Function.cs" />
+    <Compile Include="IDisposable.cs" />
+    <Compile Include="Collections\IEnumerable.cs" />
+    <Compile Include="Collections\IEnumerator.cs" />
+    <Compile Include="Int16.cs" />
+    <Compile Include="Int32.cs" />
+    <Compile Include="Int64.cs" />
+    <Compile Include="Math.cs" />
+    <Compile Include="Number.cs" />
+    <Compile Include="Object.cs" />
+    <Compile Include="Collections\Queue.cs" />
+    <Compile Include="RegularExpression.cs" />
+    <Compile Include="SByte.cs" />
+    <Compile Include="Script.cs" />
+    <Compile Include="Single.cs" />
+    <Compile Include="Collections\Stack.cs" />
+    <Compile Include="String.cs" />
+    <Compile Include="StringBuilder.cs" />
+    <Compile Include="StringReplaceCallback.cs" />
+    <Compile Include="Type.cs" />
+    <Compile Include="UInt16.cs" />
+    <Compile Include="UInt32.cs" />
+    <Compile Include="UInt64.cs" />
+    <Compile Include="Void.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
+    </Compile>
+    <Compile Include="Testing\TestEngine.cs" />
+    <Compile Include="Testing\TestClass.cs" />
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+</Project>
\ No newline at end of file
diff --git a/src/Core/CoreLib/Date.cs b/src/Core/CoreLib/Date.cs
new file mode 100644
index 000000000..468e0c6f2
--- /dev/null
+++ b/src/Core/CoreLib/Date.cs
@@ -0,0 +1,359 @@
+// Date.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// Equivalent to the Date type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    public sealed class Date {
+
+        /// <summary>
+        /// Represents a null date.
+        /// </summary>
+        public static readonly Date Empty;
+
+        /// <summary>
+        /// Creates a new instance of Date initialized from the current time.
+        /// </summary>
+        public Date() {
+        }
+
+        /// <summary>
+        /// Creates a new instance of Date initialized from the specified number of milliseconds.
+        /// </summary>
+        /// <param name="milliseconds">Milliseconds since January 1st, 1970.</param>
+        public Date(int milliseconds) {
+        }
+
+        /// <summary>
+        /// Creates a new instance of Date initialized from parsing the specified date.
+        /// </summary>
+        /// <param name="date"></param>
+        public Date(string date) {
+        }
+
+        /// <summary>
+        /// Creates a new instance of Date.
+        /// </summary>
+        /// <param name="year">The full year.</param>
+        /// <param name="month">The month (0 through 11)</param>
+        /// <param name="date">The day of the month (1 through # of days in the specified month)</param>
+        public Date(int year, int month, int date) {
+        }
+
+        /// <summary>
+        /// Creates a new instance of Date.
+        /// </summary>
+        /// <param name="year">The full year.</param>
+        /// <param name="month">The month (0 through 11)</param>
+        /// <param name="date">The day of the month (1 through # of days in the specified month)</param>
+        /// <param name="hours">The hours (0 through 23)</param>
+        public Date(int year, int month, int date, int hours) {
+        }
+
+        /// <summary>
+        /// Creates a new instance of Date.
+        /// </summary>
+        /// <param name="year">The full year.</param>
+        /// <param name="month">The month (0 through 11)</param>
+        /// <param name="date">The day of the month (1 through # of days in the specified month)</param>
+        /// <param name="hours">The hours (0 through 23)</param>
+        /// <param name="minutes">The minutes (0 through 59)</param>
+        public Date(int year, int month, int date, int hours, int minutes) {
+        }
+
+        /// <summary>
+        /// Creates a new instance of Date.
+        /// </summary>
+        /// <param name="year">The full year.</param>
+        /// <param name="month">The month (0 through 11)</param>
+        /// <param name="date">The day of the month (1 through # of days in the specified month)</param>
+        /// <param name="hours">The hours (0 through 23)</param>
+        /// <param name="minutes">The minutes (0 through 59)</param>
+        /// <param name="seconds">The seconds (0 through 59)</param>
+        public Date(int year, int month, int date, int hours, int minutes, int seconds) {
+        }
+
+        /// <summary>
+        /// Creates a new instance of Date.
+        /// </summary>
+        /// <param name="year">The full year.</param>
+        /// <param name="month">The month (0 through 11)</param>
+        /// <param name="date">The day of the month (1 through # of days in the specified month)</param>
+        /// <param name="hours">The hours (0 through 23)</param>
+        /// <param name="minutes">The minutes (0 through 59)</param>
+        /// <param name="seconds">The seconds (0 through 59)</param>
+        /// <param name="milliseconds">The milliseconds (0 through 999)</param>
+        public Date(int year, int month, int date, int hours, int minutes, int seconds, int milliseconds) {
+        }
+
+        /// <summary>
+        /// Returns the current date and time.
+        /// </summary>
+        public static Date Now {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns the current date with the time part set to 00:00:00.
+        /// </summary>
+        public static Date Today {
+            get {
+                return null;
+            }
+        }
+
+        public string Format(string format) {
+            return null;
+        }
+
+        public int GetDate() {
+            return 0;
+        }
+
+        public int GetDay() {
+            return 0;
+        }
+
+        public int GetFullYear() {
+            return 0;
+        }
+
+        public int GetHours() {
+            return 0;
+        }
+
+        public int GetMilliseconds() {
+            return 0;
+        }
+
+        public int GetMinutes() {
+            return 0;
+        }
+
+        public int GetMonth() {
+            return 0;
+        }
+
+        public int GetSeconds() {
+            return 0;
+        }
+
+        public int GetTime() {
+            return 0;
+        }
+
+        public int GetTimezoneOffset() {
+            return 0;
+        }
+
+        public int GetUTCDate() {
+            return 0;
+        }
+
+        public int GetUTCDay() {
+            return 0;
+        }
+
+        public int GetUTCFullYear() {
+            return 0;
+        }
+
+        public int GetUTCHours() {
+            return 0;
+        }
+
+        public int GetUTCMilliseconds() {
+            return 0;
+        }
+
+        public int GetUTCMinutes() {
+            return 0;
+        }
+
+        public int GetUTCMonth() {
+            return 0;
+        }
+
+        public int GetUTCSeconds() {
+            return 0;
+        }
+
+        public static bool IsEmpty(Date d) {
+            return false;
+        }
+
+        public string LocaleFormat(string format) {
+            return null;
+        }
+
+        [ScriptName("parseDate")]
+        public static Date Parse(string value) {
+            return null;
+        }
+
+        public void SetDate(int date) {
+        }
+
+        public void SetFullYear(int year) {
+        }
+
+        public void SetFullYear(int year, int month) {
+        }
+
+        public void SetFullYear(int year, int month, int day) {
+        }
+
+        public void SetHours(int hours) {
+        }
+
+        public void SetMilliseconds(int milliseconds) {
+        }
+
+        public void SetMinutes(int minutes) {
+        }
+
+        public void SetMonth(int month) {
+        }
+
+        public void SetSeconds(int seconds) {
+        }
+
+        public void SetTime(int milliseconds) {
+        }
+
+        public void SetUTCDate(int date) {
+        }
+
+        public void SetUTCFullYear(int year) {
+        }
+
+        public void SetUTCHours(int hours) {
+        }
+
+        public void SetUTCMilliseconds(int milliseconds) {
+        }
+
+        public void SetUTCMinutes(int minutes) {
+        }
+
+        public void SetUTCMonth(int month) {
+        }
+
+        public void SetUTCSeconds(int seconds) {
+        }
+
+        public void SetYear(int year) {
+        }
+
+        public string ToDateString() {
+            return null;
+        }
+
+        public string ToISOString() {
+            return null;
+        }
+
+        public string ToLocaleDateString() {
+            return null;
+        }
+
+        public string ToLocaleTimeString() {
+            return null;
+        }
+
+        public string ToTimeString() {
+            return null;
+        }
+
+        public string ToUTCString() {
+            return null;
+        }
+
+        [PreserveCase]
+        public static int UTC(int year, int month, int day) {
+            return 0;
+        }
+
+        [PreserveCase]
+        public static int UTC(int year, int month, int day, int hours) {
+            return 0;
+        }
+
+        [PreserveCase]
+        public static int UTC(int year, int month, int day, int hours, int minutes) {
+            return 0;
+        }
+
+        [PreserveCase]
+        public static int UTC(int year, int month, int day, int hours, int minutes, int seconds) {
+            return 0;
+        }
+
+        [PreserveCase]
+        public static int UTC(int year, int month, int day, int hours, int minutes, int seconds, int milliseconds) {
+            return 0;
+        }
+
+        // NOTE: There is no + operator since in JavaScript that returns the
+        //       concatenation of the date strings, which is pretty much useless.
+
+        /// <summary>
+        /// Returns the difference in milliseconds between two dates.
+        /// </summary>
+        public static int operator -(Date a, Date b) {
+            return 0;
+        }
+
+        /// <summary>
+        /// Compares two dates
+        /// </summary>
+        public static bool operator ==(Date a, Date b) {
+            return false;
+        }
+
+        /// <summary>
+        /// Compares two dates
+        /// </summary>
+        public static bool operator !=(Date a, Date b) {
+            return false;
+        }
+
+        /// <summary>
+        /// Compares two dates
+        /// </summary>
+        public static bool operator <(Date a, Date b) {
+            return false;
+        }
+
+        /// <summary>
+        /// Compares two dates
+        /// </summary>
+        public static bool operator >(Date a, Date b) {
+            return false;
+        }
+
+        /// <summary>
+        /// Compares two dates
+        /// </summary>
+        public static bool operator <=(Date a, Date b) {
+            return false;
+        }
+
+        /// <summary>
+        /// Compares two dates
+        /// </summary>
+        public static bool operator >=(Date a, Date b) {
+            return false;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Decimal.cs b/src/Core/CoreLib/Decimal.cs
new file mode 100644
index 000000000..17b6ffd70
--- /dev/null
+++ b/src/Core/CoreLib/Decimal.cs
@@ -0,0 +1,178 @@
+// Decimal.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The decimal data type which is mapped to the Number type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Number")]
+    public struct Decimal {
+
+        public Decimal(double d) {
+        }
+
+        public Decimal(int i) {
+        }
+
+        public Decimal(float f) {
+        }
+
+        public Decimal(long n) {
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Decimal(int lo, int mid, int hi, bool isNegative, byte scale) {
+        }
+
+        public string Format(string format) {
+            return null;
+        }
+
+        public string LocaleFormat(string format) {
+            return null;
+        }
+
+        [ScriptAlias("parseFloat")]
+        public static decimal Parse(string s) {
+            return 0m;
+        }
+
+        /// <summary>
+        /// Converts the value to its string representation.
+        /// </summary>
+        /// <param name="radix">The radix used in the conversion (eg. 10 for decimal, 16 for hexadecimal)</param>
+        /// <returns>The string representation of the value.</returns>
+        public string ToString(int radix) {
+            return null;
+        }
+
+        /// <internalonly />
+        public static implicit operator Number(decimal i) {
+            return null;
+        }
+
+        /// <internalonly />
+        public static implicit operator decimal(int value) {
+            return 0;
+        }
+
+        /// <internalonly />
+        public static implicit operator decimal(double value) {
+            return 0;
+        }
+
+        /// <internalonly />
+        public static implicit operator decimal(float value) {
+            return 0;
+        }
+
+        /// <internalonly />
+        public static implicit operator decimal(long value) {
+            return 0;
+        }
+
+        /// <internalonly />
+        public static explicit operator int(decimal value) {
+            return 0;
+        }
+
+        /// <internalonly />
+        public static explicit operator double(decimal value) {
+            return 0;
+        }
+
+        /// <internalonly />
+        public static explicit operator float(decimal value) {
+            return 0;
+        }
+
+        /// <internalonly />
+        public static explicit operator long(decimal value) {
+            return 0;
+        }
+
+        /// <internalonly />
+        public static decimal operator +(decimal d) {
+            return d;
+        }
+
+        /// <internalonly />
+        public static decimal operator -(decimal d) {
+            return d;
+        }
+
+        /// <internalonly />
+        public static decimal operator +(decimal d1, decimal d2) {
+            return d1;
+        }
+
+        /// <internalonly />
+        public static decimal operator -(decimal d1, decimal d2) {
+            return d1;
+        }
+
+        /// <internalonly />
+        public static decimal operator ++(decimal d) {
+            return d;
+        }
+
+        /// <internalonly />
+        public static decimal operator --(decimal d) {
+            return d;
+        }
+
+        /// <internalonly />
+        public static decimal operator *(decimal d1, decimal d2) {
+            return d1;
+        }
+
+        /// <internalonly />
+        public static decimal operator /(decimal d1, decimal d2) {
+            return d1;
+        }
+
+        /// <internalonly />
+        public static decimal operator %(decimal d1, decimal d2) {
+            return d1;
+        }
+
+        /// <internalonly />
+        public static bool operator ==(decimal d1, decimal d2) {
+            return false;
+        }
+
+        /// <internalonly />
+        public static bool operator !=(decimal d1, decimal d2) {
+            return false;
+        }
+
+        /// <internalonly />
+        public static bool operator >(decimal d1, decimal d2) {
+            return false;
+        }
+
+        /// <internalonly />
+        public static bool operator >=(decimal d1, decimal d2) {
+            return false;
+        }
+
+        /// <internalonly />
+        public static bool operator <(decimal d1, decimal d2) {
+            return false;
+        }
+
+        /// <internalonly />
+        public static bool operator <=(decimal d1, decimal d2) {
+            return false;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Delegate.cs b/src/Core/CoreLib/Delegate.cs
new file mode 100644
index 000000000..eef11f582
--- /dev/null
+++ b/src/Core/CoreLib/Delegate.cs
@@ -0,0 +1,52 @@
+// Delegate.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    public abstract class Delegate {
+
+        public static readonly Delegate Empty = null;
+
+        protected Delegate(object target, string method) {
+        }
+
+        protected Delegate(Type target, string method) {
+        }
+
+        public static void ClearExport(string name) {
+        }
+
+        public static Delegate Combine(Delegate a, Delegate b) {
+            return null;
+        }
+
+        public static Delegate Create(object instance, Function f) {
+            return null;
+        }
+
+        public static string CreateExport(Delegate d) {
+            return null;
+        }
+
+        public static string CreateExport(Delegate d, bool multiUse) {
+            return null;
+        }
+
+        public static string CreateExport(Delegate d, bool multiUse, string name) {
+            return null;
+        }
+
+        public static void DeleteExport(string name) {
+        }
+
+        public static Delegate Remove(Delegate source, Delegate value) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Diagnostics/ConditionalAttribute.cs b/src/Core/CoreLib/Diagnostics/ConditionalAttribute.cs
new file mode 100644
index 000000000..7abdf8d86
--- /dev/null
+++ b/src/Core/CoreLib/Diagnostics/ConditionalAttribute.cs
@@ -0,0 +1,29 @@
+// ConditionalAttribute.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System.Diagnostics {
+
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = true)]
+    [NonScriptable]
+    [Imported]
+    public sealed class ConditionalAttribute : Attribute {
+
+        private string _conditionString;
+
+        public ConditionalAttribute(string conditionString) {
+            _conditionString = conditionString;
+        }
+
+        public string ConditionString {
+            get {
+                return _conditionString;
+            }
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Diagnostics/Debug.cs b/src/Core/CoreLib/Diagnostics/Debug.cs
new file mode 100644
index 000000000..55e2bcc8a
--- /dev/null
+++ b/src/Core/CoreLib/Diagnostics/Debug.cs
@@ -0,0 +1,33 @@
+// Debug.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Diagnostics {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("console")]
+    public static class Debug {
+
+        [Conditional("DEBUG")]
+        public static void Assert(bool condition) {
+        }
+
+        [Conditional("DEBUG")]
+        public static void Assert(bool condition, string message) {
+        }
+
+        [Conditional("DEBUG")]
+        public static void Fail(string message) {
+        }
+
+        [Conditional("DEBUG")]
+        [ScriptName("log")]
+        public static void WriteLine(string message) {
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Diagnostics/SuppressMessageAttribute.cs b/src/Core/CoreLib/Diagnostics/SuppressMessageAttribute.cs
new file mode 100644
index 000000000..b9af5c7cc
--- /dev/null
+++ b/src/Core/CoreLib/Diagnostics/SuppressMessageAttribute.cs
@@ -0,0 +1,77 @@
+// SuppressMessageAttribute.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System.Diagnostics.CodeAnalysis {
+
+    [AttributeUsage(AttributeTargets.All, Inherited = false, AllowMultiple = true)]
+    [NonScriptable]
+    [Imported]
+    public sealed class SuppressMessageAttribute : Attribute {
+
+        private string _category;
+        private string _checkId;
+        private string _scope;
+        private string _target;
+        private string _messageId;
+        private string _justification;
+
+        public SuppressMessageAttribute(string category, string checkId) {
+            _category = category;
+            _checkId = checkId;
+        }
+
+        public string Category {
+            get {
+                return _category;
+            }
+        }
+
+        public string CheckId {
+            get {
+                return _checkId;
+            }
+        }
+
+        public string Justification {
+            get {
+                return _justification;
+            }
+            set {
+                _justification = value;
+            }
+        }
+
+        public string Scope {
+            get {
+                return _scope;
+            }
+            set {
+                _scope = value;
+            }
+        }
+
+        public string Target {
+            get {
+                return _target;
+            }
+            set {
+                _target = value;
+            }
+        }
+
+        public string MessageId {
+            get {
+                return _messageId;
+            }
+            set {
+                _messageId = value;
+            }
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Diagnostics/SyntaxValidationAttribute.cs b/src/Core/CoreLib/Diagnostics/SyntaxValidationAttribute.cs
new file mode 100644
index 000000000..21ac87257
--- /dev/null
+++ b/src/Core/CoreLib/Diagnostics/SyntaxValidationAttribute.cs
@@ -0,0 +1,29 @@
+// SyntaxValidationAttribute.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System.Diagnostics.CodeAnalysis {
+
+    [AttributeUsage(AttributeTargets.Parameter, Inherited = false, AllowMultiple = true)]
+    [NonScriptable]
+    [Imported]
+    public sealed class SyntaxValidationAttribute : Attribute {
+
+        private string _syntax;
+
+        public SyntaxValidationAttribute(string syntax) {
+            _syntax = syntax;
+        }
+
+        public string Syntax {
+            get {
+                return _syntax;
+            }
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Double.cs b/src/Core/CoreLib/Double.cs
new file mode 100644
index 000000000..3e98b170a
--- /dev/null
+++ b/src/Core/CoreLib/Double.cs
@@ -0,0 +1,89 @@
+// Double.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The double data type which is mapped to the Number type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Number")]
+    public struct Double {
+
+        public string Format(string format) {
+            return null;
+        }
+
+        public string LocaleFormat(string format) {
+            return null;
+        }
+
+        [ScriptAlias("parseFloat")]
+        public static double Parse(string s) {
+            return 0;
+        }
+
+        /// <summary>
+        /// Returns a string containing the value represented in exponential notation.
+        /// </summary>
+        /// <returns>The exponential representation</returns>
+        public string ToExponential() {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string containing the value represented in exponential notation.
+        /// </summary>
+        /// <param name="fractionDigits">The number of digits after the decimal point from 0 - 20</param>
+        /// <returns>The exponential representation</returns>
+        public string ToExponential(int fractionDigits) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string representing the value in fixed-point notation.
+        /// </summary>
+        /// <returns>The fixed-point notation</returns>
+        public string ToFixed() {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string representing the value in fixed-point notation.
+        /// </summary>
+        /// <param name="fractionDigits">The number of digits after the decimal point from 0 - 20</param>
+        /// <returns>The fixed-point notation</returns>
+        public string ToFixed(int fractionDigits) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string containing the value represented either in exponential or
+        /// fixed-point notation with a specified number of digits.
+        /// </summary>
+        /// <returns>The string representation of the value.</returns>
+        public string ToPrecision() {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string containing the value represented either in exponential or
+        /// fixed-point notation with a specified number of digits.
+        /// </summary>
+        /// <param name="precision">The number of significant digits (in the range 1 to 21)</param>
+        /// <returns>The string representation of the value.</returns>
+        public string ToPrecision(int precision) {
+            return null;
+        }
+
+        /// <internalonly />
+        public static implicit operator Number(double i) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Enum.cs b/src/Core/CoreLib/Enum.cs
new file mode 100644
index 000000000..5f31be2e2
--- /dev/null
+++ b/src/Core/CoreLib/Enum.cs
@@ -0,0 +1,14 @@
+// Enum.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    public abstract class Enum : ValueType {
+    }
+}
diff --git a/src/Core/CoreLib/EventArgs.cs b/src/Core/CoreLib/EventArgs.cs
new file mode 100644
index 000000000..c0830b6d4
--- /dev/null
+++ b/src/Core/CoreLib/EventArgs.cs
@@ -0,0 +1,24 @@
+// EventArgs.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// Used by event sources to pass event argument information.
+    /// </summary>
+    [ScriptNamespace("ss")]
+    [Imported]
+    public class EventArgs {
+
+        /// <summary>
+        /// A static object of type <see cref="EventArgs"/> that is used as a convenient way to
+        /// specify an empty EventArgs instance.
+        /// </summary>
+        [PreserveCase]
+        public static readonly EventArgs Empty = null;
+    }
+}
diff --git a/src/Core/CoreLib/EventHandler.cs b/src/Core/CoreLib/EventHandler.cs
new file mode 100644
index 000000000..bbc6e4bce
--- /dev/null
+++ b/src/Core/CoreLib/EventHandler.cs
@@ -0,0 +1,22 @@
+// EventHandler.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// Delegate for handling generic events.
+    /// </summary>
+    /// <param name="sender">The object that raised the event.</param>
+    /// <param name="e">The <see cref="EventArgs"/> object that contains the event data.</param>
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void EventHandler(object sender, EventArgs e);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void EventHandler<TArgument>(object sender, TArgument e) where TArgument : EventArgs;
+}
diff --git a/src/Core/CoreLib/Exception.cs b/src/Core/CoreLib/Exception.cs
new file mode 100644
index 000000000..d656bab17
--- /dev/null
+++ b/src/Core/CoreLib/Exception.cs
@@ -0,0 +1,61 @@
+// Exception.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// Equivalent to the Error type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Error")]
+    public sealed class Exception {
+
+        public Exception(string message) {
+        }
+
+        [IntrinsicProperty]
+        public Exception InnerException {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Message {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("stack")]
+        public string StackTrace {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public object this[string key] {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptAlias("Error.createError")]
+        public static Exception Create(string message, Dictionary errorInfo) {
+            return null;
+        }
+
+        [ScriptAlias("Error.createError")]
+        public static Exception Create(string message, Dictionary errorInfo, Exception innerException) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Func.cs b/src/Core/CoreLib/Func.cs
new file mode 100644
index 000000000..6aac90d78
--- /dev/null
+++ b/src/Core/CoreLib/Func.cs
@@ -0,0 +1,45 @@
+// Func.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate TResult Func<TResult>();
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate TResult Func<T, TResult>(T arg);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate TResult Func<T1, T2, TResult>(T1 arg1, T2 arg2);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate TResult Func<T1, T2, T3, TResult>(T1 arg1, T2 arg2, T3 arg3);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate TResult Func<T1, T2, T3, T4, TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate TResult Func<T1, T2, T3, T4, T5, TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate TResult Func<T1, T2, T3, T4, T5, T6, TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate TResult Func<T1, T2, T3, T4, T5, T6, T7, TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7);
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate TResult Func<T1, T2, T3, T4, T5, T6, T7, T8, TResult>(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8);
+}
diff --git a/src/Core/CoreLib/Function.cs b/src/Core/CoreLib/Function.cs
new file mode 100644
index 000000000..337560146
--- /dev/null
+++ b/src/Core/CoreLib/Function.cs
@@ -0,0 +1,85 @@
+// Function.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// Equivalent to the Function type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    public sealed class Function {
+
+        /// <summary>
+        /// Creates a new function with the specified implementation.
+        /// </summary>
+        /// <param name="functionBody">The implementation of the function.</param>
+        public Function(string functionBody) {
+        }
+
+        /// <summary>
+        /// Creates a new function with the specified implementation, and the
+        /// set of named parameters.
+        /// </summary>
+        /// <param name="functionBody">The implementation of the function.</param>
+        /// <param name="argNames">The names of the arguments required by the function.</param>
+        public Function(string functionBody, params string[] argNames) {
+        }
+
+        /// <summary>
+        /// Gets the number of parameters expected by the function.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Length {
+            get {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// Invokes the function against the specified object instance.
+        /// </summary>
+        /// <param name="instance">The object used as the value of 'this' within the function.</param>
+        /// <returns>Any return value returned from the function.</returns>
+        public object Apply(object instance) {
+            return null;
+        }
+
+        /// <summary>
+        /// Invokes the function against the specified object instance.
+        /// </summary>
+        /// <param name="instance">The object used as the value of 'this' within the function.</param>
+        /// <param name="arguments">The set of arguments to pass in into the function.</param>
+        /// <returns>Any return value returned from the function.</returns>
+        public object Apply(object instance, object[] arguments) {
+            return null;
+        }
+
+        /// <summary>
+        /// Invokes the function against the specified object instance.
+        /// </summary>
+        /// <param name="instance">The object used as the value of 'this' within the function.</param>
+        /// <returns>Any return value returned from the function.</returns>
+        public object Call(object instance) {
+            return null;
+        }
+
+        /// <summary>
+        /// Invokes the function against the specified object instance.
+        /// </summary>
+        /// <param name="instance">The object used as the value of 'this' within the function.</param>
+        /// <param name="arguments">One or more arguments to pass in into the function.</param>
+        /// <returns>Any return value returned from the function.</returns>
+        public object Call(object instance, params object[] arguments) {
+            return null;
+        }
+
+        public static explicit operator Type(Function f) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Globalization/CultureInfo.cs b/src/Core/CoreLib/Globalization/CultureInfo.cs
new file mode 100644
index 000000000..904f06c82
--- /dev/null
+++ b/src/Core/CoreLib/Globalization/CultureInfo.cs
@@ -0,0 +1,54 @@
+// CultureInfo.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Globalization {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    public sealed class CultureInfo {
+
+        private CultureInfo() {
+        }
+
+        [PreserveCase]
+        [IntrinsicProperty]
+        public static CultureInfo CurrentCulture {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public DateFormatInfo DateFormat {
+            get {
+                return null;
+            }
+        }
+
+        [PreserveCase]
+        [IntrinsicProperty]
+        public static CultureInfo InvariantCulture {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Name {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public NumberFormatInfo NumberFormat {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Globalization/DateFormatInfo.cs b/src/Core/CoreLib/Globalization/DateFormatInfo.cs
new file mode 100644
index 000000000..be191f07d
--- /dev/null
+++ b/src/Core/CoreLib/Globalization/DateFormatInfo.cs
@@ -0,0 +1,143 @@
+// DateFormatInfo.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Globalization {
+
+    [IgnoreNamespace]
+    [Imported]
+    public sealed class DateFormatInfo {
+
+        private DateFormatInfo() {
+        }
+
+        [IntrinsicProperty]
+        public string AMDesignator {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string PMDesignator {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string DateSeparator {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string TimeSeparator {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string GMTDateTimePattern {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string UniversalDateTimePattern {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string SortableDateTimePattern {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string DateTimePattern {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string LongDatePattern {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string ShortDatePattern {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string LongTimePattern {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string ShortTimePattern {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public int FirstDayOfWeek {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string[] DayNames {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string[] ShortDayNames {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string[] MinimizedDayNames {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string[] MonthNames {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string[] ShortMonthNames {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Windows/Gadgets/Gadget.cs b/src/Core/CoreLib/Globalization/NumberFormatInfo.cs
similarity index 52%
rename from src/Libraries/Windows/Gadgets/Gadget.cs
rename to src/Core/CoreLib/Globalization/NumberFormatInfo.cs
index 4fb717ff0..d017fc396 100644
--- a/src/Libraries/Windows/Gadgets/Gadget.cs
+++ b/src/Core/CoreLib/Globalization/NumberFormatInfo.cs
@@ -1,177 +1,178 @@
-// Gadget.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// NumberFormatInfo.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
-using System;
-using System.Html;
 using System.Runtime.CompilerServices;
 
-namespace System.Gadgets {
+namespace System.Globalization {
 
-    /// <summary>
-    /// Represents the current gadget.
-    /// </summary>
     [IgnoreNamespace]
     [Imported]
-    public static class Gadget {
+    public sealed class NumberFormatInfo {
+
+        private NumberFormatInfo() {
+        }
 
         [IntrinsicProperty]
-        public static string Background {
+        public string NaNSymbol {
             get {
                 return null;
             }
-            set {
-            }
         }
 
         [IntrinsicProperty]
-        public static DocumentInstance Document {
+        public string NegativeSign {
             get {
                 return null;
             }
         }
 
         [IntrinsicProperty]
-        public static bool Docked {
+        public string PositiveSign {
             get {
-                return false;
-            }
-            set {
+                return null;
             }
         }
 
         [IntrinsicProperty]
-        [PreserveCase]
-        public static GadgetFlyout Flyout {
+        public string NegativeInfinityText {
             get {
                 return null;
             }
         }
 
         [IntrinsicProperty]
-        public static string Name {
+        public string PositiveInfinityText {
             get {
                 return null;
             }
         }
 
         [IntrinsicProperty]
-        public static Action OnDock {
+        public string PercentSymbol {
             get {
                 return null;
             }
-            set {
-            }
         }
 
         [IntrinsicProperty]
-        public static GadgetSettingsDialogCallback OnSettingsClosed {
+        public int[] PercentGroupSizes {
             get {
                 return null;
             }
-            set {
+        }
+
+        [IntrinsicProperty]
+        public int PercentDecimalDigits {
+            get {
+                return 0;
             }
         }
 
         [IntrinsicProperty]
-        public static GadgetSettingsDialogCallback OnSettingsClosing {
+        public string PercentDecimalSeparator {
             get {
                 return null;
             }
-            set {
-            }
         }
 
         [IntrinsicProperty]
-        public static Action OnShowSettings {
+        public string PercentGroupSeparator {
             get {
                 return null;
             }
-            set {
-            }
         }
 
         [IntrinsicProperty]
-        public static Action OnUndock {
+        public string PercentPositivePattern {
             get {
                 return null;
             }
-            set {
-            }
         }
 
         [IntrinsicProperty]
-        public static int Opacity {
+        public string PercentNegativePattern {
             get {
-                return 0;
+                return null;
             }
         }
 
         [IntrinsicProperty]
-        public static string Path {
+        public string CurrencySymbol {
             get {
                 return null;
             }
         }
 
         [IntrinsicProperty]
-        public static string PlatformVersion {
+        public int[] CurrencyGroupSizes {
             get {
                 return null;
             }
         }
 
         [IntrinsicProperty]
-        [PreserveCase]
-        public static GadgetSettings Settings {
+        public int CurrencyDecimalDigits {
             get {
-                return null;
+                return 0;
             }
         }
 
         [IntrinsicProperty]
-        public static string SettingsUI {
+        public string CurrencyDecimalSeparator {
             get {
                 return null;
             }
-            set {
-            }
         }
 
         [IntrinsicProperty]
-        public static string Version {
+        public string CurrencyGroupSeparator {
             get {
                 return null;
             }
         }
 
         [IntrinsicProperty]
-        public static bool Visible {
+        public string CurrencyPositivePattern {
             get {
-                return false;
+                return null;
             }
         }
 
         [IntrinsicProperty]
-        public static Action VisibilityChanged {
+        public string CurrencyNegativePattern {
             get {
                 return null;
             }
-            set {
+        }
+
+        [IntrinsicProperty]
+        public int[] NumberGroupSizes {
+            get {
+                return null;
             }
         }
 
-        public static void BeginTransition() {
+        [IntrinsicProperty]
+        public int NumberDecimalDigits {
+            get {
+                return 0;
+            }
         }
 
-        public static void Close() {
+        [IntrinsicProperty]
+        public string NumberDecimalSeparator {
+            get {
+                return null;
+            }
         }
 
-        public static void EndTransition(GadgetTransition transition, double seconds) {
+        [IntrinsicProperty]
+        public string NumberGroupSeparator {
+            get {
+                return null;
+            }
         }
     }
 }
diff --git a/src/Core/CoreLib/IDisposable.cs b/src/Core/CoreLib/IDisposable.cs
new file mode 100644
index 000000000..036a4f8e7
--- /dev/null
+++ b/src/Core/CoreLib/IDisposable.cs
@@ -0,0 +1,17 @@
+// IDisposable.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    // Script Equivalent: IDisposable
+    [Imported]
+    [ScriptNamespace("ss")]
+    public interface IDisposable {
+
+        void Dispose();
+    }
+}
diff --git a/src/Core/CoreLib/Int16.cs b/src/Core/CoreLib/Int16.cs
new file mode 100644
index 000000000..431f6f916
--- /dev/null
+++ b/src/Core/CoreLib/Int16.cs
@@ -0,0 +1,40 @@
+// Int16.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The short data type which is mapped to the Number type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Number")]
+    public struct Int16 {
+
+        public string Format(string format) {
+            return null;
+        }
+
+        public string LocaleFormat(string format) {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the value to its string representation.
+        /// </summary>
+        /// <param name="radix">The radix used in the conversion (eg. 10 for decimal, 16 for hexadecimal)</param>
+        /// <returns>The string representation of the value.</returns>
+        public string ToString(int radix) {
+            return null;
+        }
+
+        /// <internalonly />
+        public static implicit operator Number(short i) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Int32.cs b/src/Core/CoreLib/Int32.cs
new file mode 100644
index 000000000..3745cb01f
--- /dev/null
+++ b/src/Core/CoreLib/Int32.cs
@@ -0,0 +1,50 @@
+// Int32.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The int data type which is mapped to the Number type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Number")]
+    public struct Int32 {
+
+        public string Format(string format) {
+            return null;
+        }
+
+        public string LocaleFormat(string format) {
+            return null;
+        }
+
+        [ScriptAlias("parseInt")]
+        public static int Parse(string s) {
+            return 0;
+        }
+
+        [ScriptAlias("parseInt")]
+        public static int Parse(string s, int radix) {
+            return 0;
+        }
+
+        /// <summary>
+        /// Converts the value to its string representation.
+        /// </summary>
+        /// <param name="radix">The radix used in the conversion (eg. 10 for decimal, 16 for hexadecimal)</param>
+        /// <returns>The string representation of the value.</returns>
+        public string ToString(int radix) {
+            return null;
+        }
+
+        /// <internalonly />
+        public static implicit operator Number(int i) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Int64.cs b/src/Core/CoreLib/Int64.cs
new file mode 100644
index 000000000..bd7117d65
--- /dev/null
+++ b/src/Core/CoreLib/Int64.cs
@@ -0,0 +1,40 @@
+// Int64.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The long data type which is mapped to the Number type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Number")]
+    public struct Int64 {
+
+        public string Format(string format) {
+            return null;
+        }
+
+        public string LocaleFormat(string format) {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the value to its string representation.
+        /// </summary>
+        /// <param name="radix">The radix used in the conversion (eg. 10 for decimal, 16 for hexadecimal)</param>
+        /// <returns>The string representation of the value.</returns>
+        public string ToString(int radix) {
+            return null;
+        }
+
+        /// <internalonly />
+        public static implicit operator Number(long i) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Math.cs b/src/Core/CoreLib/Math.cs
new file mode 100644
index 000000000..b2d5014d2
--- /dev/null
+++ b/src/Core/CoreLib/Math.cs
@@ -0,0 +1,128 @@
+// Math.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// Equivalent to the Math object in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    public static class Math {
+
+        [PreserveCase]
+        public static double E;
+
+        [PreserveCase]
+        public static double LN2;
+
+        [PreserveCase]
+        public static double LN10;
+
+        [PreserveCase]
+        public static double LOG2E;
+
+        [PreserveCase]
+        public static double LOG10E;
+
+        [PreserveCase]
+        public static double PI;
+
+        [PreserveCase]
+        public static double SQRT1_2;
+
+        [PreserveCase]
+        public static double SQRT2;
+
+        public static Number Abs(Number n) {
+            return 0;
+        }
+
+        public static Number Acos(Number n) {
+            return 0;
+        }
+
+        public static Number Asin(Number n) {
+            return 0;
+        }
+
+        public static Number Atan(Number n) {
+            return 0;
+        }
+
+        public static Number Atan2(Number x, Number y) {
+            return 0;
+        }
+
+        public static Number Ceil(Number n) {
+            return 0;
+        }
+
+        public static Number Cos(Number n) {
+            return 0;
+        }
+
+        public static Number Exp(Number n) {
+            return 0;
+        }
+
+        public static Number Floor(Number n) {
+            return 0;
+        }
+
+        public static Number Log(Number n) {
+            return 0;
+        }
+
+        public static Number Max(params Number[] numbers) {
+            return 0;
+        }
+
+        public static Number Min(params Number[] numbers) {
+            return 0;
+        }
+
+        public static Number Pow(Number baseNumber, Number exponent) {
+            return 0;
+        }
+
+        public static Number Random() {
+            return 0;
+        }
+
+        public static Number Round(Number n) {
+            return 0;
+        }
+
+        public static Number Sin(Number n) {
+            return 0;
+        }
+
+        public static Number Sqrt(Number n) {
+            return 0;
+        }
+
+        public static Number Tan(Number n) {
+            return 0;
+        }
+
+        [ScriptAlias("parseInt")]
+        public static int Truncate(Number n) {
+            return 0;
+        }
+
+        [ScriptAlias("parseInt")]
+        public static int Truncate(double n) {
+            return 0;
+        }
+
+        [ScriptAlias("parseInt")]
+        public static int Truncate(float n) {
+            return 0;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Nullable.cs b/src/Core/CoreLib/Nullable.cs
new file mode 100644
index 000000000..adaba4464
--- /dev/null
+++ b/src/Core/CoreLib/Nullable.cs
@@ -0,0 +1,42 @@
+// Nullable.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [IgnoreNamespace]
+    [Imported]
+    public struct Nullable<T> where T : struct {
+
+        public Nullable(T value) {
+        }
+
+        public bool HasValue {
+            get {
+                return false;
+            }
+        }
+
+        public T Value {
+            get {
+                return default(T);
+            }
+        }
+
+        public T GetValueOrDefault() {
+            return default(T);
+        }
+
+        public static implicit operator T?(T value) {
+            return null;
+        }
+
+        public static explicit operator T(T? value) {
+            return default(T);
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Number.cs b/src/Core/CoreLib/Number.cs
new file mode 100644
index 000000000..dccaf45ee
--- /dev/null
+++ b/src/Core/CoreLib/Number.cs
@@ -0,0 +1,151 @@
+// Number.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// Equivalent to the Number type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    public sealed class Number {
+
+        [PreserveCase]
+        public const int MAX_VALUE = 0;
+
+        [PreserveCase]
+        public const int MIN_VALUE = 0;
+
+        [PreserveCase]
+        public const int NaN = 0;
+
+        [PreserveCase]
+        public const int NEGATIVE_INFINITY = 0;
+
+        [PreserveCase]
+        public const int POSITIVE_INFINITY = 0;
+
+        public string Format(string format) {
+            return null;
+        }
+
+        [ScriptAlias("isFinite")]
+        public static bool IsFinite(Number n) {
+            return false;
+        }
+
+        [ScriptAlias("isNaN")]
+        public static bool IsNaN(Number n) {
+            return false;
+        }
+
+        public string LocaleFormat(string format) {
+            return null;
+        }
+
+        public static Number Parse(string s) {
+            return null;
+        }
+
+        [ScriptAlias("parseFloat")]
+        public static double ParseDouble(string s) {
+            return 0;
+        }
+
+        [ScriptAlias("parseFloat")]
+        public static float ParseFloat(string s) {
+            return 0;
+        }
+
+        [ScriptAlias("parseInt")]
+        public static int ParseInt(float f) {
+            return 0;
+        }
+
+        [ScriptAlias("parseInt")]
+        public static int ParseInt(double d) {
+            return 0;
+        }
+
+        [ScriptAlias("parseInt")]
+        public static int ParseInt(string s) {
+            return 0;
+        }
+
+        [ScriptAlias("parseInt")]
+        public static int ParseInt(string s, int radix) {
+            return 0;
+        }
+
+        /// <summary>
+        /// Returns a string containing the number represented in exponential notation.
+        /// </summary>
+        /// <returns>The exponential representation</returns>
+        public string ToExponential() {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string containing the number represented in exponential notation.
+        /// </summary>
+        /// <param name="fractionDigits">The number of digits after the decimal point (0 - 20)</param>
+        /// <returns>The exponential representation</returns>
+        public string ToExponential(int fractionDigits) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string representing the number in fixed-point notation.
+        /// </summary>
+        /// <returns>The fixed-point notation</returns>
+        public string ToFixed() {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string representing the number in fixed-point notation.
+        /// </summary>
+        /// <param name="fractionDigits">The number of digits after the decimal point from 0 - 20</param>
+        /// <returns>The fixed-point notation</returns>
+        public string ToFixed(int fractionDigits) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string containing the number represented either in exponential or
+        /// fixed-point notation with a specified number of digits.
+        /// </summary>
+        /// <returns>The string representation of the value.</returns>
+        public string ToPrecision() {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string containing the number represented either in exponential or
+        /// fixed-point notation with a specified number of digits.
+        /// </summary>
+        /// <param name="precision">The number of significant digits (in the range 1 to 21)</param>
+        /// <returns>The string representation of the value.</returns>
+        public string ToPrecision(int precision) {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the value to its string representation.
+        /// </summary>
+        /// <param name="radix">The radix used in the conversion (eg. 10 for decimal, 16 for hexadecimal)</param>
+        /// <returns>The string representation of the value.</returns>
+        public string ToString(int radix) {
+            return null;
+        }
+
+        /// <internalonly />
+        public static implicit operator int(Number n) {
+            return 0;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Object.cs b/src/Core/CoreLib/Object.cs
new file mode 100644
index 000000000..2158c0879
--- /dev/null
+++ b/src/Core/CoreLib/Object.cs
@@ -0,0 +1,41 @@
+// Object.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// Equivalent to the Object type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    public class Object {
+
+        /// <summary>
+        /// Retrieves the type associated with an object instance.
+        /// </summary>
+        /// <returns>The type of the object.</returns>
+        public Type GetType() {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts an object to its string representation.
+        /// </summary>
+        /// <returns>The string representation of the object.</returns>
+        public virtual string ToString() {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts an object to its culture-sensitive string representation.
+        /// </summary>
+        /// <returns>The culture-sensitive string representation of the object.</returns>
+        public virtual string ToLocaleString() {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Properties/AssemblyInfo.cs b/src/Core/CoreLib/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..6078594a1
--- /dev/null
+++ b/src/Core/CoreLib/Properties/AssemblyInfo.cs
@@ -0,0 +1,12 @@
+// AssemblyInfo.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("mscorlib")]
+[assembly: AssemblyDescription("Script# Core Assembly")]
+[assembly: ScriptAssembly("core")]
diff --git a/src/Core/CoreLib/Record.cs b/src/Core/CoreLib/Record.cs
new file mode 100644
index 000000000..ecfa6191b
--- /dev/null
+++ b/src/Core/CoreLib/Record.cs
@@ -0,0 +1,37 @@
+// Record.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    public abstract class Record {
+
+        /// <internalonly />
+        public static implicit operator Dictionary(Record r) {
+            return null;
+        }
+
+        /// <internalonly />
+        public static implicit operator Dictionary<string, object>(Record r) {
+            return null;
+        }
+
+        /// <internalonly />
+        public static implicit operator Record(Dictionary d) {
+            return null;
+        }
+
+        /// <internalonly />
+        public static implicit operator Record(Dictionary<string, object> d) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/RegularExpression.cs b/src/Core/CoreLib/RegularExpression.cs
new file mode 100644
index 000000000..a43805d10
--- /dev/null
+++ b/src/Core/CoreLib/RegularExpression.cs
@@ -0,0 +1,80 @@
+// RegularExpression.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// Equivalent to the RegExp type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("RegExp")]
+    public sealed class RegularExpression {
+
+        public RegularExpression(string pattern) {
+        }
+
+        public RegularExpression(string pattern, string flags) {
+        }
+
+        [IntrinsicProperty]
+        public int LastIndex {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public bool Global {
+            get {
+                return false;
+            }
+        }
+
+        [IntrinsicProperty]
+        public bool IgnoreCase {
+            get {
+                return false;
+            }
+        }
+
+        [IntrinsicProperty]
+        public bool Multiline {
+            get {
+                return false;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Pattern {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Source {
+            get {
+                return null;
+            }
+        }
+
+        public string[] Exec(string s) {
+            return null;
+        }
+
+        public static RegularExpression Parse(string s) {
+            return null;
+        }
+
+        public bool Test(string s) {
+            return false;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Runtime.cs b/src/Core/CoreLib/Runtime.cs
new file mode 100644
index 000000000..a905f9ca5
--- /dev/null
+++ b/src/Core/CoreLib/Runtime.cs
@@ -0,0 +1,618 @@
+// Runtime.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [AttributeUsage(AttributeTargets.Enum, Inherited = false, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class FlagsAttribute : Attribute {
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public abstract class MarshalByRefObject {
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public abstract class ValueType {
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public struct IntPtr {
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public struct UIntPtr {
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public abstract class MulticastDelegate : Delegate {
+
+        protected MulticastDelegate(object target, string method)
+            : base(target, method) {
+        }
+
+        protected MulticastDelegate(Type target, string method)
+            : base(target, method) {
+        }
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public struct RuntimeTypeHandle {
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public struct RuntimeFieldHandle {
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public abstract class Attribute {
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public sealed class ParamArrayAttribute : Attribute {
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public enum AttributeTargets {
+        Assembly = 0x0001,
+        Module = 0x0002,
+        Class = 0x0004,
+        Struct = 0x0008,
+        Enum = 0x0010,
+        Constructor = 0x0020,
+        Method = 0x0040,
+        Property = 0x0080,
+        Field = 0x0100,
+        Event = 0x0200,
+        Interface = 0x0400,
+        Parameter = 0x0800,
+        Delegate = 0x1000,
+        ReturnValue = 0x2000,
+        GenericParameter = 0x4000,
+        Type = Class | Struct | Enum | Interface | Delegate,
+        All = Assembly | Module | Class | Struct | Enum | Constructor |
+              Method | Property | Field | Event | Interface | Parameter |
+              Delegate | ReturnValue | GenericParameter,
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [AttributeUsage(AttributeTargets.Class, Inherited = true)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AttributeUsageAttribute : Attribute {
+
+        private AttributeTargets _attributeTarget = AttributeTargets.All;
+        private bool _allowMultiple;
+        private bool _inherited;
+
+        public AttributeUsageAttribute(AttributeTargets validOn) {
+            _attributeTarget = validOn;
+            _inherited = true;
+        }
+
+        public AttributeTargets ValidOn {
+            get {
+                return _attributeTarget;
+            }
+        }
+
+        public bool AllowMultiple {
+            get {
+                return _allowMultiple;
+            }
+            set {
+                _allowMultiple = value;
+            }
+        }
+
+        public bool Inherited {
+            get {
+                return _inherited;
+            }
+            set {
+                _inherited = value;
+            }
+        }
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [AttributeUsage(AttributeTargets.Delegate | AttributeTargets.Interface | AttributeTargets.Event | AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Enum | AttributeTargets.Struct | AttributeTargets.Class, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class ObsoleteAttribute : Attribute {
+
+        private bool _error;
+        private string _message;
+
+        public ObsoleteAttribute() {
+        }
+
+        public ObsoleteAttribute(string message) {
+            _message = message;
+        }
+
+        public ObsoleteAttribute(string message, bool error) {
+            _message = message;
+            _error = error;
+        }
+
+        public bool IsError {
+            get {
+                return _error;
+            }
+        }
+
+        public string Message {
+            get {
+                return _message;
+            }
+        }
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [AttributeUsage(AttributeTargets.All, Inherited = true, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class CLSCompliantAttribute : Attribute {
+
+        private bool _isCompliant;
+
+        public CLSCompliantAttribute(bool isCompliant) {
+            _isCompliant = isCompliant;
+        }
+
+        public bool IsCompliant {
+            get {
+                return _isCompliant;
+            }
+        }
+    }
+}
+
+namespace System.CodeDom.Compiler {
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [AttributeUsage(AttributeTargets.All, Inherited = false, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class GeneratedCodeAttribute : Attribute {
+
+        private string _tool;
+        private string _version;
+
+        public GeneratedCodeAttribute(string tool, string version) {
+            _tool = tool;
+            _version = version;
+        }
+
+        public string Tool {
+            get {
+                return _tool;
+            }
+        }
+
+        public string Version {
+            get {
+                return _version;
+            }
+        }
+    }
+}
+
+namespace System.ComponentModel {
+
+    /// <summary>
+    /// This attribute marks a field, property, event or method as
+    /// "browsable", i.e. present in the type descriptor associated with
+    /// the type.
+    /// </summary>
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [AttributeUsage(AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Event | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class BrowsableAttribute : Attribute {
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Constructor | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Event | AttributeTargets.Delegate | AttributeTargets.Interface)]
+    [NonScriptable]
+    [Imported]
+    public sealed class EditorBrowsableAttribute : Attribute {
+
+        private EditorBrowsableState _browsableState;
+
+        public EditorBrowsableAttribute(EditorBrowsableState state) {
+            _browsableState = state;
+        }
+
+        public EditorBrowsableState State {
+            get {
+                return _browsableState;
+            }
+        }
+    }
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public enum EditorBrowsableState {
+        Always = 0,
+        Never = 1,
+        Advanced = 2
+    }
+}
+
+namespace System.Reflection {
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public sealed class DefaultMemberAttribute {
+
+        private string _memberName;
+
+        public DefaultMemberAttribute(string memberName) {
+            _memberName = memberName;
+        }
+
+        public string MemberName {
+            get {
+                return _memberName;
+            }
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AssemblyCopyrightAttribute : Attribute {
+
+        private string _copyright;
+
+        public AssemblyCopyrightAttribute(string copyright) {
+            _copyright = copyright;
+        }
+
+        public string Copyright {
+            get {
+                return _copyright;
+            }
+        }
+    }
+
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AssemblyTrademarkAttribute : Attribute {
+
+        private string _trademark;
+
+        public AssemblyTrademarkAttribute(string trademark) {
+            _trademark = trademark;
+        }
+
+        public string Trademark {
+            get {
+                return _trademark;
+            }
+        }
+    }
+
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AssemblyProductAttribute : Attribute {
+
+        private string _product;
+
+        public AssemblyProductAttribute(string product) {
+            _product = product;
+        }
+
+        public string Product {
+            get {
+                return _product;
+            }
+        }
+    }
+
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AssemblyCompanyAttribute : Attribute {
+
+        private string _company;
+
+        public AssemblyCompanyAttribute(string company) {
+            _company = company;
+        }
+
+        public string Company {
+            get {
+                return _company;
+            }
+        }
+    }
+
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AssemblyDescriptionAttribute : Attribute {
+
+        private string _description;
+
+        public AssemblyDescriptionAttribute(string description) {
+            _description = description;
+        }
+
+        public string Description {
+            get {
+                return _description;
+            }
+        }
+    }
+
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AssemblyTitleAttribute : Attribute {
+
+        private string _title;
+
+        public AssemblyTitleAttribute(string title) {
+            _title = title;
+        }
+
+        public string Title {
+            get {
+                return _title;
+            }
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AssemblyConfigurationAttribute : Attribute {
+
+        private string _configuration;
+
+        public AssemblyConfigurationAttribute(string configuration) {
+            _configuration = configuration;
+        }
+
+        public string Configuration {
+            get {
+                return _configuration;
+            }
+        }
+    }
+
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AssemblyFileVersionAttribute : Attribute {
+
+        private string _version;
+
+        public AssemblyFileVersionAttribute(string version) {
+            _version = version;
+        }
+
+        public string Version {
+            get {
+                return _version;
+            }
+        }
+    }
+
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AssemblyInformationalVersionAttribute : Attribute {
+
+        private string _informationalVersion;
+
+        public AssemblyInformationalVersionAttribute(string informationalVersion) {
+            _informationalVersion = informationalVersion;
+        }
+
+        public string InformationalVersion {
+            get {
+                return _informationalVersion;
+            }
+        }
+    }
+
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AssemblyCultureAttribute : Attribute {
+
+        private string _culture;
+
+        public AssemblyCultureAttribute(string culture) {
+            _culture = culture;
+        }
+
+        public string Culture {
+            get {
+                return _culture;
+            }
+        }
+    }
+
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AssemblyVersionAttribute : Attribute {
+
+        private string _version;
+
+        public AssemblyVersionAttribute(string version) {
+            _version = version;
+        }
+
+        public string Version {
+            get {
+                return _version;
+            }
+        }
+    }
+
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AssemblyKeyFileAttribute : Attribute {
+
+        private string _keyFile;
+
+        public AssemblyKeyFileAttribute(string keyFile) {
+            _keyFile = keyFile;
+        }
+
+        public string KeyFile {
+            get {
+                return _keyFile;
+            }
+        }
+    }
+
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AssemblyDelaySignAttribute : Attribute {
+
+        private bool _delaySign;
+
+        public AssemblyDelaySignAttribute(bool delaySign) {
+            _delaySign = delaySign;
+        }
+
+        public bool DelaySign {
+            get {
+                return _delaySign;
+            }
+        }
+    }
+}
+
+namespace System.Runtime.CompilerServices {
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public class RuntimeHelpers {
+
+        public static void InitializeArray(Array array, RuntimeFieldHandle handle) {
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.All, Inherited = true)]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public sealed class CompilerGeneratedAttribute : Attribute {
+
+        public CompilerGeneratedAttribute() {
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field, Inherited = false)]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public sealed class DecimalConstantAttribute : Attribute {
+
+        public DecimalConstantAttribute(byte scale, byte sign, int hi, int mid, int low) {
+        }
+
+        [CLSCompliant(false)]
+        public DecimalConstantAttribute(byte scale, byte sign, uint hi, uint mid, uint low) {
+        }
+
+        public decimal Value {
+            get {
+                return 0m;
+            }
+        }
+    }
+}
+
+namespace System.Runtime.InteropServices {
+
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [NonScriptable]
+    [Imported]
+    public class OutAttribute {
+    }
+}
+
+namespace System.Runtime.Versioning {
+
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class TargetFrameworkAttribute : Attribute {
+
+        private string _frameworkName;
+        private string _frameworkDisplayName;
+
+        public TargetFrameworkAttribute(string frameworkName) {
+            _frameworkName = frameworkName;
+        }
+
+        public string FrameworkDisplayName {
+            get {
+                return _frameworkDisplayName;
+            }
+            set {
+                _frameworkDisplayName = value;
+            }
+        }
+
+        public string FrameworkName {
+            get {
+                return _frameworkName;
+            }
+        }
+    }
+}
diff --git a/src/Core/CoreLib/SByte.cs b/src/Core/CoreLib/SByte.cs
new file mode 100644
index 000000000..0565ecd57
--- /dev/null
+++ b/src/Core/CoreLib/SByte.cs
@@ -0,0 +1,41 @@
+// SByte.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The signed byte data type which is mapped to the Number type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Number")]
+    public struct SByte {
+
+        public string Format(string format) {
+            return null;
+        }
+
+        public string LocaleFormat(string format) {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the value to its string representation.
+        /// </summary>
+        /// <param name="radix">The radix used in the conversion (eg. 10 for decimal, 16 for hexadecimal)</param>
+        /// <returns>The string representation of the value.</returns>
+        public string ToString(int radix) {
+            return null;
+        }
+
+        /// <internalonly />
+        [CLSCompliant(false)]
+        public static implicit operator Number(sbyte i) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Script.cs b/src/Core/CoreLib/Script.cs
new file mode 100644
index 000000000..09e63423e
--- /dev/null
+++ b/src/Core/CoreLib/Script.cs
@@ -0,0 +1,232 @@
+// Script.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The Script class contains various methods that represent global
+    /// methods present in the underlying script engine.
+    /// </summary>
+    [GlobalMethods]
+    [IgnoreNamespace]
+    [Imported]
+    public static class Script {
+
+        /// <summary>
+        /// Converts an object into a boolean.
+        /// </summary>
+        /// <param name="o">The object to convert.</param>
+        /// <returns>true if the object is not null, zero, empty string or undefined.</returns>
+        public static bool Boolean(object o) {
+            return false;
+        }
+
+        public static void ClearInterval(int intervalID) {
+        }
+
+        public static void ClearTimeout(int timeoutID) {
+        }
+
+        /// <summary>
+        /// Prompts the user with a yes/no question.
+        /// </summary>
+        /// <param name="message">The text of the question.</param>
+        /// <returns>true if the user chooses yes; false otherwise.</returns>
+        [Obsolete("Use Window.Confirm instead.", true)]
+        public static bool Confirm(string message) {
+            return false;
+        }
+
+        public static object CreateInstance(Type type, params object[] arguments) {
+            return null;
+        }
+
+        public static void DeleteField(object instance, string name) {
+        }
+
+        public static void DeleteField(Type type, string name) {
+        }
+
+        /// <summary>
+        /// Enables you to evaluate (or execute) an arbitrary script
+        /// literal. This includes JSON literals, where the return
+        /// value is the deserialized object graph.
+        /// </summary>
+        /// <param name="s">The script to be evaluated.</param>
+        /// <returns>The result of the evaluation.</returns>
+        public static object Eval(string s) {
+            return null;
+        }
+
+        public static object GetField(object instance, string name) {
+            return null;
+        }
+
+        public static T GetField<T>(object instance, string name) {
+            return default(T);
+        }
+
+        public static object GetField(Type type, string name) {
+            return null;
+        }
+
+        public static T GetField<T>(Type type, string name) {
+            return default(T);
+        }
+
+        public static string GetScriptType(object instance) {
+            return null;
+        }
+
+        public static bool HasField(object instance, string name) {
+            return false;
+        }
+
+        public static bool HasField(Type type, string name) {
+            return false;
+        }
+
+        public static bool HasMethod(object instance, string name) {
+            return false;
+        }
+
+        public static bool HasMethod(Type type, string name) {
+            return false;
+        }
+
+        public static object InvokeMethod(object instance, string name, params object[] args) {
+            return null;
+        }
+
+        public static T InvokeMethod<T>(object instance, string name, params object[] args) {
+            return default(T);
+        }
+
+        public static object InvokeMethod(Type type, string name, params object[] args) {
+            return null;
+        }
+
+        public static T InvokeMethod<T>(Type type, string name, params object[] args) {
+            return default(T);
+        }
+
+        /// <summary>
+        /// Checks if the specified object is null.
+        /// </summary>
+        /// <param name="o">The object to test against null.</param>
+        /// <returns>true if the object is null; false otherwise.</returns>
+        [ScriptAlias("ss.isNull")]
+        public static bool IsNull(object o) {
+            return false;
+        }
+
+        /// <summary>
+        /// Checks if the specified object is null or undefined.
+        /// The object passed in should be a local variable, and not
+        /// a member of a class (to avoid potential script warnings).
+        /// </summary>
+        /// <param name="o">The object to test against null or undefined.</param>
+        /// <returns>true if the object is null or undefined; false otherwise.</returns>
+        [ScriptAlias("ss.isNullOrUndefined")]
+        public static bool IsNullOrUndefined(object o) {
+            return false;
+        }
+
+        /// <summary>
+        /// Checks if the specified object is undefined.
+        /// The object passed in should be a local variable, and not
+        /// a member of a class (to avoid potential script warnings).
+        /// </summary>
+        /// <param name="o">The object to test against undefined.</param>
+        /// <returns>true if the object is undefined; false otherwise.</returns>
+        [ScriptAlias("ss.isUndefined")]
+        public static bool IsUndefined(object o) {
+            return false;
+        }
+
+        /// <summary>
+        /// Checks if the specified object has a value, i.e. it is not
+        /// null or undefined.
+        /// </summary>
+        /// <param name="o">The object to test.</param>
+        /// <returns>true if the object represents a value; false otherwise.</returns>
+        [ScriptAlias("ss.isValue")]
+        public static bool IsValue(object o) {
+            return false;
+        }
+
+        /// <summary>
+        /// Enables you to generate an arbitrary (literal) script expression.
+        /// The script can contain simple String.Format style tokens (such as
+        /// {0}, {1}, ...) to be replaced with the specified arguments.
+        /// </summary>
+        /// <param name="script">The script expression to be evaluated.</param>
+        /// <param name="args">Optional arguments matching tokens in the script.</param>
+        /// <returns>The result of the script expression.</returns>
+        public static object Literal(string script, params object[] args) {
+            return null;
+        }
+
+        public static void SetField(object instance, string name, object value) {
+        }
+
+        public static void SetField(Type type, string name, object value) {
+        }
+
+        public static int SetInterval(string code, int milliseconds) {
+            return 0;
+        }
+
+        public static int SetInterval(Action callback, int milliseconds) {
+            return 0;
+        }
+
+        public static int SetInterval<T>(Action<T> callback, int milliseconds, T arg) {
+            return 0;
+        }
+
+        public static int SetInterval<T1, T2>(Action<T1, T2> callback, int milliseconds, T1 arg1, T2 arg2) {
+            return 0;
+        }
+
+        public static int SetInterval(Delegate d, int milliseconds, params object[] args) {
+            return 0;
+        }
+
+        public static int SetTimeout(string code, int milliseconds) {
+            return 0;
+        }
+
+        public static int SetTimeout(Action callback, int milliseconds) {
+            return 0;
+        }
+
+        public static int SetTimeout<T>(Action<T> callback, int milliseconds, T arg) {
+            return 0;
+        }
+
+        public static int SetTimeout<T1, T2>(Action<T1, T2> callback, int milliseconds, T1 arg1, T2 arg2) {
+            return 0;
+        }
+
+        public static int SetTimeout(Delegate d, int milliseconds, params object[] args) {
+            return 0;
+        }
+
+        /// <summary>
+        /// Gets the first valid (non-null, non-undefined, non-empty) value.
+        /// </summary>
+        /// <typeparam name="TValue">The type of the value.</typeparam>
+        /// <param name="value">The value to check for validity.</param>
+        /// <param name="alternateValue">The alternate value to use if the first is invalid.</param>
+        /// <param name="alternateValues">Additional alternative values to use if the first is invalid.</param>
+        /// <returns>The first valid value.</returns>
+        public static TValue Value<TValue>(TValue value, TValue alternateValue, params TValue[] alternateValues) {
+            return default(TValue);
+        }
+    }
+}
diff --git a/src/Core/CoreLib/ScriptMetadata.cs b/src/Core/CoreLib/ScriptMetadata.cs
new file mode 100644
index 000000000..1d4d51295
--- /dev/null
+++ b/src/Core/CoreLib/ScriptMetadata.cs
@@ -0,0 +1,273 @@
+// ScriptMetadata.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System.Runtime.CompilerServices {
+
+    /// <summary>
+    /// This attribute can be placed on types in system script assemblies that should not
+    /// be imported. It is only meant to be used within mscorlib.dll.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Interface | AttributeTargets.Delegate | AttributeTargets.Constructor | AttributeTargets.Method | AttributeTargets.Property, Inherited = false, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public sealed class NonScriptableAttribute : Attribute {
+    }
+
+    /// <summary>
+    /// This attribute can be placed on types that should not be emitted into generated
+    /// script, as they represent existing script or native types.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Enum | AttributeTargets.Delegate | AttributeTargets.Struct)]
+    [NonScriptable]
+    [Imported]
+    public sealed class ImportedAttribute : Attribute {
+    }
+
+    /// <summary>
+    /// Marks an assembly as a script assembly that can be used with Script#.
+    /// Additionally, each script must have a unique name that can be used as
+    /// a dependency name.
+    /// This name is also used to generate unique names for internal types defined
+    /// within the assembly. The ScriptQualifier attribute can be used to provide a
+    /// shorter name if needed.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class ScriptAssemblyAttribute : Attribute {
+
+        private string _name;
+
+        public ScriptAssemblyAttribute(string name) {
+            _name = name;
+        }
+
+        public string Name {
+            get {
+                return _name;
+            }
+        }
+    }
+
+    /// <summary>
+    /// Provides a prefix to use when generating types internal to this assembly so that
+    /// they can be unique within a given a script namespace.
+    /// The specified prefix overrides the script name provided in the ScriptAssembly
+    /// attribute.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Assembly, Inherited = false, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class ScriptQualifierAttribute : Attribute {
+
+        private string _prefix;
+
+        public ScriptQualifierAttribute(string prefix) {
+            _prefix = prefix;
+        }
+
+        public string Prefix {
+            get {
+                return _prefix;
+            }
+        }
+    }
+
+    /// <summary>
+    /// This attribute indicates that the namespace of type within a system assembly
+    /// should be ignored at script generation time. It is useful for creating namespaces
+    /// for the purpose of c# code that don't exist at runtime.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Enum | AttributeTargets.Delegate | AttributeTargets.Interface | AttributeTargets.Struct, Inherited = true, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class IgnoreNamespaceAttribute : Attribute {
+    }
+
+    /// <summary>
+    /// Specifies the namespace that should be used in generated script. The script namespace
+    /// is typically a short name, that is often shared across multiple assemblies.
+    /// The developer is responsible for ensuring that public types across assemblies that share
+    /// a script namespace are unique.
+    /// For internal types, the ScriptQualifier attribute can be used to provide a short prefix
+    /// to generate unique names.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Type, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class ScriptNamespaceAttribute : Attribute {
+
+        private string _name;
+
+        public ScriptNamespaceAttribute(string name) {
+            _name = name;
+        }
+
+        public string Name {
+            get {
+                return _name;
+            }
+        }
+    }
+
+    /// <summary>
+    /// This attribute can be placed on a static class that only contains static string
+    /// fields representing a set of resource strings.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class)]
+    [NonScriptable]
+    [Imported]
+    public sealed class ResourcesAttribute : Attribute {
+    }
+
+    /// <summary>
+    /// This attribute turns methods on a static class as global methods in the generated
+    /// script. Note that the class must be static, and must contain only methods.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = true)]
+    [NonScriptable]
+    [Imported]
+    public sealed class GlobalMethodsAttribute : Attribute {
+    }
+
+    [AttributeUsage(AttributeTargets.Class, Inherited = false, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class MixinAttribute : Attribute {
+
+        private string _expression;
+
+        public MixinAttribute(string expression) {
+            _expression = expression;
+        }
+
+        public string Expression {
+            get {
+                return _expression;
+            }
+        }
+    }
+
+    /// <summary>
+    /// This attribute marks an enumeration type within a system assembly as as a set of
+    /// names. Rather than the specific value, the name of the enumeration field is
+    /// used as a string.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Enum, Inherited = false, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class NamedValuesAttribute : Attribute {
+    }
+
+    /// <summary>
+    /// This attribute marks an enumeration type within a system assembly as as a set of
+    /// numeric values. Rather than the enum field, the value of the enumeration field is
+    /// used as a literal.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Enum, Inherited = false, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class NumericValuesAttribute : Attribute {
+    }
+
+    /// <summary>
+    /// This attribute allows defining an alternate method signature that is not generated
+    /// into script, but can be used for defining overloads to enable optional parameter semantics
+    /// for a method. It must be applied on a method defined as extern, since an alternate signature
+    /// method does not contain an actual method body.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Constructor | AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class AlternateSignatureAttribute : Attribute {
+    }
+
+    /// <summary>
+    /// This attribute denotes a C# property that manifests like a field in the generated
+    /// JavaScript (i.e. is not accessed via get/set methods). This is really meant only
+    /// for use when defining OM corresponding to native objects exposed to script.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class IntrinsicPropertyAttribute : Attribute {
+    }
+
+    /// <summary>
+    /// Allows specifying the name to use for a type or member in the generated script.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Method | AttributeTargets.Event, Inherited = false, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class ScriptNameAttribute : Attribute {
+
+        private string _name;
+
+        public ScriptNameAttribute(string name) {
+            _name = name;
+        }
+
+        public string Name {
+            get {
+                return _name;
+            }
+        }
+    }
+
+    /// <summary>
+    /// This attribute allows suppressing the default behavior of converting
+    /// member names to camel-cased equivalents in the generated JavaScript.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Event | AttributeTargets.Field, Inherited = true, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class PreserveCaseAttribute : Attribute {
+    }
+
+    /// <summary>
+    /// This attribute allows suppressing the default behavior of minimizing
+    /// private type names and member names in the generated JavaScript.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Event | AttributeTargets.Field, Inherited = true, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class PreserveNameAttribute : Attribute {
+    }
+
+    /// <summary>
+    /// This attribute allows specifying a script name for an imported method.
+    /// The method is interpreted as a global method. As a result it this attribute
+    /// only applies to static methods.
+    /// </summary>
+    // REVIEW: Eventually do we want to support this on properties/field and instance methods as well?
+    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Property, Inherited = true, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class ScriptAliasAttribute : Attribute {
+
+        private string _alias;
+
+        public ScriptAliasAttribute(string alias) {
+            _alias = alias;
+        }
+
+        public string Alias {
+            get {
+                return _alias;
+            }
+        }
+    }
+
+    [AttributeUsage(AttributeTargets.Method, Inherited = true, AllowMultiple = false)]
+    [NonScriptable]
+    [Imported]
+    public sealed class ScriptSkipAttribute : Attribute {
+    }
+}
diff --git a/src/Core/CoreLib/Serialization/Json.cs b/src/Core/CoreLib/Serialization/Json.cs
new file mode 100644
index 000000000..a3bb1a359
--- /dev/null
+++ b/src/Core/CoreLib/Serialization/Json.cs
@@ -0,0 +1,129 @@
+// Json.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Serialization {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("JSON")]
+    public static class Json {
+
+        /// <summary>
+        /// Parses the specified JSON text.
+        /// </summary>
+        /// <param name="json">The JSON text to be parsed.</param>
+        /// <returns>The deserialized object.</returns>
+        public static object Parse(string json) {
+            return null;
+        }
+
+        /// <summary>
+        /// Parses the specified JSON text.
+        /// </summary>
+        /// <param name="json">The JSON text to be parsed.</param>
+        /// <returns>The deserialized object.</returns>
+        [ScriptName("parse")]
+        public static TData ParseData<TData>(string json) {
+            return default(TData);
+        }
+
+        /// <summary>
+        /// Parses the specified JSON text.
+        /// </summary>
+        /// <param name="json">The JSON text to be parsed.</param>
+        /// <param name="parseCallback">A callback to invoke on each value that is deserialized.</param>
+        /// <returns>The deserialized object.</returns>
+        public static object Parse(string json, JsonParseCallback parseCallback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Parses the specified JSON text.
+        /// </summary>
+        /// <param name="json">The JSON text to be parsed.</param>
+        /// <param name="parseCallback">A callback to invoke on each value that is deserialized.</param>
+        /// <returns>The deserialized object.</returns>
+        [ScriptName("parse")]
+        public static TData ParseData<TData>(string json, JsonParseCallback parseCallback) {
+            return default(TData);
+        }
+
+        /// <summary>
+        /// Serializes the specified object into JSON representation.
+        /// </summary>
+        /// <param name="o">The object to serialize.</param>
+        /// <returns>The serialized value as JSON text.</returns>
+        public static string Stringify(object o) {
+            return null;
+        }
+
+        /// <summary>
+        /// Serializes the specified object into JSON representation.
+        /// </summary>
+        /// <param name="o">The object to serialize.</param>
+        /// <param name="serializableMembers">The specific members to serialize and their order.</param>
+        /// <returns>The serialized value as JSON text.</returns>
+        public static string Stringify(object o, string[] serializableMembers) {
+            return null;
+        }
+
+        /// <summary>
+        /// Serializes the specified object into JSON representation.
+        /// </summary>
+        /// <param name="o">The object to serialize.</param>
+        /// <param name="serializableMembers">The specific members to serialize and their order.</param>
+        /// <param name="indentSpaces">The number of spaces to use for indentation.</param>
+        /// <returns>The serialized value as JSON text.</returns>
+        public static string Stringify(object o, string[] serializableMembers, int indentSpaces) {
+            return null;
+        }
+
+        /// <summary>
+        /// Serializes the specified object into JSON representation.
+        /// </summary>
+        /// <param name="o">The object to serialize.</param>
+        /// <param name="serializableMembers">The specific members to serialize and their order.</param>
+        /// <param name="indentText">The string to use for indentation.</param>
+        /// <returns>The serialized value as JSON text.</returns>
+        public static string Stringify(object o, string[] serializableMembers, string indentText) {
+            return null;
+        }
+
+        /// <summary>
+        /// Serializes the specified object into JSON representation.
+        /// </summary>
+        /// <param name="o">The object to serialize.</param>
+        /// <param name="callback">A callback to invoke for each value being serialized.</param>
+        /// <returns>The serialized value as JSON text.</returns>
+        public static string Stringify(object o, JsonStringifyCallback callback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Serializes the specified object into JSON representation.
+        /// </summary>
+        /// <param name="o">The object to serialize.</param>
+        /// <param name="callback">A callback to invoke for each value being serialized.</param>
+        /// <param name="indentSpaces">The number of spaces to use for indentation.</param>
+        /// <returns>The serialized value as JSON text.</returns>
+        public static string Stringify(object o, JsonStringifyCallback callback, int indentSpaces) {
+            return null;
+        }
+
+        /// <summary>
+        /// Serializes the specified object into JSON representation.
+        /// </summary>
+        /// <param name="o">The object to serialize.</param>
+        /// <param name="callback">A callback to invoke for each value being serialized.</param>
+        /// <param name="indentText">The string to use for indentation.</param>
+        /// <returns>The serialized value as JSON text.</returns>
+        public static string Stringify(object o, JsonStringifyCallback callback, string indentText) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Serialization/JsonParseCallback.cs b/src/Core/CoreLib/Serialization/JsonParseCallback.cs
new file mode 100644
index 000000000..3712e8e7c
--- /dev/null
+++ b/src/Core/CoreLib/Serialization/JsonParseCallback.cs
@@ -0,0 +1,23 @@
+// JsonParseCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Serialization {
+
+    /// <summary>
+    /// A function that filters and transforms objects deserialized from JSON text.
+    /// If the callback returns the same value, the member is left unmodified. If
+    /// the callback returns null, the member is removed. Otherwise the new value
+    /// returned from the callback is used instead.
+    /// </summary>
+    /// <param name="name">The name of the member.</param>
+    /// <param name="value">The value of the member.</param>
+    /// <returns>The transformed value.</returns>
+    [Imported]
+    [IgnoreNamespace]
+    public delegate object JsonParseCallback(string name, object value);
+}
diff --git a/src/Core/CoreLib/Serialization/JsonStringifyCallback.cs b/src/Core/CoreLib/Serialization/JsonStringifyCallback.cs
new file mode 100644
index 000000000..322341004
--- /dev/null
+++ b/src/Core/CoreLib/Serialization/JsonStringifyCallback.cs
@@ -0,0 +1,22 @@
+// JsonStringifyCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Serialization {
+
+    /// <summary>
+    /// A function that filters and serializes objects being serialized into JSON text.
+    /// If the callback returns undefined, the member is not serialized. Otherwise the new
+    /// value returned from the callback is serialized instead.
+    /// </summary>
+    /// <param name="name">The name of the member.</param>
+    /// <param name="value">The value of the member.</param>
+    /// <returns>The value to be serialized.</returns>
+    [Imported]
+    [IgnoreNamespace]
+    public delegate object JsonStringifyCallback(string name, object value);
+}
diff --git a/src/Core/CoreLib/Single.cs b/src/Core/CoreLib/Single.cs
new file mode 100644
index 000000000..4556144f3
--- /dev/null
+++ b/src/Core/CoreLib/Single.cs
@@ -0,0 +1,91 @@
+// Single.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Collections;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The float data type which is mapped to the Number type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Number")]
+    public struct Single {
+
+        public string Format(string format) {
+            return null;
+        }
+
+        public string LocaleFormat(string format) {
+            return null;
+        }
+
+        [ScriptAlias("parseFloat")]
+        public static float Parse(string s) {
+            return 0;
+        }
+
+        /// <summary>
+        /// Returns a string containing the value represented in exponential notation.
+        /// </summary>
+        /// <returns>The exponential representation</returns>
+        public string ToExponential() {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string containing the value represented in exponential notation.
+        /// </summary>
+        /// <param name="fractionDigits">The number of digits after the decimal point (0 - 20)</param>
+        /// <returns>The exponential representation</returns>
+        public string ToExponential(int fractionDigits) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string representing the value in fixed-point notation.
+        /// </summary>
+        /// <returns>The fixed-point notation</returns>
+        public string ToFixed() {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string representing the value in fixed-point notation.
+        /// </summary>
+        /// <param name="fractionDigits">The number of digits after the decimal point from 0 - 20</param>
+        /// <returns>The fixed-point notation</returns>
+        public string ToFixed(int fractionDigits) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string containing the value represented either in exponential or
+        /// fixed-point notation with a specified number of digits.
+        /// </summary>
+        /// <returns>The string representation of the value.</returns>
+        public string ToPrecision() {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a string containing the value represented either in exponential or
+        /// fixed-point notation with a specified number of digits.
+        /// </summary>
+        /// <param name="precision">The number of significant digits (in the range 1 to 21)</param>
+        /// <returns>The string representation of the value.</returns>
+        public string ToPrecision(int precision) {
+            return null;
+        }
+
+        /// <internalonly />
+        public static implicit operator Number(float i) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/String.cs b/src/Core/CoreLib/String.cs
new file mode 100644
index 000000000..e6b28f70d
--- /dev/null
+++ b/src/Core/CoreLib/String.cs
@@ -0,0 +1,429 @@
+// String.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// Equivalent to the String type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    public sealed class String {
+
+        /// <summary>
+        /// An empty zero-length string.
+        /// </summary>
+        [PreserveCase]
+        public static readonly String Empty = "";
+
+        /// <summary>
+        /// The number of characters in the string.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Length {
+            get {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the character at the specified position.
+        /// </summary>
+        /// <param name="index">The specified 0-based position.</param>
+        /// <returns>The character within the string.</returns>
+        [IntrinsicProperty]
+        public char this[int index] {
+            get {
+                return '\0';
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the character at the specified position.
+        /// </summary>
+        /// <param name="index">The specified 0-based position.</param>
+        /// <returns>The character within the string.</returns>
+        public char CharAt(int index) {
+            return '\0';
+        }
+
+        /// <summary>
+        /// Retrieves the character code of the character at the specified position.
+        /// </summary>
+        /// <param name="index">The specified 0-based position.</param>
+        /// <returns>The character code of the character within the string.</returns>
+        public int CharCodeAt(int index) {
+            return 0;
+        }
+
+        public static int Compare(string s1, string s2) {
+            return 0;
+        }
+
+        public static int Compare(string s1, string s2, bool ignoreCase) {
+            return 0;
+        }
+
+        public int CompareTo(string s) {
+            return 0;
+        }
+
+        public int CompareTo(string s, bool ignoreCase) {
+            return 0;
+        }
+
+        public static string Concat(string s1, string s2) {
+            return null;
+        }
+
+        public static string Concat(string s1, string s2, string s3) {
+            return null;
+        }
+
+        public static string Concat(string s1, string s2, string s3, string s4) {
+            return null;
+        }
+
+        /// <summary>
+        /// Concatenates a set of individual strings into a single string.
+        /// </summary>
+        /// <param name="strings">The sequence of strings</param>
+        /// <returns>The concatenated string.</returns>
+        public static string Concat(params string[] strings) {
+            return null;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static string Concat(object o1, object o2) {
+            return null;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static string Concat(object o1, object o2, object o3) {
+            return null;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static string Concat(object o1, object o2, object o3, object o4) {
+            return null;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static string Concat(params object[] o) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the unencoded version of a complete encoded URI.
+        /// </summary>
+        /// <returns>The unencoded string.</returns>
+        [ScriptName("decodeURI")]
+        public string DecodeUri() {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the unencoded version of a single part or component of an encoded URI.
+        /// </summary>
+        /// <returns>The unencoded string.</returns>
+        [ScriptName("decodeURIComponent")]
+        public string DecodeUriComponent() {
+            return null;
+        }
+
+        /// <summary>
+        /// Encodes the complete URI.
+        /// </summary>
+        /// <returns>The encoded string.</returns>
+        [ScriptName("encodeURI")]
+        public string EncodeUri() {
+            return null;
+        }
+
+        /// <summary>
+        /// Encodes a single part or component of a URI.
+        /// </summary>
+        /// <returns>The encoded string.</returns>
+        [ScriptName("encodeURIComponent")]
+        public string EncodeUriComponent() {
+            return null;
+        }
+
+        /// <summary>
+        /// Determines if the string ends with the specified character.
+        /// </summary>
+        /// <param name="ch">The character to test for.</param>
+        /// <returns>true if the string ends with the character; false otherwise.</returns>
+        public bool EndsWith(char ch) {
+            return false;
+        }
+
+        /// <summary>
+        /// Determines if the string ends with the specified substring or suffix.
+        /// </summary>
+        /// <param name="suffix">The string to test for.</param>
+        /// <returns>true if the string ends with the suffix; false otherwise.</returns>
+        public bool EndsWith(string suffix) {
+            return false;
+        }
+
+        /// <summary>
+        /// Determines if the strings are equal.
+        /// </summary>
+        /// <returns>true if the string s1 = s2; false otherwise.</returns>
+        public static bool Equals(string s1, string s2, bool ignoreCase) {
+            return false;
+        }
+
+        /// <summary>
+        /// Encodes a string by replacing punctuation, spaces etc. with their escaped equivalents.
+        /// </summary>
+        /// <returns>The escaped string.</returns>
+        public string Escape() {
+            return null;
+        }
+
+        public static string Format(string format, params object[] values) {
+            return null;
+        }
+
+        public static string FromChar(char ch, int count) {
+            return null;
+        }
+
+        public static string FromCharCode(params int[] charCodes) {
+            return null;
+        }
+
+        public string HtmlDecode() {
+            return null;
+        }
+
+        public string HtmlEncode() {
+            return null;
+        }
+
+        public int IndexOf(char ch) {
+            return 0;
+        }
+
+        public int IndexOf(string subString) {
+            return 0;
+        }
+
+        public int IndexOf(char ch, int startIndex) {
+            return 0;
+        }
+
+        public int IndexOf(string subString, int startIndex) {
+            return 0;
+        }
+
+        public int IndexOfAny(char[] ch) {
+            return 0;
+        }
+
+        public int IndexOfAny(char[] ch, int startIndex) {
+            return 0;
+        }
+
+        public int IndexOfAny(char[] ch, int startIndex, int count) {
+            return 0;
+        }
+
+        public string Insert(int index, string value) {
+            return null;
+        }
+
+        public static bool IsNullOrEmpty(string s) {
+            return false;
+        }
+
+        public static bool IsNullOrWhiteSpace(string s) {
+            return false;
+        }
+
+        public int LastIndexOf(Char ch) {
+            return 0;
+        }
+
+        public int LastIndexOf(string subString) {
+            return 0;
+        }
+
+        public int LastIndexOf(char ch, int startIndex) {
+            return 0;
+        }
+
+        public int LastIndexOf(string subString, int startIndex) {
+            return 0;
+        }
+
+        public int LastIndexOfAny(char[] ch) {
+            return 0;
+        }
+
+        public int LastIndexOfAny(char[] ch, int startIndex) {
+            return 0;
+        }
+
+        public int LastIndexOfAny(char[] ch, int startIndex, int count) {
+            return 0;
+        }
+
+        public int LocaleCompare(string string2) {
+            return 0;
+        }
+
+        public static string LocaleFormat(string format, params object[] values) {
+            return null;
+        }
+
+        public string[] Match(RegularExpression regex) {
+            return null;
+        }
+
+        public string PadLeft(int totalWidth) {
+            return null;
+        }
+
+        public string PadLeft(int totalWidth, char ch) {
+            return null;
+        }
+
+        public string PadRight(int totalWidth) {
+            return null;
+        }
+
+        public string PadRight(int totalWidth, char ch) {
+            return null;
+        }
+
+        public string Remove(int index) {
+            return null;
+        }
+
+        public string Remove(int index, int count) {
+            return null;
+        }
+
+        public string Replace(string oldText, string replaceText) {
+            return null;
+        }
+
+        public string ReplaceFirst(string oldText, string replaceText) {
+            return null;
+        }
+
+        public string ReplaceRegex(RegularExpression regex, string replaceText) {
+            return null;
+        }
+
+        public string ReplaceRegex(RegularExpression regex, StringReplaceCallback callback) {
+            return null;
+        }
+
+        public int Search(RegularExpression regex) {
+            return 0;
+        }
+
+        public string[] Split(char ch) {
+            return null;
+        }
+
+        public string[] Split(string separator) {
+            return null;
+        }
+
+        public string[] Split(char ch, int limit) {
+            return null;
+        }
+
+        public string[] Split(string separator, int limit) {
+            return null;
+        }
+
+        public string[] Split(RegularExpression regex) {
+            return null;
+        }
+
+        public string[] Split(RegularExpression regex, int limit) {
+            return null;
+        }
+
+        public bool StartsWith(char ch) {
+            return false;
+        }
+
+        public bool StartsWith(string prefix) {
+            return false;
+        }
+
+        public string Substr(int startIndex) {
+            return null;
+        }
+
+        public string Substr(int startIndex, int length) {
+            return null;
+        }
+
+        public string Substring(int startIndex) {
+            return null;
+        }
+
+        public string Substring(int startIndex, int endIndex) {
+            return null;
+        }
+
+        public string ToLocaleLowerCase() {
+            return null;
+        }
+
+        public string ToLocaleUpperCase() {
+            return null;
+        }
+
+        public string ToLowerCase() {
+            return null;
+        }
+
+        public string ToUpperCase() {
+            return null;
+        }
+
+        public string Trim() {
+            return null;
+        }
+
+        public string TrimStart() {
+            return null;
+        }
+
+        public string TrimEnd() {
+            return null;
+        }
+
+        /// <summary>
+        /// Decodes a string by replacing escaped parts with their equivalent textual representation.
+        /// </summary>
+        /// <returns>The unescaped string.</returns>
+        public string Unescape() {
+            return null;
+        }
+
+        /// <internalonly />
+        public static bool operator ==(string s1, string s2) {
+            return false;
+        }
+
+        /// <internalonly />
+        public static bool operator !=(string s1, string s2) {
+            return false;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/StringBuilder.cs b/src/Core/CoreLib/StringBuilder.cs
new file mode 100644
index 000000000..30e3d1aab
--- /dev/null
+++ b/src/Core/CoreLib/StringBuilder.cs
@@ -0,0 +1,169 @@
+// StringBuilder.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// Provides an optimized mechanism to concatenate strings.
+    /// </summary>
+    [Imported]
+    [ScriptNamespace("ss")]
+    public sealed class StringBuilder {
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StringBuilder"/> class.
+        /// </summary>
+        public StringBuilder() {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="StringBuilder"/> class.
+        /// </summary>
+        /// <param name="initialText">
+        /// The string that is used to initialize the value of the instance.
+        /// </param>
+        public StringBuilder(string initialText) {
+        }
+
+        /// <summary>
+        /// Gets whether the <see cref="StringBuilder"/> object has any content.
+        /// </summary>
+        /// <returns>true if the StringBuilder instance contains no text; otherwise, false.</returns>
+        [IntrinsicProperty]
+        public bool IsEmpty {
+            get {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Appends a boolean value to the end of the <see cref="StringBuilder"/> instance.
+        /// </summary>
+        /// <param name="b">The boolean value to append to the end of the StringBuilder instance.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public StringBuilder Append(bool b) {
+            return null;
+        }
+
+        /// <summary>
+        /// Appends a character to the end of the <see cref="StringBuilder"/> instance.
+        /// </summary>
+        /// <param name="c">The character to append to the end of the StringBuilder instance.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public StringBuilder Append(char c) {
+            return null;
+        }
+
+        /// <summary>
+        /// Appends a number to the end of the <see cref="StringBuilder"/> instance.
+        /// </summary>
+        /// <param name="n">The number to append to the end of the StringBuilder instance.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public StringBuilder Append(Number n) {
+            return null;
+        }
+
+        /// <summary>
+        /// Appends an object's string representation to the end of the <see cref="StringBuilder"/> instance.
+        /// </summary>
+        /// <param name="o">The object to append to the end of the StringBuilder instance.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public StringBuilder Append(object o) {
+            return null;
+        }
+
+        /// <summary>
+        /// Appends the specified string to the end of the <see cref="StringBuilder"/> instance.
+        /// </summary>
+        /// <param name="s">The string to append to the end of the StringBuilder instance.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public StringBuilder Append(string s) {
+            return null;
+        }
+
+        /// <summary>
+        /// Appends a string with a line terminator to the end of the <see cref="StringBuilder"/> instance.
+        /// </summary>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public StringBuilder AppendLine() {
+            return null;
+        }
+
+        /// <summary>
+        /// Appends a boolean with a line terminator to the end of the <see cref="StringBuilder"/> instance.
+        /// </summary>
+        /// <param name="b">The boolean value to append to the end of the StringBuilder instance.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public StringBuilder AppendLine(bool b) {
+            return null;
+        }
+
+        /// <summary>
+        /// Appends a character with a line terminator to the end of the <see cref="StringBuilder"/> instance.
+        /// </summary>
+        /// <param name="c">The character to append to the end of the StringBuilder instance.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public StringBuilder AppendLine(char c) {
+            return null;
+        }
+
+        /// <summary>
+        /// Appends a number with a line terminator to the end of the <see cref="StringBuilder"/> instance.
+        /// </summary>
+        /// <param name="n">The number to append to the end of the StringBuilder instance.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public StringBuilder AppendLine(Number n) {
+            return null;
+        }
+
+        /// <summary>
+        /// Appends an object's string representation with a line terminator to the end of the
+        /// <see cref="StringBuilder"/> instance.
+        /// </summary>
+        /// <param name="o">The object to append to the end of the StringBuilder instance.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public StringBuilder AppendLine(object o) {
+            return null;
+        }
+
+        /// <summary>
+        /// Appends a string with a line terminator to the end of the <see cref="StringBuilder"/> instance.
+        /// </summary>
+        /// <param name="s">The string to append with a line terminator to the end of the StringBuilder instance.</param>
+        /// <returns>A reference to this instance after the append operation has completed.</returns>
+        public StringBuilder AppendLine(string s) {
+            return null;
+        }
+
+        /// <summary>
+        /// Clears the contents of the <see cref="StringBuilder"/> instance.
+        /// </summary>
+        public void Clear() {
+        }
+
+        /// <summary>
+        /// Creates a string from the contents of a <see cref="StringBuilder"/> instance.
+        /// </summary>
+        /// <returns>A string representation of the StringBuilder instance.</returns>
+        public override string ToString() {
+            return null;
+        }
+
+        /// <summary>
+        /// Creates a string from the contents of a <see cref="StringBuilder"/> instance, and
+        /// optionally inserts a delimeter between each element of the created string.
+        /// </summary>
+        /// <param name="separator">A string to append between each element of the string that is returned.</param>
+        /// <returns>
+        /// A string representation of the StringBuilder instance. If <paramref name="separator"/>
+        /// is specified, the delimeter string is inserted between each element of the returned string.
+        /// </returns>
+        public string ToString(string separator) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/StringReplaceCallback.cs b/src/Core/CoreLib/StringReplaceCallback.cs
new file mode 100644
index 000000000..1b396d955
--- /dev/null
+++ b/src/Core/CoreLib/StringReplaceCallback.cs
@@ -0,0 +1,18 @@
+// StringReplaceCallback.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    // TODO: The actual signature needs to be
+    //       string callback(match, m1, m2... mN, offset, fullString)
+    //       but there isn't a way to express the varying number of parameters in the
+    //       middle of the signature!
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate string StringReplaceCallback(string matchedValue);
+}
diff --git a/src/Core/CoreLib/Testing/Assert.cs b/src/Core/CoreLib/Testing/Assert.cs
new file mode 100644
index 000000000..4309103de
--- /dev/null
+++ b/src/Core/CoreLib/Testing/Assert.cs
@@ -0,0 +1,43 @@
+// Assert.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Testing {
+
+    [IgnoreNamespace]
+    [Imported]
+    public static class Assert {
+
+        [ScriptAlias("QUnit.equal")]
+        public static void AreEqual(object actual, object expected) {
+        }
+
+        [ScriptAlias("QUnit.equal")]
+        public static void AreEqual(object actual, object expected, string message) {
+        }
+
+        [ScriptAlias("QUnit.notEqual")]
+        public static void AreNotEqual(object actual, object expected) {
+        }
+
+        [ScriptAlias("QUnit.notEqual")]
+        public static void AreNotEqual(object actual, object expected, string message) {
+        }
+
+        [ScriptAlias("QUnit.expect")]
+        public static void ExpectAsserts(int assertions) {
+        }
+
+        [ScriptAlias("QUnit.ok")]
+        public static void IsTrue(bool condition) {
+        }
+
+        [ScriptAlias("QUnit.ok")]
+        public static void IsTrue(bool condition, string message) {
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Testing/TestClass.cs b/src/Core/CoreLib/Testing/TestClass.cs
new file mode 100644
index 000000000..2c9264978
--- /dev/null
+++ b/src/Core/CoreLib/Testing/TestClass.cs
@@ -0,0 +1,21 @@
+// TestClass.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Testing {
+
+    [Imported]
+    [IgnoreNamespace]
+    public abstract class TestClass {
+
+        public virtual void Cleanup() {
+        }
+
+        public virtual void Setup() {
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Testing/TestEngine.cs b/src/Core/CoreLib/Testing/TestEngine.cs
new file mode 100644
index 000000000..b5a629f7f
--- /dev/null
+++ b/src/Core/CoreLib/Testing/TestEngine.cs
@@ -0,0 +1,35 @@
+// TestEngine.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Testing {
+
+    [IgnoreNamespace]
+    [Imported]
+    public static class TestEngine {
+
+        [ScriptAlias("QUnit.log")]
+        public static void Log(string message) {
+        }
+
+        [ScriptAlias("QUnit.start")]
+        public static void ResumeOnAsyncCompleted() {
+        }
+
+        [ScriptAlias("QUnit.triggerEvent")]
+        public static void TriggerEvent(object element, string eventName) {
+        }
+
+        [ScriptAlias("QUnit.stop")]
+        public static void WaitForAsyncCompletion() {
+        }
+
+        [ScriptAlias("QUnit.stop")]
+        public static void WaitForAsyncCompletion(int timeout) {
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Threading/Deferred.cs b/src/Core/CoreLib/Threading/Deferred.cs
new file mode 100644
index 000000000..d18f3e5c8
--- /dev/null
+++ b/src/Core/CoreLib/Threading/Deferred.cs
@@ -0,0 +1,47 @@
+// Deferred.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Threading {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    public class Deferred {
+
+        [IntrinsicProperty]
+        public Task Task {
+            get {
+                return null;
+            }
+        }
+
+        public void Reject() {
+        }
+
+        public void Reject(Exception error) {
+        }
+
+        public void Resolve() {
+        }
+    }
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("Deferred")]
+    public sealed class Deferred<T> : Deferred {
+
+        [IntrinsicProperty]
+        public new Task<T> Task {
+            get {
+                return null;
+            }
+        }
+
+        public void Resolve(T result) {
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Threading/Task.cs b/src/Core/CoreLib/Threading/Task.cs
new file mode 100644
index 000000000..752d9ba6f
--- /dev/null
+++ b/src/Core/CoreLib/Threading/Task.cs
@@ -0,0 +1,98 @@
+// Task.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Threading {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    public class Task {
+
+        internal Task() {
+        }
+
+        public bool Completed {
+            get {
+                return false;
+            }
+        }
+
+        [IntrinsicProperty]
+        public Exception Error {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public TaskStatus Status {
+            get {
+                return TaskStatus.Pending;
+            }
+        }
+
+        public static Task<bool> All(params Task[] tasks) {
+            return null;
+        }
+
+        public static Task<bool> All(int timeout, params Task[] tasks) {
+            return null;
+        }
+
+        public static Task<Task> Any(params Task[] tasks) {
+            return null;
+        }
+
+        public static Task<Task> Any(int timeout, params Task[] tasks) {
+            return null;
+        }
+
+        public Task ContinueWith(Action<Task> continuation) {
+            return null;
+        }
+
+        public static Task Delay(int timeout) {
+            return null;
+        }
+
+        public Task Done(Action callback) {
+            return null;
+        }
+
+        public Task Fail(Action<Exception> callback) {
+            return null;
+        }
+
+        public Task Then(Action doneCallback, Action<Exception> failCallback) {
+            return null;
+        }
+    }
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("Task")]
+    public sealed class Task<T> : Task {
+
+        internal Task() {
+        }
+
+        [IntrinsicProperty]
+        public T Result {
+            get {
+                return default(T);
+            }
+        }
+
+        public Task<T> ContinueWith(Action<Task<T>> continuation) {
+            return null;
+        }
+
+        public Task<T> Done(Action<T> callback) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Threading/TaskStatus.cs b/src/Core/CoreLib/Threading/TaskStatus.cs
new file mode 100644
index 000000000..d49a30ca0
--- /dev/null
+++ b/src/Core/CoreLib/Threading/TaskStatus.cs
@@ -0,0 +1,22 @@
+// TaskStatus.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Threading {
+
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum TaskStatus {
+
+        Pending,
+
+        Done,
+
+        Failed
+    }
+}
diff --git a/src/Core/CoreLib/Tuple.cs b/src/Core/CoreLib/Tuple.cs
new file mode 100644
index 000000000..e0da0d8a2
--- /dev/null
+++ b/src/Core/CoreLib/Tuple.cs
@@ -0,0 +1,79 @@
+// Tuple.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("Tuple")]
+    public sealed class Tuple<T1, T2> {
+
+        public Tuple() {
+        }
+
+        public Tuple(T1 first, T2 second) {
+        }
+
+        [IntrinsicProperty]
+        public T1 First {
+            get {
+                return default(T1);
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public T2 Second {
+            get {
+                return default(T2);
+            }
+            set {
+            }
+        }
+    }
+
+    [Imported]
+    [ScriptNamespace("ss")]
+    [ScriptName("Tuple")]
+    public sealed class Tuple<T1, T2, T3> {
+
+        public Tuple() {
+        }
+
+        public Tuple(T1 first, T2 second, T3 third) {
+        }
+
+        [IntrinsicProperty]
+        public T1 First {
+            get {
+                return default(T1);
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public T2 Second {
+            get {
+                return default(T2);
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public T3 Third {
+            get {
+                return default(T3);
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Type.cs b/src/Core/CoreLib/Type.cs
new file mode 100644
index 000000000..9a7802682
--- /dev/null
+++ b/src/Core/CoreLib/Type.cs
@@ -0,0 +1,72 @@
+// Type.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Collections;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The Type data type which is mapped to the Function type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    public sealed class Type {
+
+        public Type BaseType {
+            get {
+                return null;
+            }
+        }
+
+        public string FullName {
+            get {
+                return null;
+            }
+        }
+
+        public string Name {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the prototype associated with the type.
+        /// </summary>
+        [IntrinsicProperty]
+        public Dictionary Prototype {
+            get {
+                return null;
+            }
+        }
+
+        public static Type GetType(string typeName) {
+            return null;
+        }
+
+        public bool IsAssignableFrom(Type type) {
+            return false;
+        }
+
+        public static bool IsClass(Type type) {
+            return false;
+        }
+
+        public static bool IsInterface(Type type) {
+            return false;
+        }
+
+        public bool IsInstanceOfType(object instance) {
+            return false;
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static Type GetTypeFromHandle(RuntimeTypeHandle typeHandle) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/UInt16.cs b/src/Core/CoreLib/UInt16.cs
new file mode 100644
index 000000000..69c95865b
--- /dev/null
+++ b/src/Core/CoreLib/UInt16.cs
@@ -0,0 +1,41 @@
+// UInt16.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The ushort data type which is mapped to the Number type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Number")]
+    public struct UInt16 {
+
+        public string Format(string format) {
+            return null;
+        }
+
+        public string LocaleFormat(string format) {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the value to its string representation.
+        /// </summary>
+        /// <param name="radix">The radix used in the conversion (eg. 10 for decimal, 16 for hexadecimal)</param>
+        /// <returns>The string representation of the value.</returns>
+        public string ToString(int radix) {
+            return null;
+        }
+
+        /// <internalonly />
+        [CLSCompliant(false)]
+        public static implicit operator Number(ushort i) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/UInt32.cs b/src/Core/CoreLib/UInt32.cs
new file mode 100644
index 000000000..59fc0975c
--- /dev/null
+++ b/src/Core/CoreLib/UInt32.cs
@@ -0,0 +1,41 @@
+// UInt32.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The uint data type which is mapped to the Number type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Number")]
+    public struct UInt32 {
+
+        public string Format(string format) {
+            return null;
+        }
+
+        public string LocaleFormat(string format) {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the value to its string representation.
+        /// </summary>
+        /// <param name="radix">The radix used in the conversion (eg. 10 for decimal, 16 for hexadecimal)</param>
+        /// <returns>The string representation of the value.</returns>
+        public string ToString(int radix) {
+            return null;
+        }
+
+        /// <internalonly />
+        [CLSCompliant(false)]
+        public static implicit operator Number(uint i) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/UInt64.cs b/src/Core/CoreLib/UInt64.cs
new file mode 100644
index 000000000..95769d7b1
--- /dev/null
+++ b/src/Core/CoreLib/UInt64.cs
@@ -0,0 +1,41 @@
+// UInt64.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    /// <summary>
+    /// The ulong data type which is mapped to the Number type in Javascript.
+    /// </summary>
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Number")]
+    public struct UInt64 {
+
+        public string Format(string format) {
+            return null;
+        }
+
+        public string LocaleFormat(string format) {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts the value to its string representation.
+        /// </summary>
+        /// <param name="radix">The radix used in the conversion (eg. 10 for decimal, 16 for hexadecimal)</param>
+        /// <returns>The string representation of the value.</returns>
+        public string ToString(int radix) {
+            return null;
+        }
+
+        /// <internalonly />
+        [CLSCompliant(false)]
+        public static implicit operator Number(ulong i) {
+            return null;
+        }
+    }
+}
diff --git a/src/Core/CoreLib/Void.cs b/src/Core/CoreLib/Void.cs
new file mode 100644
index 000000000..aae509021
--- /dev/null
+++ b/src/Core/CoreLib/Void.cs
@@ -0,0 +1,17 @@
+// Void.cs
+// Script#/Libraries/CoreLib
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    // This doesn't map to an actual type, but needs to be present
+    // in the set of types, so that the C# void type can be mapped
+    [IgnoreNamespace]
+    [Imported]
+    public struct Void {
+    }
+}
diff --git a/src/Core/CoreScript/BCL/App.js b/src/Core/CoreScript/BCL/App.js
new file mode 100644
index 000000000..705767e12
--- /dev/null
+++ b/src/Core/CoreScript/BCL/App.js
@@ -0,0 +1,17 @@
+///////////////////////////////////////////////////////////////////////////////
+// Interfaces
+
+ss.IApplication = function() { };
+ss.IApplication.registerInterface('IApplication');
+
+ss.IContainer = function () { };
+ss.IContainer.registerInterface('IContainer');
+
+ss.IObjectFactory = function () { };
+ss.IObjectFactory.registerInterface('IObjectFactory');
+
+ss.IEventManager = function () { };
+ss.IEventManager.registerInterface('IEventManager');
+
+ss.IInitializable = function () { };
+ss.IInitializable.registerInterface('IInitializable');
diff --git a/src/Core/CoreScript/BCL/ArrayEnumerator.js b/src/Core/CoreScript/BCL/ArrayEnumerator.js
new file mode 100644
index 000000000..4e64575b0
--- /dev/null
+++ b/src/Core/CoreScript/BCL/ArrayEnumerator.js
@@ -0,0 +1,21 @@
+///////////////////////////////////////////////////////////////////////////////
+// ArrayEnumerator
+
+ss.ArrayEnumerator = function#? DEBUG ArrayEnumerator$##(array) {
+    this._array = array;
+    this._index = -1;
+    this.current = null;
+}
+ss.ArrayEnumerator.prototype = {
+    moveNext: function#? DEBUG ArrayEnumerator$moveNext##() {
+        this._index++;
+        this.current = this._array[this._index];
+        return (this._index < this._array.length);
+    },
+    reset: function#? DEBUG ArrayEnumerator$reset##() {
+        this._index = -1;
+        this.current = null;
+    }
+}
+
+ss.ArrayEnumerator.registerClass('ArrayEnumerator', null, ss.IEnumerator);
diff --git a/src/Core/CoreScript/BCL/CancelEventArgs.js b/src/Core/CoreScript/BCL/CancelEventArgs.js
new file mode 100644
index 000000000..995711126
--- /dev/null
+++ b/src/Core/CoreScript/BCL/CancelEventArgs.js
@@ -0,0 +1,8 @@
+///////////////////////////////////////////////////////////////////////////////
+// CancelEventArgs
+
+ss.CancelEventArgs = function#? DEBUG CancelEventArgs$##() {
+    ss.CancelEventArgs.initializeBase(this);
+    this.cancel = false;
+}
+ss.CancelEventArgs.registerClass('CancelEventArgs', ss.EventArgs);
diff --git a/src/Core/CoreScript/BCL/CultureInfo.js b/src/Core/CoreScript/BCL/CultureInfo.js
new file mode 100644
index 000000000..bad1298d1
--- /dev/null
+++ b/src/Core/CoreScript/BCL/CultureInfo.js
@@ -0,0 +1,66 @@
+///////////////////////////////////////////////////////////////////////////////
+// CultureInfo
+
+ss.CultureInfo = function#? DEBUG CultureInfo$##(name, numberFormat, dateFormat) {
+    this.name = name;
+    this.numberFormat = numberFormat;
+    this.dateFormat = dateFormat;
+}
+ss.CultureInfo.registerClass('CultureInfo');
+
+ss.CultureInfo.InvariantCulture = new ss.CultureInfo('en-US',
+    {
+        naNSymbol: 'NaN',
+        negativeSign: '-',
+        positiveSign: '+',
+        negativeInfinityText: '-Infinity',
+        positiveInfinityText: 'Infinity',
+        
+        percentSymbol: '%',
+        percentGroupSizes: [3],
+        percentDecimalDigits: 2,
+        percentDecimalSeparator: '.',
+        percentGroupSeparator: ',',
+        percentPositivePattern: '{0} %',
+        percentNegativePattern: '-{0} %',
+
+        currencySymbol:'$',
+        currencyGroupSizes: [3],
+        currencyDecimalDigits: 2,
+        currencyDecimalSeparator: '.',
+        currencyGroupSeparator: ',',
+        currencyNegativePattern: '(${0})',
+        currencyPositivePattern: '${0}',
+
+        numberGroupSizes: [3],
+        numberDecimalDigits: 2,
+        numberDecimalSeparator: '.',
+        numberGroupSeparator: ','
+    },
+    {
+        amDesignator: 'AM',
+        pmDesignator: 'PM',
+
+        dateSeparator: '/',
+        timeSeparator: ':',
+
+        gmtDateTimePattern: 'ddd, dd MMM yyyy HH:mm:ss \'GMT\'',
+        universalDateTimePattern: 'yyyy-MM-dd HH:mm:ssZ',
+        sortableDateTimePattern: 'yyyy-MM-ddTHH:mm:ss',
+        dateTimePattern: 'dddd, MMMM dd, yyyy h:mm:ss tt',
+
+        longDatePattern: 'dddd, MMMM dd, yyyy',
+        shortDatePattern: 'M/d/yyyy',
+
+        longTimePattern: 'h:mm:ss tt',
+        shortTimePattern: 'h:mm tt',
+
+        firstDayOfWeek: 0,
+        dayNames: ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'],
+        shortDayNames: ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'],
+        minimizedDayNames: ['Su','Mo','Tu','We','Th','Fr','Sa'],
+
+        monthNames: ['January','February','March','April','May','June','July','August','September','October','November','December',''],
+        shortMonthNames: ['Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec','']
+    });
+ss.CultureInfo.CurrentCulture = ss.CultureInfo.InvariantCulture;
diff --git a/src/Core/CoreScript/BCL/Debug.js b/src/Core/CoreScript/BCL/Debug.js
new file mode 100644
index 000000000..6cdab136c
--- /dev/null
+++ b/src/Core/CoreScript/BCL/Debug.js
@@ -0,0 +1,18 @@
+///////////////////////////////////////////////////////////////////////////////
+// Debug Extensions
+
+if (!global.console) {
+  global.console = {
+    log: function() {
+    },
+    assert: function() {
+    }
+  }
+}
+
+console.fail = function(message) {
+  console.assert(false, message);
+  if (global.navigator && (global.navigator.userAgent.indexOf('MSIE') > 0)) {
+    eval('debugger;');
+  }
+}
diff --git a/src/Core/CoreScript/BCL/Delegate.js b/src/Core/CoreScript/BCL/Delegate.js
new file mode 100644
index 000000000..f894bc164
--- /dev/null
+++ b/src/Core/CoreScript/BCL/Delegate.js
@@ -0,0 +1,120 @@
+///////////////////////////////////////////////////////////////////////////////
+// Delegate
+
+ss.Delegate = function#? DEBUG Delegate$##() {
+}
+ss.Delegate.registerClass('Delegate');
+
+ss.Delegate.empty = function() { }
+
+ss.Delegate._contains = function#? DEBUG Delegate$_contains##(targets, object, method) {
+    for (var i = 0; i < targets.length; i += 2) {
+        if (targets[i] === object && targets[i + 1] === method) {
+            return true;
+        }
+    }
+    return false;
+}
+
+ss.Delegate._create = function#? DEBUG Delegate$_create##(targets) {
+    var delegate = function() {
+        if (targets.length == 2) {
+            return targets[1].apply(targets[0], arguments);
+        }
+        else {
+            var clone = targets.clone();
+            for (var i = 0; i < clone.length; i += 2) {
+                if (ss.Delegate._contains(targets, clone[i], clone[i + 1])) {
+                    clone[i + 1].apply(clone[i], arguments);
+                }
+            }
+            return null;
+        }
+    };
+    delegate._targets = targets;
+
+    return delegate;
+}
+
+ss.Delegate.create = function#? DEBUG Delegate$create##(object, method) {
+    if (!object) {
+        return method;
+    }
+    return ss.Delegate._create([object, method]);
+}
+
+ss.Delegate.combine = function#? DEBUG Delegate$combine##(delegate1, delegate2) {
+    if (!delegate1) {
+        if (!delegate2._targets) {
+            return ss.Delegate.create(null, delegate2);
+        }
+        return delegate2;
+    }
+    if (!delegate2) {
+        if (!delegate1._targets) {
+            return ss.Delegate.create(null, delegate1);
+        }
+        return delegate1;
+    }
+
+    var targets1 = delegate1._targets ? delegate1._targets : [null, delegate1];
+    var targets2 = delegate2._targets ? delegate2._targets : [null, delegate2];
+
+    return ss.Delegate._create(targets1.concat(targets2));
+}
+
+ss.Delegate.remove = function#? DEBUG Delegate$remove##(delegate1, delegate2) {
+    if (!delegate1 || (delegate1 === delegate2)) {
+        return null;
+    }
+    if (!delegate2) {
+        return delegate1;
+    }
+
+    var targets = delegate1._targets;
+    var object = null;
+    var method;
+    if (delegate2._targets) {
+        object = delegate2._targets[0];
+        method = delegate2._targets[1];
+    }
+    else {
+        method = delegate2;
+    }
+
+    for (var i = 0; i < targets.length; i += 2) {
+        if ((targets[i] === object) && (targets[i + 1] === method)) {
+            if (targets.length == 2) {
+                return null;
+            }
+            targets.splice(i, 2);
+            return ss.Delegate._create(targets);
+        }
+    }
+
+    return delegate1;
+}
+
+ss.Delegate.createExport = function#? DEBUG Delegate$createExport##(delegate, multiUse, name) {
+    // Generate a unique name if one is not specified
+    name = name || '__' + (new Date()).valueOf();
+
+    // Exported delegates go on global object (so they are callable using a simple identifier).
+
+    // Multi-use delegates are exported directly; for the rest a stub is exported, and the stub
+    // first deletes, and then invokes the actual delegate.
+    global[name] = multiUse ? delegate : function() {
+      try { delete global[name]; } catch(e) { global[name] = undefined; }
+      delegate.apply(null, arguments);
+    };
+
+    return name;
+}
+
+ss.Delegate.deleteExport = function#? DEBUG Delegate$deleteExport##(name) {
+    delete global[name];
+}
+
+ss.Delegate.clearExport = function#? DEBUG Delegate$clearExport##(name) {
+    global[name] = ss.Delegate.empty;
+}
diff --git a/src/Core/CoreScript/BCL/EventArgs.js b/src/Core/CoreScript/BCL/EventArgs.js
new file mode 100644
index 000000000..cced080ca
--- /dev/null
+++ b/src/Core/CoreScript/BCL/EventArgs.js
@@ -0,0 +1,8 @@
+///////////////////////////////////////////////////////////////////////////////
+// EventArgs
+
+ss.EventArgs = function#? DEBUG EventArgs$##() {
+}
+ss.EventArgs.registerClass('EventArgs');
+
+ss.EventArgs.Empty = new ss.EventArgs();
diff --git a/src/Core/CoreScript/BCL/IDisposable.js b/src/Core/CoreScript/BCL/IDisposable.js
new file mode 100644
index 000000000..707bcc387
--- /dev/null
+++ b/src/Core/CoreScript/BCL/IDisposable.js
@@ -0,0 +1,10 @@
+///////////////////////////////////////////////////////////////////////////////
+// IDisposable
+
+ss.IDisposable = function#? DEBUG IDisposable$##() { };
+#if DEBUG
+ss.IDisposable.prototype = {
+    dispose: null
+}
+#endif // DEBUG
+ss.IDisposable.registerInterface('IDisposable');
diff --git a/src/Core/CoreScript/BCL/IEnumerable.js b/src/Core/CoreScript/BCL/IEnumerable.js
new file mode 100644
index 000000000..866b36bcf
--- /dev/null
+++ b/src/Core/CoreScript/BCL/IEnumerable.js
@@ -0,0 +1,10 @@
+///////////////////////////////////////////////////////////////////////////////
+// IEnumerable
+
+ss.IEnumerable = function#? DEBUG IEnumerable$##() { };
+#if DEBUG
+ss.IEnumerable.prototype = {
+    getEnumerator: null
+}
+#endif // DEBUG
+ss.IEnumerable.registerInterface('IEnumerable');
diff --git a/src/Core/CoreScript/BCL/IEnumerator.js b/src/Core/CoreScript/BCL/IEnumerator.js
new file mode 100644
index 000000000..eb1f6a7a9
--- /dev/null
+++ b/src/Core/CoreScript/BCL/IEnumerator.js
@@ -0,0 +1,20 @@
+///////////////////////////////////////////////////////////////////////////////
+// IEnumerator
+
+ss.IEnumerator = function#? DEBUG IEnumerator$##() { };
+#if DEBUG
+ss.IEnumerator.prototype = {
+    get_current: null,
+    moveNext: null,
+    reset: null
+}
+#endif // DEBUG
+
+ss.IEnumerator.getEnumerator = function#? DEBUG ss_IEnumerator$getEnumerator##(enumerable) {
+    if (enumerable) {
+        return enumerable.getEnumerator ? enumerable.getEnumerator() : new ss.ArrayEnumerator(enumerable);
+    }
+    return null;
+}
+
+ss.IEnumerator.registerInterface('IEnumerator');
diff --git a/src/Core/CoreScript/BCL/Observable.js b/src/Core/CoreScript/BCL/Observable.js
new file mode 100644
index 000000000..464fee830
--- /dev/null
+++ b/src/Core/CoreScript/BCL/Observable.js
@@ -0,0 +1,124 @@
+///////////////////////////////////////////////////////////////////////////////
+// Observable
+
+ss.Observable = function(v) {
+    this._v = v;
+    this._observers = null;
+}
+ss.Observable.prototype = {
+
+  getValue: function () {
+    this._observers = ss.Observable._captureObservers(this._observers);
+    return this._v;
+  },
+  setValue: function (v) {
+    if (this._v !== v) {
+      this._v = v;
+
+      var observers = this._observers;
+      if (observers) {
+        this._observers = null;
+        ss.Observable._invalidateObservers(observers);
+      }
+    }
+  }
+};
+
+ss.Observable._observerStack = [];
+ss.Observable._observerRegistration = {
+  dispose: function () {
+    ss.Observable._observerStack.pop();
+  }
+}
+ss.Observable.registerObserver = function (o) {
+  ss.Observable._observerStack.push(o);
+  return ss.Observable._observerRegistration;
+}
+ss.Observable._captureObservers = function (observers) {
+  var registeredObservers = ss.Observable._observerStack;
+  var observerCount = registeredObservers.length;
+
+  if (observerCount) {
+    observers = observers || [];
+    for (var i = 0; i < observerCount; i++) {
+      var observer = registeredObservers[i];
+      if (!observers.contains(observer)) {
+        observers.push(observer);
+      }
+    }
+    return observers;
+  }
+  return null;
+}
+ss.Observable._invalidateObservers = function (observers) {
+  for (var i = 0, len = observers.length; i < len; i++) {
+    observers[i].invalidateObserver();
+  }
+}
+
+ss.Observable.registerClass('Observable');
+
+
+ss.ObservableCollection = function (items) {
+  this._items = items || [];
+  this._observers = null;
+}
+ss.ObservableCollection.prototype = {
+
+  get_item: function (index) {
+    this._observers = ss.Observable._captureObservers(this._observers);
+    return this._items[index];
+  },
+  set_item: function (index, item) {
+    this._items[index] = item;
+    this._updated();
+  },
+  get_length: function () {
+    this._observers = ss.Observable._captureObservers(this._observers);
+    return this._items.length;
+  },
+  add: function (item) {
+    this._items.push(item);
+    this._updated();
+  },
+  clear: function () {
+    this._items.clear();
+    this._updated();
+  },
+  contains: function (item) {
+    return this._items.contains(item);
+  },
+  getEnumerator: function () {
+    this._observers = ss.Observable._captureObservers(this._observers);
+    return this._items.getEnumerator();
+  },
+  indexOf: function (item) {
+    return this._items.indexOf(item);
+  },
+  insert: function (index, item) {
+    this._items.insert(index, item);
+    this._updated();
+  },
+  remove: function (item) {
+    if (this._items.remove(item)) {
+      this._updated();
+      return true;
+    }
+    return false;
+  },
+  removeAt: function (index) {
+    this._items.removeAt(index);
+    this._updated();
+  },
+  toArray: function () {
+    return this._items;
+  },
+  _updated: function() {
+    var observers = this._observers;
+    if (observers) {
+      this._observers = null;
+      ss.Observable._invalidateObservers(observers);
+    }
+  }
+}
+ss.ObservableCollection.registerClass('ObservableCollection', null, ss.IEnumerable);
diff --git a/src/Core/CoreScript/BCL/StringBuilder.js b/src/Core/CoreScript/BCL/StringBuilder.js
new file mode 100644
index 000000000..4613da55a
--- /dev/null
+++ b/src/Core/CoreScript/BCL/StringBuilder.js
@@ -0,0 +1,34 @@
+///////////////////////////////////////////////////////////////////////////////
+// StringBuilder
+
+ss.StringBuilder = function#? DEBUG StringBuilder$##(s) {
+    this._parts = ss.isNullOrUndefined(s) || s === '' ? [] : [s];
+    this.isEmpty = this._parts.length == 0;
+}
+ss.StringBuilder.prototype = {
+    append: function#? DEBUG StringBuilder$append##(s) {
+        if (!ss.isNullOrUndefined(s) && s !== '') {
+            this._parts.add(s);
+            this.isEmpty = false;
+        }
+        return this;
+    },
+
+    appendLine: function#? DEBUG StringBuilder$appendLine##(s) {
+        this.append(s);
+        this.append('\r\n');
+        this.isEmpty = false;
+        return this;
+    },
+
+    clear: function#? DEBUG StringBuilder$clear##() {
+        this._parts = [];
+        this.isEmpty = true;
+    },
+
+    toString: function#? DEBUG StringBuilder$toString##(s) {
+        return this._parts.join(s || '');
+    }
+};
+
+ss.StringBuilder.registerClass('StringBuilder');
diff --git a/src/Core/CoreScript/BCL/Task.js b/src/Core/CoreScript/BCL/Task.js
new file mode 100644
index 000000000..1b4c136e0
--- /dev/null
+++ b/src/Core/CoreScript/BCL/Task.js
@@ -0,0 +1,145 @@
+///////////////////////////////////////////////////////////////////////////////
+// Task
+
+ss.Task = function(result) {
+  this._continuations = ss.isValue(result) ?
+                          (this.status = 'done', null) :
+                          (this.status = 'pending', []);
+  this.result = result;
+  this.error = null;
+}
+ss.Task.prototype = {
+  get_completed: function() {
+    return this.status != 'pending';
+  },
+  continueWith: function(continuation) {
+    if (this._continuations) {
+      this._continuations.push(continuation);
+    }
+    else {
+      var self = this;
+      setTimeout(function() { continuation(self); }, 0);
+    }
+    return this;
+  },
+  done: function(callback) {
+    return this.continueWith(function(t) {
+      if (t.status == 'done') {
+        callback(t.result);
+      }
+    });
+  },
+  fail: function(callback) {
+    return this.continueWith(function(t) {
+      if (t.status == 'failed') {
+        callback(t.error);
+      }
+    });
+  },
+  then: function(doneCallback, failCallback) {
+    return this.continueWith(function(t) {
+      t.status == 'done' ? doneCallback(t.result) : failCallback(t.error);
+    });
+  },
+  _update: function(result, error) {
+    if (this.status == 'pending') {
+      if (error) {
+        this.error = error;
+        this.status = 'failed';
+      }
+      else {
+        this.result = result;
+        this.status = 'done';
+      }
+
+      var continuations = this._continuations;
+      this._continuations = null;
+
+      for (var i = 0, c = continuations.length; i < c; i++) {
+        continuations[i](this);
+      }
+    }
+  }
+};
+ss.Task._join = function(tasks, any) {
+  tasks = Array.toArray(tasks);
+#if DEBUG
+  console.assert(tasks.length > 1);
+#endif // DEBUG
+
+  var count = tasks.length;
+
+  var interval = 0;
+  if ((count > 1) && (typeof tasks[0] == 'number')) {
+    interval = tasks[0];
+    tasks = tasks.slice(1);
+    count--;
+  }
+
+  var joinTask = new ss.Task();
+  var seen = 0;
+
+  function continuation(t) {
+    if (joinTask.status == 'pending') {
+      seen++;
+      if (any) {
+        joinTask._update(t);
+      }
+      else if (seen == count) {
+        joinTask._update(true);
+      }
+    }
+  }
+
+  function timeout() {
+    if (joinTask.status == 'pending') {
+      if (any) {
+        joinTask._update(null);
+      }
+      else {
+        joinTask._update(false);
+      }
+    }
+  }
+
+  if (interval != 0) {
+    setTimeout(timeout, interval);
+  }
+
+  for (var i = 0; i < count; i++) {
+    tasks[i].continueWith(continuation);
+  }
+
+  return joinTask;
+}
+ss.Task.all = function() {
+  return ss.Task._join(arguments, false);
+}
+ss.Task.any = function() {
+  return ss.Task._join(arguments, true);
+}
+ss.Task.delay = function(timeout) {
+  var timerTask = new ss.Task();
+
+  setTimeout(function() {
+    timerTask._update(true);
+  }, timeout);
+
+  return timerTask;
+}
+
+
+ss.Deferred = function(result) {
+  this.task = new ss.Task(result);
+}
+ss.Deferred.prototype = {
+  resolve: function(result) {
+    this.task._update(result);
+  },
+  reject: function(error) {
+    this.task._update(null, error || new Error());
+  }
+};
+
+ss.Deferred.registerClass('Deferred');
+ss.Task.registerClass('Task');
diff --git a/src/Core/CoreScript/BCL/Tuple.js b/src/Core/CoreScript/BCL/Tuple.js
new file mode 100644
index 000000000..ffc881939
--- /dev/null
+++ b/src/Core/CoreScript/BCL/Tuple.js
@@ -0,0 +1,11 @@
+///////////////////////////////////////////////////////////////////////////////
+// Tuple
+
+ss.Tuple = function (first, second, third) {
+  this.first = first;
+  this.second = second;
+  if (arguments.length == 3) {
+    this.third = third;
+  }
+}
+ss.Tuple.registerClass('Tuple');
diff --git a/src/Core/CoreScript/CoreScript.csproj b/src/Core/CoreScript/CoreScript.csproj
new file mode 100644
index 000000000..415ad76b9
--- /dev/null
+++ b/src/Core/CoreScript/CoreScript.csproj
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{8780581F-7C26-4B64-9235-BA1C458DF36E}</ProjectGuid>
+    <ToolsPath>..\..\..\tools\bin</ToolsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>..\..\..\bin\Debug\</OutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>..\..\..\bin\Release\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="BCL\Task.js" />
+    <Content Include="loader.js" />
+    <Content Include="mscorlib.js" />
+    <Content Include="Extensions\Array.js" />
+    <Content Include="Extensions\Number.js" />
+    <Content Include="Extensions\Object.js" />
+    <Content Include="Extensions\RegExp.js" />
+    <Content Include="Extensions\String.js" />
+    <Content Include="Extensions\Boolean.js" />
+    <Content Include="Extensions\Date.js" />
+    <Content Include="Extensions\Error.js" />
+    <Content Include="BCL\App.js" />
+    <Content Include="BCL\Tuple.js" />
+    <Content Include="BCL\Observable.js" />
+    <Content Include="BCL\Debug.js" />
+    <Content Include="BCL\Delegate.js" />
+    <Content Include="BCL\ArrayEnumerator.js" />
+    <Content Include="BCL\CancelEventArgs.js" />
+    <Content Include="BCL\CultureInfo.js" />
+    <Content Include="BCL\EventArgs.js" />
+    <Content Include="BCL\IDisposable.js" />
+    <Content Include="BCL\IEnumerable.js" />
+    <Content Include="BCL\IEnumerator.js" />
+    <Content Include="BCL\StringBuilder.js" />
+    <Content Include="TypeSystem\Type.js" />
+  </ItemGroup>
+  <Target Name="Build">
+    <Exec Command="$(ToolsPath)\sspp.exe /nologo /debug /d:DEBUG /crlf /input:$(ProjectDir)mscorlib.js /output:$(OutputPath)\mscorlib.debug.js" />
+    <Exec Command="$(ToolsPath)\sspp.exe /nologo /stripCommentsOnly /crlf /input:$(ProjectDir)mscorlib.js /output:$(OutputPath)\mscorlib.rel.js" />
+    <Exec Command="$(ToolsPath)\sspp.exe /nologo /debug /d:DEBUG /crlf /input:$(ProjectDir)loader.js /output:$(OutputPath)\ssloader.debug.js" />
+    <Exec Command="$(ToolsPath)\sspp.exe /nologo /stripCommentsOnly /crlf /input:$(ProjectDir)loader.js /output:$(OutputPath)\ssloader.rel.js" />
+    <Exec Command="$(ToolsPath)\ajaxmin.exe -clobber:true $(OutputPath)\mscorlib.rel.js -out $(OutputPath)\mscorlib.js" />
+    <Exec Command="$(ToolsPath)\ajaxmin.exe -clobber:true $(OutputPath)\ssloader.rel.js -out $(OutputPath)\ssloader.js" />
+  </Target>
+  <Target Name="Clean">
+  </Target>
+  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
+</Project>
\ No newline at end of file
diff --git a/src/Core/CoreScript/Extensions/Array.js b/src/Core/CoreScript/Extensions/Array.js
new file mode 100644
index 000000000..43226a194
--- /dev/null
+++ b/src/Core/CoreScript/Extensions/Array.js
@@ -0,0 +1,264 @@
+///////////////////////////////////////////////////////////////////////////////
+// Array Extensions
+
+Array.__typeName = 'Array';
+Array.__interfaces = [ ss.IEnumerable ];
+
+Array.prototype.add = function#? DEBUG Array$add##(item) {
+    this[this.length] = item;
+}
+
+Array.prototype.addRange = function#? DEBUG Array$addRange##(items) {
+    this.push.apply(this, items);
+}
+
+Array.prototype.clear = function#? DEBUG Array$clear##() {
+    this.length = 0;
+}
+
+Array.prototype.clone = function#? DEBUG Array$clone##() {
+    if (this.length === 1) {
+        return [this[0]];
+    }
+    else {
+        return Array.apply(null, this);
+    }
+}
+
+Array.prototype.contains = function#? DEBUG Array$contains##(item) {
+    var index = this.indexOf(item);
+    return (index >= 0);
+}
+
+Array.prototype.dequeue = function#? DEBUG Array$dequeue##() {
+    return this.shift();
+}
+
+Array.prototype.enqueue = function#? DEBUG Array$enqueue##(item) {
+    // We record that this array instance is a queue, so we
+    // can implement the right behavior in the peek method.
+    this._queue = true;
+    this.push(item);
+}
+
+Array.prototype.peek = function#? DEBUG Array$peek##() {
+    if (this.length) {
+        var index = this._queue ? 0 : this.length - 1;
+        return this[index];
+    }
+    return null;
+}
+
+if (!Array.prototype.every) {
+    Array.prototype.every = function#? DEBUG Array$every##(callback, instance) {
+        var length = this.length;
+        for (var i = 0; i < length; i++) {
+            if (i in this && !callback.call(instance, this[i], i, this)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
+
+Array.prototype.extract = function#? DEBUG Array$extract##(index, count) {
+    if (!count) {
+        return this.slice(index);
+    }
+    return this.slice(index, index + count);
+}
+
+if (!Array.prototype.filter) {
+    Array.prototype.filter = function#? DEBUG Array$filter##(callback, instance) {
+        var length = this.length;    
+        var filtered = [];
+        for (var i = 0; i < length; i++) {
+            if (i in this) {
+                var val = this[i];
+                if (callback.call(instance, val, i, this)) {
+                    filtered.push(val);
+                }
+            }
+        }
+        return filtered;
+    }
+}
+
+if (!Array.prototype.forEach) {
+    Array.prototype.forEach = function#? DEBUG Array$forEach##(callback, instance) {
+        var length = this.length;
+        for (var i = 0; i < length; i++) {
+            if (i in this) {
+                callback.call(instance, this[i], i, this);
+            }
+        }
+    }
+}
+
+Array.prototype.getEnumerator = function#? DEBUG Array$getEnumerator##() {
+    return new ss.ArrayEnumerator(this);
+}
+
+Array.prototype.groupBy = function#? DEBUG Array$groupBy##(callback, instance) {
+    var length = this.length;
+    var groups = [];
+    var keys = {};
+    for (var i = 0; i < length; i++) {
+        if (i in this) {
+            var key = callback.call(instance, this[i], i);
+            if (String.isNullOrEmpty(key)) {
+                continue;
+            }
+            var items = keys[key];
+            if (!items) {
+                items = [];
+                items.key = key;
+
+                keys[key] = items;
+                groups.add(items);
+            }
+            items.add(this[i]);
+        }
+    }
+    return groups;
+}
+
+Array.prototype.index = function#? DEBUG Array$index##(callback, instance) {
+    var length = this.length;
+    var items = {};
+    for (var i = 0; i < length; i++) {
+        if (i in this) {
+            var key = callback.call(instance, this[i], i);
+            if (String.isNullOrEmpty(key)) {
+                continue;
+            }
+            items[key] = this[i];
+        }
+    }
+    return items;
+}
+
+if (!Array.prototype.indexOf) {
+    Array.prototype.indexOf = function#? DEBUG Array$indexOf##(item, startIndex) {
+        startIndex = startIndex || 0;
+        var length = this.length;
+        if (length) {
+            for (var index = startIndex; index < length; index++) {
+                if (this[index] === item) {
+                    return index;
+                }
+            }
+        }
+        return -1;
+    }
+}
+
+Array.prototype.insert = function#? DEBUG Array$insert##(index, item) {
+    this.splice(index, 0, item);
+}
+
+Array.prototype.insertRange = function#? DEBUG Array$insertRange##(index, items) {
+    if (index === 0) {
+        this.unshift.apply(this, items);
+    }
+    else {
+        for (var i = 0; i < items.length; i++) {
+            this.splice(index + i, 0, items[i]);
+        }
+    }
+}
+
+if (!Array.prototype.lastIndexOf) {
+    Array.prototype.lastIndexOf = function#? DEBUG Array$lastIndexOf##(item, fromIndex) {
+        fromIndex = fromIndex || this.length - 1;
+        for (var index = fromIndex; index >= 0; index--) {
+            if (this[index] === item) {
+                return index;
+            }
+        }
+        return -1;
+    }
+}
+
+if (!Array.prototype.map) {
+    Array.prototype.map = function#? DEBUG Array$map##(callback, instance) {
+        var length = this.length;
+        var mapped = new Array(length);
+        for (var i = 0; i < length; i++) {
+            if (i in this) {
+                mapped[i] = callback.call(instance, this[i], i, this);
+            }
+        }
+        return mapped;
+    }
+}
+
+Array.parse = function#? DEBUG Array$parse##(s) {
+    return eval('(' + s + ')');
+}
+
+if (!Array.prototype.reduce) {
+    Array.prototype.reduce = function#? DEBUG Array$reduce##(callback, initialValue) {
+        var value = initialValue;
+        var length = this.length;
+        if (length) {
+            var i = 0;
+            if (arguments.length == 1) {
+                value = this[0];
+                i++;
+            }
+            for (; i < length; i++) {
+                value = callback(value, this[i], i, this);
+            }
+        }
+        return value;
+    }
+    Array.prototype.reduceRight = function#? DEBUG Array$reduceRight##(callback, initialValue) {
+        var value = initialValue;
+        var length = this.length;
+        if (length) {
+            var i = length - 1;
+            if (arguments.length == 1) {
+                value = this[i];
+                i--;
+            }
+            for (; i >= 0; i--) {
+                value = callback(value, this[i], i, this);
+            }
+        }
+        return value;
+    }
+}
+
+Array.prototype.remove = function#? DEBUG Array$remove##(item) {
+    var index = this.indexOf(item);
+    if (index >= 0) {
+        this.splice(index, 1);
+        return true;
+    }
+    return false;
+}
+
+Array.prototype.removeAt = function#? DEBUG Array$removeAt##(index) {
+    this.splice(index, 1);
+}
+
+Array.prototype.removeRange = function#? DEBUG Array$removeRange##(index, count) {
+    return this.splice(index, count);
+}
+
+if (!Array.prototype.some) {
+    Array.prototype.some = function#? DEBUG Array$some##(callback, instance) {
+        var length = this.length;
+        for (var i = 0; i < length; i++) {
+            if (i in this && callback.call(instance, this[i], i, this)) {
+                return true;
+            }
+        }
+        return false;
+    }
+}
+
+Array.toArray = function#? DEBUG Array$toArray##(obj) {
+    return Array.prototype.slice.call(obj);
+}
diff --git a/src/Core/CoreScript/Extensions/Boolean.js b/src/Core/CoreScript/Extensions/Boolean.js
new file mode 100644
index 000000000..558d86217
--- /dev/null
+++ b/src/Core/CoreScript/Extensions/Boolean.js
@@ -0,0 +1,8 @@
+///////////////////////////////////////////////////////////////////////////////
+// Boolean Extensions
+
+Boolean.__typeName = 'Boolean';
+
+Boolean.parse = function#? DEBUG Boolean$parse##(s) {
+    return (s.toLowerCase() == 'true');
+}
diff --git a/src/Core/CoreScript/Extensions/Date.js b/src/Core/CoreScript/Extensions/Date.js
new file mode 100644
index 000000000..00bb0b0b5
--- /dev/null
+++ b/src/Core/CoreScript/Extensions/Date.js
@@ -0,0 +1,208 @@
+///////////////////////////////////////////////////////////////////////////////
+// Date Extensions
+
+Date.__typeName = 'Date';
+
+Date.empty = null;
+
+Date.get_now = function#? DEBUG Date$get_now##() {
+    return new Date();
+}
+
+Date.get_today = function#? DEBUG Date$get_today##() {
+    var d = new Date();
+    return new Date(d.getFullYear(), d.getMonth(), d.getDate());
+}
+
+Date.isEmpty = function#? DEBUG Date$isEmpty##(d) {
+    return (d === null) || (d.valueOf() === 0);
+}
+
+Date.prototype.format = function#? DEBUG Date$format##(format) {
+    if (ss.isNullOrUndefined(format) || (format.length == 0) || (format == 'i')) {
+        return this.toString();
+    }
+    if (format == 'id') {
+        return this.toDateString();
+    }
+    if (format == 'it') {
+        return this.toTimeString();
+    }
+
+    return this._netFormat(format, false);
+}
+
+Date.prototype.localeFormat = function#? DEBUG Date$localeFormat##(format) {
+    if (ss.isNullOrUndefined(format) || (format.length == 0) || (format == 'i')) {
+        return this.toLocaleString();
+    }
+    if (format == 'id') {
+        return this.toLocaleDateString();
+    }
+    if (format == 'it') {
+        return this.toLocaleTimeString();
+    }
+
+    return this._netFormat(format, true);
+}
+
+Date.prototype._netFormat = function#? DEBUG Date$_netFormat##(format, useLocale) {
+    var dt = this;
+    var dtf = useLocale ? ss.CultureInfo.CurrentCulture.dateFormat : ss.CultureInfo.InvariantCulture.dateFormat;
+
+    if (format.length == 1) {
+        switch (format) {
+            case 'f': format = dtf.longDatePattern + ' ' + dtf.shortTimePattern; break;
+            case 'F': format = dtf.dateTimePattern; break;
+
+            case 'd': format = dtf.shortDatePattern; break;
+            case 'D': format = dtf.longDatePattern; break;
+
+            case 't': format = dtf.shortTimePattern; break;
+            case 'T': format = dtf.longTimePattern; break;
+
+            case 'g': format = dtf.shortDatePattern + ' ' + dtf.shortTimePattern; break;
+            case 'G': format = dtf.shortDatePattern + ' ' + dtf.longTimePattern; break;
+
+            case 'R': case 'r':
+                dtf = ss.CultureInfo.InvariantCulture.dateFormat;
+                format = dtf.gmtDateTimePattern;
+                break;
+            case 'u': format = dtf.universalDateTimePattern; break;
+            case 'U':
+                format = dtf.dateTimePattern;
+                dt = new Date(dt.getUTCFullYear(), dt.getUTCMonth(), dt.getUTCDate(),
+                              dt.getUTCHours(), dt.getUTCMinutes(), dt.getUTCSeconds(), dt.getUTCMilliseconds());
+                break;
+
+            case 's': format = dtf.sortableDateTimePattern; break;
+        }
+    }
+
+    if (format.charAt(0) == '%') {
+        format = format.substr(1);
+    }
+
+    if (!Date._formatRE) {
+        Date._formatRE = /'.*?[^\\]'|dddd|ddd|dd|d|MMMM|MMM|MM|M|yyyy|yy|y|hh|h|HH|H|mm|m|ss|s|tt|t|fff|ff|f|zzz|zz|z/g;
+    }
+
+    var re = Date._formatRE;
+    var sb = new ss.StringBuilder();
+
+    re.lastIndex = 0;
+    while (true) {
+        var index = re.lastIndex;
+        var match = re.exec(format);
+
+        sb.append(format.slice(index, match ? match.index : format.length));
+        if (!match) {
+            break;
+        }
+
+        var fs = match[0];
+        var part = fs;
+        switch (fs) {
+            case 'dddd':
+                part = dtf.dayNames[dt.getDay()];
+                break;
+            case 'ddd':
+                part = dtf.shortDayNames[dt.getDay()];
+                break;
+            case 'dd':
+                part = dt.getDate().toString().padLeft(2, '0');
+                break;
+            case 'd':
+                part = dt.getDate();
+                break;
+            case 'MMMM':
+                part = dtf.monthNames[dt.getMonth()];
+                break;
+            case 'MMM':
+                part = dtf.shortMonthNames[dt.getMonth()];
+                break;
+            case 'MM':
+                part = (dt.getMonth() + 1).toString().padLeft(2, '0');
+                break;
+            case 'M':
+                part = (dt.getMonth() + 1);
+                break;
+            case 'yyyy':
+                part = dt.getFullYear();
+                break;
+            case 'yy':
+                part = (dt.getFullYear() % 100).toString().padLeft(2, '0');
+                break;
+            case 'y':
+                part = (dt.getFullYear() % 100);
+                break;
+            case 'h': case 'hh':
+                part = dt.getHours() % 12;
+                if (!part) {
+                    part = '12';
+                }
+                else if (fs == 'hh') {
+                    part = part.toString().padLeft(2, '0');
+                }
+                break;
+            case 'HH':
+                part = dt.getHours().toString().padLeft(2, '0');
+                break;
+            case 'H':
+                part = dt.getHours();
+                break;
+            case 'mm':
+                part = dt.getMinutes().toString().padLeft(2, '0');
+                break;
+            case 'm':
+                part = dt.getMinutes();
+                break;
+            case 'ss':
+                part = dt.getSeconds().toString().padLeft(2, '0');
+                break;
+            case 's':
+                part = dt.getSeconds();
+                break;
+            case 't': case 'tt':
+                part = (dt.getHours() < 12) ? dtf.amDesignator : dtf.pmDesignator;
+                if (fs == 't') {
+                    part = part.charAt(0);
+                }
+                break;
+            case 'fff':
+                part = dt.getMilliseconds().toString().padLeft(3, '0');
+                break;
+            case 'ff':
+                part = dt.getMilliseconds().toString().padLeft(3).substr(0, 2);
+                break;
+            case 'f':
+                part = dt.getMilliseconds().toString().padLeft(3).charAt(0);
+                break;
+            case 'z':
+                part = dt.getTimezoneOffset() / 60;
+                part = ((part >= 0) ? '-' : '+') + Math.floor(Math.abs(part));
+                break;
+            case 'zz': case 'zzz':
+                part = dt.getTimezoneOffset() / 60;
+                part = ((part >= 0) ? '-' : '+') + Math.floor(Math.abs(part)).toString().padLeft(2, '0');
+                if (fs == 'zzz') {
+                    part += dtf.timeSeparator + Math.abs(dt.getTimezoneOffset() % 60).toString().padLeft(2, '0');
+                }
+                break;
+            default:
+                if (part.charAt(0) == '\'') {
+                    part = part.substr(1, part.length - 2).replace(/\\'/g, '\'');
+                }
+                break;
+        }
+        sb.append(part);
+    }
+
+    return sb.toString();
+}
+
+Date.parseDate = function#? DEBUG Date$parse##(s) {
+    // Date.parse returns the number of milliseconds
+    // so we use that to create an actual Date instance
+    return new Date(Date.parse(s));
+}
diff --git a/src/Core/CoreScript/Extensions/Error.js b/src/Core/CoreScript/Extensions/Error.js
new file mode 100644
index 000000000..72085e441
--- /dev/null
+++ b/src/Core/CoreScript/Extensions/Error.js
@@ -0,0 +1,51 @@
+///////////////////////////////////////////////////////////////////////////////
+// Error Extensions
+
+Error.__typeName = 'Error';
+
+Error.prototype.popStackFrame = function Error$popStackFrame() {
+    if (ss.isNullOrUndefined(this.stack) ||
+        ss.isNullOrUndefined(this.fileName) ||
+        ss.isNullOrUndefined(this.lineNumber)) {
+        return;
+    }
+
+    var stackFrames = this.stack.split('\n');
+    var currentFrame = stackFrames[0];
+    var pattern = this.fileName + ':' + this.lineNumber;
+    while (!ss.isNullOrUndefined(currentFrame) &&
+           currentFrame.indexOf(pattern) === -1) {
+        stackFrames.shift();
+        currentFrame = stackFrames[0];
+    }
+
+    var nextFrame = stackFrames[1];
+    if (isNullOrUndefined(nextFrame)) {
+        return;
+    }
+
+    var nextFrameParts = nextFrame.match(/@(.*):(\d+)$/);
+    if (ss.isNullOrUndefined(nextFrameParts)) {
+        return;
+    }
+
+    stackFrames.shift();
+    this.stack = stackFrames.join("\n");
+    this.fileName = nextFrameParts[1];
+    this.lineNumber = parseInt(nextFrameParts[2]);
+}
+
+Error.createError = function#? DEBUG Error$createError##(message, errorInfo, innerException) {
+    var e = new Error(message);
+    if (errorInfo) {
+        for (var v in errorInfo) {
+            e[v] = errorInfo[v];
+        }
+    }
+    if (innerException) {
+        e.innerException = innerException;
+    }
+
+    e.popStackFrame();
+    return e;
+}
diff --git a/src/Core/CoreScript/Extensions/Number.js b/src/Core/CoreScript/Extensions/Number.js
new file mode 100644
index 000000000..7763aefcb
--- /dev/null
+++ b/src/Core/CoreScript/Extensions/Number.js
@@ -0,0 +1,179 @@
+///////////////////////////////////////////////////////////////////////////////
+// Number Extensions
+
+Number.__typeName = 'Number';
+
+Number.parse = function#? DEBUG Number$parse##(s) {
+    if (!s || !s.length) {
+        return 0;
+    }
+    if ((s.indexOf('.') >= 0) || (s.indexOf('e') >= 0) ||
+        s.endsWith('f') || s.endsWith('F')) {
+        return parseFloat(s);
+    }
+    return parseInt(s, 10);
+}
+
+Number.prototype.format = function#? DEBUG Number$format##(format) {
+    if (ss.isNullOrUndefined(format) || (format.length == 0) || (format == 'i')) {
+        return this.toString();
+    }
+    return this._netFormat(format, false);
+}
+
+Number.prototype.localeFormat = function#? DEBUG Number$format##(format) {
+    if (ss.isNullOrUndefined(format) || (format.length == 0) || (format == 'i')) {
+        return this.toLocaleString();
+    }
+    return this._netFormat(format, true);
+}
+
+Number._commaFormat = function#? DEBUG Number$_commaFormat##(number, groups, decimal, comma) {
+    var decimalPart = null;
+    var decimalIndex = number.indexOf(decimal);
+    if (decimalIndex > 0) {
+        decimalPart = number.substr(decimalIndex);
+        number = number.substr(0, decimalIndex);
+    }
+
+    var negative = number.startsWith('-');
+    if (negative) {
+        number = number.substr(1);
+    }
+
+    var groupIndex = 0;
+    var groupSize = groups[groupIndex];
+    if (number.length < groupSize) {
+        return decimalPart ? number + decimalPart : number;
+    }
+
+    var index = number.length;
+    var s = '';
+    var done = false;
+    while (!done) {
+        var length = groupSize;
+        var startIndex = index - length;
+        if (startIndex < 0) {
+            groupSize += startIndex;
+            length += startIndex;
+            startIndex = 0;
+            done = true;
+        }
+        if (!length) {
+            break;
+        }
+        
+        var part = number.substr(startIndex, length);
+        if (s.length) {
+            s = part + comma + s;
+        }
+        else {
+            s = part;
+        }
+        index -= length;
+
+        if (groupIndex < groups.length - 1) {
+            groupIndex++;
+            groupSize = groups[groupIndex];
+        }
+    }
+
+    if (negative) {
+        s = '-' + s;
+    }    
+    return decimalPart ? s + decimalPart : s;
+}
+
+Number.prototype._netFormat = function#? DEBUG Number$_netFormat##(format, useLocale) {
+    var nf = useLocale ? ss.CultureInfo.CurrentCulture.numberFormat : ss.CultureInfo.InvariantCulture.numberFormat;
+
+    var s = '';    
+    var precision = -1;
+    
+    if (format.length > 1) {
+        precision = parseInt(format.substr(1));
+    }
+
+    var fs = format.charAt(0);
+    switch (fs) {
+        case 'd': case 'D':
+            s = parseInt(Math.abs(this)).toString();
+            if (precision != -1) {
+                s = s.padLeft(precision, '0');
+            }
+            if (this < 0) {
+                s = '-' + s;
+            }
+            break;
+        case 'x': case 'X':
+            s = parseInt(Math.abs(this)).toString(16);
+            if (fs == 'X') {
+                s = s.toUpperCase();
+            }
+            if (precision != -1) {
+                s = s.padLeft(precision, '0');
+            }
+            break;
+        case 'e': case 'E':
+            if (precision == -1) {
+                s = this.toExponential();
+            }
+            else {
+                s = this.toExponential(precision);
+            }
+            if (fs == 'E') {
+                s = s.toUpperCase();
+            }
+            break;
+        case 'f': case 'F':
+        case 'n': case 'N':
+            if (precision == -1) {
+                precision = nf.numberDecimalDigits;
+            }
+            s = this.toFixed(precision).toString();
+            if (precision && (nf.numberDecimalSeparator != '.')) {
+                var index = s.indexOf('.');
+                s = s.substr(0, index) + nf.numberDecimalSeparator + s.substr(index + 1);
+            }
+            if ((fs == 'n') || (fs == 'N')) {
+                s = Number._commaFormat(s, nf.numberGroupSizes, nf.numberDecimalSeparator, nf.numberGroupSeparator);
+            }
+            break;
+        case 'c': case 'C':
+            if (precision == -1) {
+                precision = nf.currencyDecimalDigits;
+            }
+            s = Math.abs(this).toFixed(precision).toString();
+            if (precision && (nf.currencyDecimalSeparator != '.')) {
+                var index = s.indexOf('.');
+                s = s.substr(0, index) + nf.currencyDecimalSeparator + s.substr(index + 1);
+            }
+            s = Number._commaFormat(s, nf.currencyGroupSizes, nf.currencyDecimalSeparator, nf.currencyGroupSeparator);
+            if (this < 0) {
+                s = String.format(nf.currencyNegativePattern, s);
+            }
+            else {
+                s = String.format(nf.currencyPositivePattern, s);
+            }
+            break;
+        case 'p': case 'P':
+            if (precision == -1) {
+                precision = nf.percentDecimalDigits;
+            }
+            s = (Math.abs(this) * 100.0).toFixed(precision).toString();
+            if (precision && (nf.percentDecimalSeparator != '.')) {
+                var index = s.indexOf('.');
+                s = s.substr(0, index) + nf.percentDecimalSeparator + s.substr(index + 1);
+            }
+            s = Number._commaFormat(s, nf.percentGroupSizes, nf.percentDecimalSeparator, nf.percentGroupSeparator);
+            if (this < 0) {
+                s = String.format(nf.percentNegativePattern, s);
+            }
+            else {
+                s = String.format(nf.percentPositivePattern, s);
+            }
+            break;
+    }
+
+    return s;
+}
diff --git a/src/Core/CoreScript/Extensions/Object.js b/src/Core/CoreScript/Extensions/Object.js
new file mode 100644
index 000000000..42d1723d7
--- /dev/null
+++ b/src/Core/CoreScript/Extensions/Object.js
@@ -0,0 +1,38 @@
+///////////////////////////////////////////////////////////////////////////////
+// Object Extensions
+
+Object.__typeName = 'Object';
+Object.__baseType = null;
+
+Object.clearKeys = function#? DEBUG Object$clearKeys##(d) {
+    for (var n in d) {
+        delete d[n];
+    }
+}
+
+Object.keyExists = function#? DEBUG Object$keyExists##(d, key) {
+    return d[key] !== undefined;
+}
+
+if (!Object.keys) {
+    Object.keys = function#? DEBUG Object$keys##(d) {
+        var keys = [];
+        for (var n in d) {
+            keys.push(n);
+        }
+        return keys;
+    }
+
+    Object.getKeyCount = function#? DEBUG Object$getKeyCount##(d) {
+        var count = 0;
+        for (var n in d) {
+            count++;
+        }
+        return count;
+    }
+}
+else {
+    Object.getKeyCount = function#? DEBUG Object$getKeyCount##(d) {
+        return Object.keys(d).length;
+    }
+}
diff --git a/src/Core/CoreScript/Extensions/RegExp.js b/src/Core/CoreScript/Extensions/RegExp.js
new file mode 100644
index 000000000..ea0ec4cef
--- /dev/null
+++ b/src/Core/CoreScript/Extensions/RegExp.js
@@ -0,0 +1,17 @@
+///////////////////////////////////////////////////////////////////////////////
+// RegExp Extensions
+
+RegExp.__typeName = 'RegExp';
+
+RegExp.parse = function#? DEBUG RegExp$parse##(s) {
+    if (s.startsWith('/')) {
+        var endSlashIndex = s.lastIndexOf('/');
+        if (endSlashIndex > 1) {
+            var expression = s.substring(1, endSlashIndex);
+            var flags = s.substr(endSlashIndex + 1);
+            return new RegExp(expression, flags);
+        }
+    }
+
+    return null;    
+}
diff --git a/src/Core/CoreScript/Extensions/String.js b/src/Core/CoreScript/Extensions/String.js
new file mode 100644
index 000000000..5f19f6ebb
--- /dev/null
+++ b/src/Core/CoreScript/Extensions/String.js
@@ -0,0 +1,221 @@
+///////////////////////////////////////////////////////////////////////////////
+// String Extensions
+
+String.__typeName = 'String';
+String.Empty = '';
+
+String.compare = function#? DEBUG String$compare##(s1, s2, ignoreCase) {
+    if (ignoreCase) {
+        if (s1) {
+            s1 = s1.toUpperCase();
+        }
+        if (s2) {
+            s2 = s2.toUpperCase();
+        }
+    }
+    s1 = s1 || '';
+    s2 = s2 || '';
+
+    if (s1 == s2) {
+        return 0;
+    }
+    if (s1 < s2) {
+        return -1;
+    }
+    return 1;
+}
+
+String.prototype.compareTo = function#? DEBUG String$compareTo##(s, ignoreCase) {
+    return String.compare(this, s, ignoreCase);
+}
+
+String.concat = function#? DEBUG String$concat##() {
+    if (arguments.length === 2) {
+        return arguments[0] + arguments[1];
+    }
+    return Array.prototype.join.call(arguments, '');
+}
+
+String.prototype.endsWith = function#? DEBUG String$endsWith##(suffix) {
+    if (!suffix.length) {
+        return true;
+    }
+    if (suffix.length > this.length) {
+        return false;
+    }
+    return (this.substr(this.length - suffix.length) == suffix);
+}
+
+String.equals = function#? DEBUG String$equals1##(s1, s2, ignoreCase) {
+    return String.compare(s1, s2, ignoreCase) == 0;
+}
+
+String._format = function#? DEBUG String$_format##(format, values, useLocale) {
+    if (!String._formatRE) {
+        String._formatRE = /(\{[^\}^\{]+\})/g;
+    }
+
+    return format.replace(String._formatRE,
+                          function(str, m) {
+                              var index = parseInt(m.substr(1));
+                              var value = values[index + 1];
+                              if (ss.isNullOrUndefined(value)) {
+                                  return '';
+                              }
+                              if (value.format) {
+                                  var formatSpec = null;
+                                  var formatIndex = m.indexOf(':');
+                                  if (formatIndex > 0) {
+                                      formatSpec = m.substring(formatIndex + 1, m.length - 1);
+                                  }
+                                  return useLocale ? value.localeFormat(formatSpec) : value.format(formatSpec);
+                              }
+                              else {
+                                  return useLocale ? value.toLocaleString() : value.toString();
+                              }
+                          });
+}
+
+String.format = function#? DEBUG String$format##(format) {
+    return String._format(format, arguments, /* useLocale */ false);
+}
+
+String.fromChar = function#? DEBUG String$fromChar##(ch, count) {
+    var s = ch;
+    for (var i = 1; i < count; i++) {
+        s += ch;
+    }
+    return s;
+}
+
+String.prototype.htmlDecode = function#? DEBUG String$htmlDecode##() {
+    var div = document.createElement('div');
+    div.innerHTML = this;
+    return div.textContent || div.innerText;
+}
+
+String.prototype.htmlEncode = function#? DEBUG String$htmlEncode##() {
+    var div = document.createElement('div');
+    div.appendChild(document.createTextNode(this));
+    return div.innerHTML.replace(/\"/g, '&quot;');
+}
+
+String.prototype.indexOfAny = function#? DEBUG String$indexOfAny##(chars, startIndex, count) {
+    var length = this.length;
+    if (!length) {
+        return -1;
+    }
+
+    startIndex = startIndex || 0;
+    count = count || length;
+
+    var endIndex = startIndex + count - 1;
+    if (endIndex >= length) {
+        endIndex = length - 1;
+    }
+
+    for (var i = startIndex; i <= endIndex; i++) {
+        if (chars.indexOf(this.charAt(i)) >= 0) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+String.prototype.insert = function#? DEBUG String$insert##(index, value) {
+    if (!value) {
+        return this.valueOf();
+    }
+    if (!index) {
+        return value + this;
+    }
+    var s1 = this.substr(0, index);
+    var s2 = this.substr(index);
+    return s1 + value + s2;
+}
+
+String.isNullOrEmpty = function#? DEBUG String$isNullOrEmpty##(s) {
+    return !s || !s.length;
+}
+
+String.isNullOrWhiteSpace = function#? DEBUG String$isNullOrWhiteSpace##(s) {
+    return String.isNullOrEmpty(s) || s.trim() === "";
+}
+
+String.prototype.lastIndexOfAny = function#? DEBUG String$lastIndexOfAny##(chars, startIndex, count) {
+    var length = this.length;
+    if (!length) {
+        return -1;
+    }
+
+    startIndex = startIndex || length - 1;
+    count = count || length;
+
+    var endIndex = startIndex - count + 1;
+    if (endIndex < 0) {
+        endIndex = 0;
+    }
+
+    for (var i = startIndex; i >= endIndex; i--) {
+        if (chars.indexOf(this.charAt(i)) >= 0) {
+            return i;
+        }
+    }
+    return -1;
+}
+
+String.localeFormat = function#? DEBUG String$localeFormat##(format) {
+    return String._format(format, arguments, /* useLocale */ true);
+}
+
+String.prototype.padLeft = function#? DEBUG String$padLeft##(totalWidth, ch) {
+    if (this.length < totalWidth) {
+        ch = ch || ' ';
+        return String.fromChar(ch, totalWidth - this.length) + this;
+    }
+    return this.valueOf();
+}
+
+String.prototype.padRight = function#? DEBUG String$padRight##(totalWidth, ch) {
+    if (this.length < totalWidth) {
+        ch = ch || ' ';
+        return this + String.fromChar(ch, totalWidth - this.length);
+    }
+    return this.valueOf();
+}
+
+String.prototype.remove = function#? DEBUG String$remove##(index, count) {
+    if (!count || ((index + count) > this.length)) {
+        return this.substr(0, index);
+    }
+    return this.substr(0, index) + this.substr(index + count);
+}
+
+String.prototype.replaceAll = function#? DEBUG String$replaceAll##(oldValue, newValue) {
+    newValue = newValue || '';
+    return this.split(oldValue).join(newValue);
+}
+
+String.prototype.startsWith = function#? DEBUG String$startsWith##(prefix) {
+    if (!prefix.length) {
+        return true;
+    }
+    if (prefix.length > this.length) {
+        return false;
+    }
+    return (this.substr(0, prefix.length) == prefix);
+}
+
+if (!String.prototype.trim) {
+    String.prototype.trim = function#? DEBUG String$trim##() {
+        return this.trimEnd().trimStart();
+    }
+}
+
+String.prototype.trimEnd = function#? DEBUG String$trimEnd##() {
+    return this.replace(/\s*$/, '');
+}
+
+String.prototype.trimStart = function#? DEBUG String$trimStart##() {
+    return this.replace(/^\s*/, '');
+}
diff --git a/src/Core/CoreScript/TypeSystem/Type.js b/src/Core/CoreScript/TypeSystem/Type.js
new file mode 100644
index 000000000..d8cf9c465
--- /dev/null
+++ b/src/Core/CoreScript/TypeSystem/Type.js
@@ -0,0 +1,235 @@
+///////////////////////////////////////////////////////////////////////////////
+// Type System Implementation
+
+global.Type = Function;
+Type.__typeName = 'Type';
+
+var __namespaces = {};
+var __rootNamespaces = [];
+
+function ns(name) {
+    this.__typeName = name;
+}
+ns.prototype = {
+    __namespace: true,
+    getName: function() {
+        return this.__typeName;
+    }
+}
+
+Type.registerNamespace = function#? DEBUG Type$registerNamespace##(name) {
+    if (__namespaces[name]) {
+        return;
+    }
+
+    var nsi = global;
+    var nameParts = name.split('.');
+
+    for (var i = 0; i < nameParts.length; i++) {
+        var part = nameParts[i];
+        var nso = nsi[part];
+        if (!nso) {
+            nsi[part] = nso = new ns(nameParts.slice(0, i + 1).join('.'));
+            if (i == 0) {
+                __rootNamespaces.add(nso);
+            }
+        }
+        nsi = nso;
+    }
+
+    __namespaces[name] = nsi;
+}
+
+Type.prototype.registerClass = function#? DEBUG Type$registerClass##(name, baseType, interfaceType) {
+    this.prototype.constructor = this;
+    this.__typeName = name;
+    this.__class = true;
+    this.__baseType = baseType || Object;
+    if (baseType) {
+        this.__basePrototypePending = true;
+    }
+
+    if (interfaceType) {
+        this.__interfaces = [];
+        for (var i = 2; i < arguments.length; i++) {
+            interfaceType = arguments[i];
+            this.__interfaces.add(interfaceType);
+        }
+    }
+}
+
+Type.prototype.registerInterface = function#? DEBUG Type$createInterface##(name) {
+    this.__typeName = name;
+    this.__interface = true;
+}
+
+Type.prototype.registerEnum = function#? DEBUG Type$createEnum##(name, flags) {
+    for (var field in this.prototype) {
+         this[field] = this.prototype[field];
+    }
+
+    this.__typeName = name;
+    this.__enum = true;
+    if (flags) {
+        this.__flags = true;
+    }
+}
+
+Type.prototype.setupBase = function#? DEBUG Type$setupBase##() {
+    if (this.__basePrototypePending) {
+        var baseType = this.__baseType;
+        if (baseType.__basePrototypePending) {
+            baseType.setupBase();
+        }
+
+        for (var memberName in baseType.prototype) {
+            var memberValue = baseType.prototype[memberName];
+            if (!this.prototype[memberName]) {
+                this.prototype[memberName] = memberValue;
+            }
+        }
+
+        delete this.__basePrototypePending;
+    }
+}
+
+if (!Type.prototype.resolveInheritance) {
+    // This function is not used by Script#; Visual Studio relies on it
+    // for JavaScript IntelliSense support of derived types.
+    Type.prototype.resolveInheritance = Type.prototype.setupBase;
+}
+
+Type.prototype.initializeBase = function#? DEBUG Type$initializeBase##(instance, args) {
+    if (this.__basePrototypePending) {
+        this.setupBase();
+    }
+
+    if (!args) {
+        this.__baseType.apply(instance);
+    }
+    else {
+        this.__baseType.apply(instance, args);
+    }
+}
+
+Type.prototype.callBaseMethod = function#? DEBUG Type$callBaseMethod##(instance, name, args) {
+    var baseMethod = this.__baseType.prototype[name];
+    if (!args) {
+        return baseMethod.apply(instance);
+    }
+    else {
+        return baseMethod.apply(instance, args);
+    }
+}
+
+Type.prototype.get_baseType = function#? DEBUG Type$get_baseType##() {
+    return this.__baseType || null;
+}
+
+Type.prototype.get_fullName = function#? DEBUG Type$get_fullName##() {
+    return this.__typeName;
+}
+
+Type.prototype.get_name = function#? DEBUG Type$get_name##() {
+    var fullName = this.__typeName;
+    var nsIndex = fullName.lastIndexOf('.');
+    if (nsIndex > 0) {
+        return fullName.substr(nsIndex + 1);
+    }
+    return fullName;
+}
+
+Type.prototype.isInstanceOfType = function#? DEBUG Type$isInstanceOfType##(instance) {
+    if (ss.isNullOrUndefined(instance)) {
+        return false;
+    }
+    if ((this == Object) || (instance instanceof this)) {
+        return true;
+    }
+
+    var type = Type.getInstanceType(instance);
+    return this.isAssignableFrom(type);
+}
+
+Type.prototype.isAssignableFrom = function#? DEBUG Type$isAssignableFrom##(type) {
+    if ((this == Object) || (this == type)) {
+        return true;
+    }
+    if (this.__class) {
+        var baseType = type.__baseType;
+        while (baseType) {
+            if (this == baseType) {
+                return true;
+            }
+            baseType = baseType.__baseType;
+        }
+    }
+    else if (this.__interface) {
+        var interfaces = type.__interfaces;
+        if (interfaces && interfaces.contains(this)) {
+            return true;
+        }
+
+        var baseType = type.__baseType;
+        while (baseType) {
+            interfaces = baseType.__interfaces;
+            if (interfaces && interfaces.contains(this)) {
+                return true;
+            }
+            baseType = baseType.__baseType;
+        }
+    }
+    return false;
+}
+
+Type.isClass = function#? DEBUG Type$isClass##(obj) {
+    return (obj.__class == true);
+}
+
+Type.isInterface = function#? DEBUG Type$isInterface##(obj) {
+    return (obj.__interface == true);
+}
+
+Type.canCast = function#? DEBUG Type$canCast##(instance, type) {
+    return type.isInstanceOfType(instance);
+}
+
+Type.safeCast = function#? DEBUG Type$safeCast##(instance, type) {
+    if (type.isInstanceOfType(instance)) {
+        return instance;
+    }
+    return null;
+}
+
+Type.getInstanceType = function#? DEBUG Type$getInstanceType##(instance) {
+    var ctor = null;
+
+    // NOTE: We have to catch exceptions because the constructor
+    //       cannot be looked up on native COM objects
+    try {
+        ctor = instance.constructor;
+    }
+    catch (ex) {
+    }
+    if (!ctor || !ctor.__typeName) {
+        ctor = Object;
+    }
+    return ctor;
+}
+
+Type.getType = function#? DEBUG Type$getType##(typeName) {
+    if (!typeName) {
+        return null;
+    }
+
+    if (!Type.__typeCache) {
+        Type.__typeCache = {};
+    }
+
+    var type = Type.__typeCache[typeName];
+    if (!type) {
+        type = eval(typeName);
+        Type.__typeCache[typeName] = type;
+    }
+    return type;
+}
diff --git a/src/Core/CoreScript/loader.js b/src/Core/CoreScript/loader.js
new file mode 100644
index 000000000..b938a520a
--- /dev/null
+++ b/src/Core/CoreScript/loader.js
@@ -0,0 +1,492 @@
+(function () {
+  var _head = document.getElementsByTagName('head')[0];
+
+  var _downloaderType = navigator.userAgent.indexOf('MSIE') > 0 ? 'img' : 'object';
+  var _xdomainRegex = /^https?:\/\/.*/;
+
+  // Storage cookie defaults to 'scripts', but can be overriden via a scriptCookie
+  // expando on the document.
+  var _storageCookie = document.scriptCookie || 'scripts';
+
+  // Debuggable scripts defaults to false, but can be overriden via a scriptDebugging
+  // flag set to true on the document object.
+  var _debuggableScripts = document.scriptDebugging || false;
+
+  // The script loader provides functionality to download scripts from the network
+  // and load/save from/to local storage. A script loader can be specified on the
+  // document, and if not a default implementation if used here.
+  var _scriptLoader = document.scriptLoader ||
+    {
+      download: function (script, callback) {
+        // Use the x-domain loader if the script is x-domain, or we're
+        // in debug mode (when using the x-domain loader, we end up
+        // inserting an actual script element to subsequently load the script
+        // into the page, enabling debugging)
+
+        if (_debuggableScripts || _xdomainRegex.test(script.src)) {
+          // Downloads script using an img tag (in IE) or an object tag (in other
+          // browsers).
+          var downloader = document.createElement(_downloaderType);
+          downloader.style.width = downloader.style.height = '0px';
+          downloader.onload = downloader.onerror = function () {
+            downloader.onload = downloader.onerror = null;
+            callback();
+          };
+          downloader.src = downloader.data = script.src;
+          document.body.appendChild(downloader);
+        }
+        else {
+          // Downloads script using an XHR object. This allows us to retrieve the
+          // content of the script and thereby allow us to subsequently use the
+          // script text to insert a script element into the page, when the time
+          // comes to load the script.
+          var downloader = new XMLHttpRequest();
+          downloader.onreadystatechange = function () {
+            if (downloader.readyState == 4) {
+              downloader.onreadystatechange = null;
+
+              script.useText = true;
+              script.text = downloader.responseText;
+              callback();
+            }
+          };
+          downloader.open('GET', script.src, true);
+          downloader.send();
+        }
+      },
+
+      canStore: !!window.localStorage,
+
+      load: function (name) {
+        return window.localStorage['script.' + name];
+      },
+
+      save: function (name, version, text) {
+        window.localStorage['script.' + name] = text;
+
+        // Save the fact that we have stored this script into the local storage
+        // by updating the index with the new script information, and using
+        // the index as the value of the cookie sent to the server as well.
+        var scriptIndex = window.localStorage['script.$'];
+
+        scriptIndex = scriptIndex ? JSON.parse(scriptIndex) : {};
+        scriptIndex[name] = version;
+
+        scriptIndex = JSON.stringify(scriptIndex);
+        window.localStorage['script.$'] = scriptIndex;
+
+        // A cookie with 180 days = 60 * 60 * 24 * 180 seconds
+        document.cookie = _storageCookie + '=' + encodeURIComponent(scriptIndex) +
+                          '; max-age=15552000; path=/';
+      }
+    };
+
+  var _initCallbacks = [];
+  var _readyCallbacks = [];
+  var _registeredScripts = {};
+  var _started = false;
+
+  // Checks if the specified required scripts have been loaded.
+  function checkScripts(name, requiredNames) {
+    if (requiredNames) {
+      requiredNames.split(',').forEach(function (s) {
+        if (!_registeredScripts[s] || !_registeredScripts[s].loaded) {
+          console.error(s + ' has not been loaded before ' + name);
+        }
+      });
+    }
+  }
+
+  // Loads the specified script or scripts (identified by their registered
+  // names) and invokes the specified callback (along with optional context)
+  // when the scripts have been loaded.
+  function loadScripts(scriptNames, callback, context) {
+    scriptNames = scriptNames['push'] ? scriptNames : [scriptNames];
+    _loadScripts(scriptNames, callback, context);
+  }
+
+  // Registers a callback to be invoked before script initialization occurs.
+  // This is raised in response to the DOMContentLoaded event.
+  // If initialization is complete, the callback is immediately invoked.
+  function registerInitCallback(callback) {
+    _initCallbacks ? _initCallbacks.push(callback) : setTimeout(callback, 0);
+  }
+
+  // Registers a callback to be invoked once startup scripts have been loaded
+  // into the page, and any inline scripts have been executed.
+  // If the page is ready, the callback is immediately invoked.
+  function registerReadyCallback(callback) {
+    _readyCallbacks ? _readyCallbacks.push(callback) : setTimeout(callback, 0);
+  }
+
+  // Registers a script programmatically. A script object has the following
+  // structure:
+  // {
+  //   name: <name of script>,
+  //   src: <url of script>,
+  //   requires: <optional array of script dependencies>
+  // }
+  function registerScript(script) {
+    script.loaded = false;
+    _registeredScripts[script.name] = script;
+  }
+
+  // Downloads the script into the browser's cache, and invokes the specified
+  // callback (optional) upon completion. The script is not loaded into the page,
+  // i.e. it is not executed just yet.
+  function _downloadScript(script, callback) {
+    if (script.downloaded) {
+      // Already downloaded, so invoke the callback immediately.
+      if (callback) {
+        callback(script);
+      }
+      return;
+    }
+    if (script.store && _scriptLoader.canStore) {
+      if (script.store == 'load') {
+        // Load the script content from local storage using the script name
+        // as a key into local storage.
+        script.useText = true;
+        script.text = _scriptLoader.load(script.name);
+      }
+      else {
+        // Save the inline script content using specified version into local
+        // storage, using the name as a key. The value of data-store on the
+        // script element is interpreted as the version identifier.
+
+        script.useText = true;
+        _scriptLoader.save(script.name, script.store, script.text);
+      }
+
+      script.downloaded = true;
+      if (callback) {
+        callback(script);
+      }
+      return;
+    }
+    if (script.downloading) {
+      // The script is already being downloaded, so just tack on the
+      // callback to the script element.
+      if (callback) {
+        if (!script.downloadCallbacks) {
+          script.downloadCallbacks = [callback];
+        }
+        else {
+          script.downloadCallbacks.push(callback);
+        }
+      }
+      return;
+    }
+
+    script.downloading = true;
+
+    var cb = function () {
+      script.downloaded = true;
+      script.downloading = false;
+      if (callback) {
+        callback(script);
+      }
+      if (script.downloadCallbacks) {
+        script.downloadCallbacks.forEach(function (cb) {
+          cb(script);
+        });
+        delete script.downloadCallbacks;
+      }
+    };
+
+    _scriptLoader.download(script, cb);
+  }
+
+  // Loads the script into the page, by inserting an actual script element,
+  // and invoking the specified callback once the script has been loaded.
+  function _execScript(script, callback) {
+    if (script.loaded) {
+      // Already loaded. Invoke the callback immediately.
+      callback(script);
+      return;
+    }
+
+    var s = document.createElement('script');
+    s.type = 'text/javascript';
+    if (script.useText) {
+      // Load the script with script content inline. This allows us to load script
+      // while making sure another download is not incurred.
+      s.text = script.text;
+      setTimeout(function () {
+        script.loaded = true;
+        callback(script);
+      }, 0);
+    }
+    else {
+      // Load the script with its src. This ensures the script is debuggable, i.e. listed
+      // within the browser's loaded scripts.
+      s.onload = s.onreadystatechange = function () {
+        if (s.readyState && s.readyState != 'complete' && s.readyState != 'loaded') {
+          return;
+        }
+        s.onload = s.onreadystatechange = null;
+        script.loaded = true;
+        callback(script);
+      };
+      s.src = script.src;
+    }
+    _head.appendChild(s);
+  }
+
+  // Loads script with script content inline.
+  function _evalScript(script) {
+    var s = document.createElement('script');
+    s.type = 'text/javascript';
+    s.text = script.text;
+    _head.appendChild(s);
+  }
+
+  // Helper to invoke a set of callbacks.
+  function _invokeCallbacks(callbacks) {
+    if (callbacks && callbacks.length) {
+      callbacks.forEach(function (callback) {
+        callback();
+      });
+    }
+  }
+
+  // Loads a set of scripts and invokes the specified callback along
+  // with specified context.
+  function _loadScripts(scriptNames, callback, context) {
+    if (scriptNames.length == 0) {
+      callback(context);
+      return;
+    }
+
+    var loadCount = 0;
+    var downloaded = [];
+
+    // This is invoked everytime a script has been loaded/executed within the page.
+    function scriptLoaded(script) {
+      loadCount++;
+      if (scriptNames.length == loadCount) {
+        // All scripts have been loaded, so now invoke the passed in callback.
+        callback(context);
+      }
+      else {
+        if (downloaded.length) {
+          // Try to process any downloads that need to be downloaded, as this
+          // script might have been the dependency of one of those pending scripts.
+          processDownloaded();
+        }
+      }
+    }
+
+    // This is invoked everytime a script has been downloaded. We add it to the list
+    // of downloaded scripts and attempt to process it further.
+    function scriptDownloaded(script) {
+      downloaded.push(script);
+      processDownloaded();
+    }
+
+    // This processes a set of downloaded scripts. Any scripts whose dependencies
+    // have also been loaded will be executed.
+    function processDownloaded() {
+      // Hold on to the list of downloaded scripts needing to be processed
+      // in this iteration.
+      var scripts = downloaded;
+      if (scripts.length) {
+        // Reset the downloaded scripts array, so scripts can be added to it
+        // for being processed in a subsequent iteration.
+        downloaded = [];
+        scripts.forEach(function (script) {
+          var load = true;
+          if (script.requires) {
+            // Check if all dependencies have been loaded to determine if this
+            // script should now be loaded into the page.
+            load = script.requires.every(function (dependencyName) {
+              return _registeredScripts[dependencyName].loaded;
+            });
+          }
+          if (load) {
+            _execScript(script, scriptLoaded);
+          }
+          else {
+            // A dependency has not yet been loaded, so re-add it to
+            // the list of downloads. The list of downloads will be
+            // re-examined when another script is downloaded or loaded
+            // into the page.
+            downloaded.push(script);
+          }
+        });
+      }
+    }
+
+    // Expand the list of script names to include any dependencies not
+    // already included in the list that haven't already been loaded.
+    var scriptMap = {};
+    scriptNames.forEach(function (name) {
+      scriptMap[name] = name;
+    });
+
+    var i = 0;
+    do {
+      var script = _registeredScripts[scriptNames[i++]];
+      if (script.requires) {
+        for (var j = script.requires.length - 1; j >= 0; j--) {
+          var dependencyName = script.requires[j];
+          if (!scriptMap[dependencyName] && !_registeredScripts[dependencyName].loaded) {
+            // Found a dependency that needs to be included into the list
+            // of scripts to be loaded, since it is a required dependency.
+            scriptNames.push(dependencyName);
+            scriptMap[dependencyName] = dependencyName;
+          }
+        }
+      }
+    } while (i < scriptNames.length);
+
+    // Kick off downloading any scripts that need to be downloaded.
+    // For those scripts that have been loaded, we don't need to attempt
+    // downloading/loading them, but we do need to track them, so we know when
+    // all required scripts have been loaded so as to invoke the passed in
+    // callback.
+    var done = true;
+    scriptNames.forEach(function (name) {
+      var script = _registeredScripts[name];
+      if (script.loaded) {
+        loadCount++;
+      }
+      else {
+        _downloadScript(script, scriptDownloaded);
+        done = false;
+      }
+    });
+
+    // If we're done, i.e. all scripts were already loaded, then just go ahead
+    // and invoke the passed in callback.
+    if (done) {
+      callback(context);
+    }
+  }
+
+  // Invoke any ready callbacks that have been registered.
+  function _raiseReady(deferredScripts) {
+    // Kick off downloads for any deferred scripts (but don't load them into the
+    // page just yet).
+    deferredScripts.forEach(function (name) {
+      var script = _registeredScripts[name];
+      if (script.loaded) {
+        return;
+      }
+      _downloadScript(script);
+    });
+
+    var readyCallbacks = _readyCallbacks;
+    _readyCallbacks = null;
+    _invokeCallbacks(readyCallbacks);
+  }
+
+  // Perform the page startup logic (in response to the DOMContentLoaded
+  // notification raised by the DOM document, or an explicit call to load).
+  function _startup() {
+    if (_started) {
+      return;
+    }
+    _started = true;
+
+    // First invoke the registered init callbacks. This allows page code
+    // to programmatically register scripts.
+    var initCallbacks = _initCallbacks;
+    _initCallbacks = null;
+    _invokeCallbacks(initCallbacks);
+
+    // Storage cookie defaults to 'scripts', but can be overriden via an
+    // attribute on the body element.
+    _storageCookie = document.body.getAttribute('data-scripts-cookie') || 'scripts';
+
+    var startupScripts = [];
+    var deferredScripts = [];
+    var inlineScripts = [];
+
+    // Extract the list of registered scripts and inline scripts by enumerating
+    // script elements with type = text/script.
+
+    var scriptElements = document.getElementsByTagName('script');
+    for (var i = 0, count = scriptElements.length; i < count; i++) {
+      var scriptElement = scriptElements[i];
+      if (scriptElement.type == 'text/script') {
+        var script = {
+          name: scriptElement.getAttribute('data-name'),
+          src: scriptElement.getAttribute('data-src'),
+          requires: scriptElement.getAttribute('data-requires'),
+          mode: scriptElement.getAttribute('data-mode') || 'startup',
+          text: scriptElement.text,
+          store: scriptElement.getAttribute('data-store')
+        };
+        if (script.requires) {
+          script.requires = script.requires.split(',');
+        }
+
+        if (script.name) {
+          registerScript(script);
+          if (script.mode == 'startup') {
+            startupScripts.push(script.name);
+          }
+          else if (script.mode == 'deferred') {
+            deferredScripts.push(script.name);
+          }
+          // TODO: Error check - script.mode must be 'ondemand'
+        }
+        else {
+          inlineScripts.push(script);
+        }
+      }
+    }
+
+    // Load the startup scripts, and once that is done, execute any inline
+    // scripts there are on the page.
+    _loadScripts(startupScripts, function () {
+      var inlinesProcessed = 0;
+      if (inlineScripts.length) {
+        inlineScripts.forEach(function (script) {
+          if (script.requires) {
+            // If an inline script has a dependency on other scripts, ensure
+            // they are loaded first.
+            _loadScripts(script.requires, function (s) {
+              _evalScript(s);
+              inlinesProcessed++;
+
+              // If all the inlines have been processed, then go ahead and invoke
+              // the ready callbacks.
+              if (inlinesProcessed == inlineScripts.length) {
+                _raiseReady(deferredScripts);
+              }
+            }, script);
+          }
+          else {
+            _evalScript(script);
+            inlinesProcessed++;
+          }
+        });
+      }
+
+      // If all the inlines have been processed, then go ahead and invoke
+      // the ready callbacks.
+      if (inlinesProcessed == inlineScripts.length) {
+        _raiseReady(deferredScripts);
+      }
+    });
+  }
+
+  window.loader = {
+    load: _startup,
+    loadScripts: loadScripts,
+    checkScripts: checkScripts,
+    registerScript: registerScript,
+    init: registerInitCallback,
+    ready: registerReadyCallback
+  };
+  if (document.addEventListener) {
+    document.readyState == 'complete' ? _startup() : document.addEventListener('DOMContentLoaded', _startup, false);
+  }
+  else if (window.attachEvent) {
+    window.attachEvent('onload', function () {
+      _startup();
+    });
+  }
+})();
diff --git a/src/Core/CoreScript/mscorlib.js b/src/Core/CoreScript/mscorlib.js
new file mode 100644
index 000000000..ea432309b
--- /dev/null
+++ b/src/Core/CoreScript/mscorlib.js
@@ -0,0 +1,71 @@
+//! Script# Core Runtime
+//! More information at http://projects.nikhilk.net/ScriptSharp
+//!
+
+(function(global) {
+  global.ss = {
+    version: '0.7.6.0',
+
+    isUndefined: function(o) {
+      return (o === undefined);
+    },
+
+    isNull: function(o) {
+      return (o === null);
+    },
+
+    isNullOrUndefined: function(o) {
+      return (o === null) || (o === undefined);
+    },
+
+    isValue: function(o) {
+      return (o !== null) && (o !== undefined);
+    }
+  };
+
+#include "Extensions\Object.js"
+
+#include "Extensions\Boolean.js"
+
+#include "Extensions\Number.js"
+
+#include "Extensions\String.js"
+
+#include "Extensions\Array.js"
+
+#include "Extensions\RegExp.js"
+
+#include "Extensions\Date.js"
+
+#include "Extensions\Error.js"
+
+#include "BCL\Debug.js"
+
+#include "TypeSystem\Type.js"
+
+#include "BCL\Delegate.js"
+
+#include "BCL\CultureInfo.js"
+
+#include "BCL\IEnumerator.js"
+
+#include "BCL\IEnumerable.js"
+
+#include "BCL\ArrayEnumerator.js"
+
+#include "BCL\IDisposable.js"
+
+#include "BCL\StringBuilder.js"
+
+#include "BCL\EventArgs.js"
+
+#include "BCL\CancelEventArgs.js"
+
+#include "BCL\Tuple.js"
+
+#include "BCL\Observable.js"
+
+#include "BCL\Task.js"
+
+#include "BCL\App.js"
+})(this);
diff --git a/src/Core/FileInputStreamSource.cs b/src/Core/FileInputStreamSource.cs
new file mode 100644
index 000000000..c4778fc34
--- /dev/null
+++ b/src/Core/FileInputStreamSource.cs
@@ -0,0 +1,54 @@
+// FileInputStreamSource.cs
+// Script#/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.IO;
+
+namespace ScriptSharp {
+
+    internal class FileInputStreamSource : IStreamSource {
+
+        private string _path;
+        private string _name;
+
+        public FileInputStreamSource(string path)
+            : this(path, path) {
+        }
+
+        public FileInputStreamSource(string path, string name) {
+            _path = path;
+            _name = name;
+        }
+
+        public string FullName {
+            get {
+                return Path.GetFullPath(_path);
+            }
+        }
+
+        public string Name {
+            get {
+                return _name;
+            }
+        }
+
+        public void CloseStream(Stream stream) {
+            Debug.Assert(stream != null);
+            Debug.Assert(stream is FileStream);
+
+            stream.Close();
+        }
+
+        public Stream GetStream() {
+            try {
+                return new FileStream(FullName, FileMode.Open, FileAccess.Read, FileShare.Read);
+            }
+            catch {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Core/FileOutputStreamSource.cs b/src/Core/FileOutputStreamSource.cs
new file mode 100644
index 000000000..c9bf9f017
--- /dev/null
+++ b/src/Core/FileOutputStreamSource.cs
@@ -0,0 +1,61 @@
+// FileOutputStreamSource.cs
+// Script#/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.IO;
+
+namespace ScriptSharp {
+
+    internal class FileOutputStreamSource : IStreamSource {
+
+        private string _path;
+        private string _name;
+
+        public FileOutputStreamSource(string path)
+            : this(path, path) {
+        }
+
+        public FileOutputStreamSource(string path, string name) {
+            _path = path;
+            _name = name;
+        }
+
+        public string FullName {
+            get {
+                return Path.GetFullPath(_path);
+            }
+        }
+
+        public string Name {
+            get {
+                return _name;
+            }
+        }
+
+        public void CloseStream(Stream stream) {
+            Debug.Assert(stream != null);
+            Debug.Assert(stream is FileStream);
+
+            stream.Close();
+        }
+
+        public Stream GetStream() {
+            try {
+                string file = FullName;
+
+                string directory = Path.GetDirectoryName(file);
+                if (Directory.Exists(directory) == false) {
+                    Directory.CreateDirectory(directory);
+                }
+
+                return new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None);
+            }
+            catch {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Core/ResXItem.cs b/src/Core/ResXItem.cs
new file mode 100644
index 000000000..ee0f2646c
--- /dev/null
+++ b/src/Core/ResXItem.cs
@@ -0,0 +1,49 @@
+// ResXItem.cs
+// Script#/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+
+namespace ScriptSharp {
+
+    internal sealed class ResXItem {
+
+        private string _name;
+        private string _value;
+        private string _comment;
+
+        public ResXItem(string name, string value, string comment) {
+            Debug.Assert(String.IsNullOrEmpty(name) == false);
+
+            _name = name;
+            _value = value;
+            _comment = comment;
+        }
+
+        public string Comment {
+            get {
+                if (_comment == null) {
+                    return String.Empty;
+                }
+                return _comment;
+            }
+        }
+
+        public string Name {
+            get {
+                return _name;
+            }
+        }
+
+        public string Value {
+            get {
+                if (_value == null) {
+                    return String.Empty;
+                }
+                return _value;
+            }
+        }
+    }
+}
diff --git a/src/Core/ResXParser.cs b/src/Core/ResXParser.cs
new file mode 100644
index 000000000..8d3ec2c12
--- /dev/null
+++ b/src/Core/ResXParser.cs
@@ -0,0 +1,52 @@
+// ResXParser.cs
+// Script#/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml;
+
+namespace ScriptSharp {
+
+    internal static class ResXParser {
+
+        public static List<ResXItem> ParseResxMarkup(string resxMarkup) {
+            List<ResXItem> items = new List<ResXItem>();
+
+            XmlTextReader resxReader = new XmlTextReader(new StringReader(resxMarkup));
+            while (resxReader.Read()) {
+                if ((resxReader.NodeType == XmlNodeType.Element) &&
+                    (String.CompareOrdinal(resxReader.LocalName, "data") == 0)) {
+                    string name = resxReader["name"];
+                    string value = null;
+                    string comment = null;
+
+                    while (resxReader.Read()) {
+                        if (resxReader.NodeType == XmlNodeType.Element) {
+                            if (String.CompareOrdinal(resxReader.LocalName, "value") == 0) {
+                                WhitespaceHandling oldWhitespace = resxReader.WhitespaceHandling;
+                                resxReader.WhitespaceHandling = WhitespaceHandling.Significant;
+
+                                value = resxReader.ReadString();
+                                resxReader.WhitespaceHandling = oldWhitespace;
+                            }
+                            else if (String.CompareOrdinal(resxReader.LocalName, "comment") == 0) {
+                                comment = resxReader.ReadString();
+                            }
+                        }
+                        else if ((resxReader.NodeType == XmlNodeType.EndElement) &&
+                                 (String.CompareOrdinal(resxReader.LocalName, "data") == 0)) {
+                            break;
+                        }
+                    }
+
+                    items.Add(new ResXItem(name, value, comment));
+                }
+            }
+
+            return items;
+        }
+    }
+}
diff --git a/src/Core/ResourceFile.cs b/src/Core/ResourceFile.cs
new file mode 100644
index 000000000..a3d628477
--- /dev/null
+++ b/src/Core/ResourceFile.cs
@@ -0,0 +1,32 @@
+// ResourceFile.cs
+// Script#/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+using System.Text;
+
+namespace ScriptSharp {
+
+    internal static class ResourceFile {
+
+        public static string GetLocale(string fileName) {
+            string extension = Path.GetExtension(fileName);
+
+            if (String.Compare(extension, ".resx", StringComparison.OrdinalIgnoreCase) == 0) {
+                fileName = Path.GetFileNameWithoutExtension(fileName);
+
+                extension = Path.GetExtension(fileName);
+                if (String.IsNullOrEmpty(extension) == false) {
+                    return extension.Substring(1);
+                }
+            }
+
+            return String.Empty;
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/BindingContext.cs b/src/Libraries/Knockout/BindingContext.cs
new file mode 100644
index 000000000..9b9fa8715
--- /dev/null
+++ b/src/Libraries/Knockout/BindingContext.cs
@@ -0,0 +1,44 @@
+// BindingContext.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    [Imported]
+    [IgnoreNamespace]
+    public class BindingContext<TRoot, TParent, T> {
+
+        [IntrinsicProperty]
+        [ScriptName("$data")]
+        public T Data {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("$parent")]
+        public TParent Parent {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("$parents")]
+        public TParent[] Parents {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("$root")]
+        public TRoot[] Root {
+            get;
+            set;
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/BindingHandler.cs b/src/Libraries/Knockout/BindingHandler.cs
new file mode 100644
index 000000000..38eb182e3
--- /dev/null
+++ b/src/Libraries/Knockout/BindingHandler.cs
@@ -0,0 +1,43 @@
+// BindingHandler.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    /// <summary>
+    /// Represents a custom binding handler in Knockout.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public abstract class BindingHandler {
+
+        /// <summary>
+        /// Performs one time initialization for a binding.
+        /// </summary>
+        /// <param name="element">The element involved in this binding.</param>
+        /// <param name="valueAccessor">A function which returns the model property that is involved in this binding.</param>
+        /// <param name="allBindingsAccessor">A function which returns all the model properties bound to this element.</param>
+        /// <param name="viewModel">The view model instance involved in this binding.</param>
+        /// <param name="context">The binding context involved in this binding.</param>
+        public virtual void Init(Element element, Func<object> valueAccessor, Func<Dictionary> allBindingsAccessor, object viewModel, object context) {
+        }
+
+        /// <summary>
+        /// Invoked whenever an observable associated with this binding changes.
+        /// </summary>
+        /// <param name="element">The element involved in this binding.</param>
+        /// <param name="valueAccessor">A function which returns the model property that is involved in this binding.</param>
+        /// <param name="allBindingsAccessor">A function which returns all the model properties bound to this element.</param>
+        /// <param name="viewModel">The view model instance involved in this binding.</param>
+        /// <param name="context">The binding context involved in this binding.</param>
+        public virtual void Update(Element element, Func<object> valueAccessor, Func<Dictionary> allBindingsAccessor, object viewModel, object context) {
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/CompareResult.cs b/src/Libraries/Knockout/CompareResult.cs
new file mode 100644
index 000000000..308c08552
--- /dev/null
+++ b/src/Libraries/Knockout/CompareResult.cs
@@ -0,0 +1,27 @@
+// CompareResult.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    [Imported]
+    [IgnoreNamespace]
+    public class CompareResult<T> {
+
+        [IntrinsicProperty]
+        public CompareResultStatus Status {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        public T Value {
+            get;
+            set;
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/CompareResultStatus.cs b/src/Libraries/Knockout/CompareResultStatus.cs
new file mode 100644
index 000000000..aa1c8f3ac
--- /dev/null
+++ b/src/Libraries/Knockout/CompareResultStatus.cs
@@ -0,0 +1,22 @@
+// CompareResultStatus.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [IgnoreNamespace]
+    [Imported]
+    [NamedValues]
+    public enum CompareResultStatus {
+
+        Added,
+
+        Deleted,
+
+        Retained
+    }
+}
diff --git a/src/Libraries/Knockout/DependentObservable.cs b/src/Libraries/Knockout/DependentObservable.cs
new file mode 100644
index 000000000..deb586c9d
--- /dev/null
+++ b/src/Libraries/Knockout/DependentObservable.cs
@@ -0,0 +1,82 @@
+// DependentObservable.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    /// <summary>
+    /// Represents an object containing a value dependent on other observable values.
+    /// </summary>
+    /// <typeparam name="T">The type of the contained value.</typeparam>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class DependentObservable<T> {
+
+        private DependentObservable() {
+        }
+
+        /// <summary>
+        /// Gets the current computed value.
+        /// </summary>
+        /// <returns>The current value.</returns>
+        [ScriptName("")]
+        public T GetValue() {
+            return default(T);
+        }
+
+        /// <summary>
+        /// Disposes this Subscribable
+        /// </summary>
+        public void Dispose() {
+        }
+
+        /// <summary>
+        /// For dependent observables, we throttle *evaluations* so that, no matter how fast its dependencies        
+        /// notify updates, the target doesn't re-evaluate (and hence doesn't notify) faster than a certain rate
+        /// For writable targets (observables, or writable dependent observables), we throttle *writes*        
+        /// so the target cannot change value synchronously or faster than a certain rate
+        /// </summary>
+        /// <param name="options"></param>
+        /// <returns>Extend is Chainable</returns>
+        public DependentObservable<T> Extend(Dictionary options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Get Dependencies Count
+        /// </summary>
+        /// <returns>Returns the Number of Dependencies</returns>
+        public int GetDependenciesCount() { 
+            return 0; 
+        }
+
+        /// <summary>
+        /// Sets the Value and Notifies all of the Subscribers
+        /// </summary>
+        /// <param name="value">The Value to be Set</param>
+        public void NotifySubscribers(T value) {
+        }
+
+        /// <summary>
+        /// Sets the Value and Notifies all of the Subscribers for the Specified Event
+        /// </summary>
+        /// <param name="value">The Value to be Set</param>
+        /// <param name="eventName">[Optional] Event Name</param>
+        public void NotifySubscribers(T value, string eventName) {
+        }
+
+        /// <summary>
+        /// Subscribes to change notifications raised when the value changes.
+        /// </summary>
+        /// <param name="changeCallback">The callback to invoke.</param>
+        /// <returns>A subscription cookie that can be disposed to unsubscribe.</returns>
+        public IDisposable Subscribe(Action<T> changeCallback) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/DependentObservableOptions.cs b/src/Libraries/Knockout/DependentObservableOptions.cs
new file mode 100644
index 000000000..f440c10ce
--- /dev/null
+++ b/src/Libraries/Knockout/DependentObservableOptions.cs
@@ -0,0 +1,89 @@
+// DependentObservableOptions.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    /// <summary>
+    /// Provides advanced options for defining a dependent observable.
+    /// </summary>
+    /// <typeparam name="T">The type of the observable value.</typeparam>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DependentObservableOptions<T> {
+
+        /// <summary>
+        /// Gets or sets whether the evaluation should be deferred, i.e. not
+        /// performed when the observable is first created.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool DeferEvaluation {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Pass in a function that evaluates when the Dependency can be disposed
+        /// </summary>
+        [IntrinsicProperty]
+        public Func<bool> DisposeWhen {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// "disposeWhenNodeIsRemoved" option both proactively disposes as soon as the node is removed using ko.removeNode(),    
+        /// plus adds a "disposeWhen" callback that, on each evaluation, disposes if the node was removed by some other means.
+        /// </summary>
+        [IntrinsicProperty]
+        public object DisposeWhenNodeIsRemoved {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the function to compute the value.
+        /// </summary>
+        [ScriptName("read")]
+        [IntrinsicProperty]
+        public Func<T> GetValueFunction {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// Gets or sets the function to write the value.
+        /// </summary>
+        [ScriptName("write")]
+        [IntrinsicProperty]
+        public Action<T> SetValueFunction { 
+            get; 
+            set; 
+        }
+
+        /// <summary>
+        /// Gets or sets the function to write the value.
+        /// </summary>
+        [ScriptName("write")]
+        [IntrinsicProperty]
+        public Action<T[]> SetArrayValueFunction { 
+            get; 
+            set; 
+        }
+
+        /// <summary>
+        /// Gets the model instance which acts as 'this' in the get value function.
+        /// </summary>
+        [ScriptName("owner")]
+        [IntrinsicProperty]
+        public object Model {
+            get;
+            set;
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/Knockout.cs b/src/Libraries/Knockout/Knockout.cs
new file mode 100644
index 000000000..d979bf3ed
--- /dev/null
+++ b/src/Libraries/Knockout/Knockout.cs
@@ -0,0 +1,251 @@
+// Knockout.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    /// <summary>
+    /// Provides Knockout functionality.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("ko")]
+    public static class Knockout {
+
+        /// <summary>
+        /// Provides access to the currently registered binding handlers.
+        /// </summary>
+        [IntrinsicProperty]
+        public static Dictionary<string, BindingHandler> BindingHandlers {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the mapping plugin which allows converting models to plain
+        /// objects and JSON and vice-versa.
+        /// </summary>
+        [IntrinsicProperty]
+        public static KnockoutMapping Mapping {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Gets the current model.
+        /// </summary>
+        /// <returns>The object represented by 'this' within a handler.</returns>
+        [ScriptAlias("this")]
+        [IntrinsicProperty]
+        public static object Model {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Sets up bindings using the specified model.
+        /// </summary>
+        /// <param name="model">The model.</param>
+        public static void ApplyBindings(object model) {
+        }
+
+        /// <summary>
+        /// Sets up bindings within the specified root element using the specified the model.
+        /// </summary>
+        /// <param name="model">The model.</param>
+        /// <param name="rootElement">The element to bind to.</param>
+        public static void ApplyBindings(object model, Element rootElement) {
+        }
+
+        /// <summary>
+        /// Set up bindings on a single node without binding any of its descendents.
+        /// </summary>
+        /// <param name="node">The node to bind to.</param>
+        /// <param name="bindings">An optional dictionary of bindings, pass null to let Knockout gather them from the element.</param>
+        /// <param name="viewModel">The view model instance.</param>
+        public static void ApplyBindingsToNode(Element node, Dictionary bindings, object viewModel) {
+        }
+
+        /// <summary>
+        /// Set up bindings on a single node without binding any of its descendents.
+        /// </summary>
+        /// <param name="node">The node to bind to.</param>
+        /// <param name="bindings">An optional dictionary of bindings, pass null to let Knockout gather them from the element.</param>
+        /// <param name="viewModel">The view model instance.</param>
+        /// <param name="bindingAttributeName">The name of the attribute which has the binding definitions.</param>
+        public static void ApplyBindingsToNode(Element node, Dictionary bindings, object viewModel, string bindingAttributeName) {
+        }
+
+        /// <summary>
+        /// Set up bindings on a single node without binding any of its descendents.
+        /// </summary>
+        /// <param name="rootNode">The root node to bind to.</param>
+        /// <param name="bindings">An optional dictionary of bindings, pass null to let Knockout gather them from the element.</param>
+        /// <param name="viewModel">The view model instance.</param>
+        /// <param name="bindingAttributeName">The name of the attribute which has the binding definitions.</param>
+        public static void ApplyBindingsToDescendants(Element rootNode, Dictionary bindings, object viewModel, string bindingAttributeName) {
+        }
+
+        /// <summary>
+        /// Removes all bindings from an Html Element.
+        /// </summary>
+        /// <param name="rootElement">The root node to clear all bindings from.</param>
+        public static void CleanNode(Element rootElement) {
+        }
+
+        /// <summary>
+        /// Returns the entire binding context associated with the DOM element
+        /// </summary>
+        /// <param name="node"></param>
+        public static BindingContext<TRoot, TParent, T> ContextFor<TRoot, TParent, T>(Element node) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the data item associated with a particular DOM element
+        /// </summary>
+        /// <param name="node"></param>
+        public static T DataFor<T>(Element node) {
+            return default(T);
+        }
+
+        /// <summary>
+        /// Creates an observable with a value computed from one or more other values.
+        /// </summary>
+        /// <typeparam name="T">The type of the observable value.</typeparam>
+        /// <param name="function">A function to compute the value.</param>
+        /// <returns>A new dependent observable instance.</returns>
+        public static DependentObservable<T> DependentObservable<T>(Func<T> function) {
+            return null;
+        }
+
+        /// <summary>
+        /// Creates an observable with a value computed from one or more other values.
+        /// </summary>
+        /// <typeparam name="T">The type of the observable value.</typeparam>
+        /// <param name="options">Options for the dependent observable.</param>
+        public static DependentObservable<T> DependentObservable<T>(DependentObservableOptions<T> options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns true if the value is subscribable, false otherwise.
+        /// </summary>
+        /// <param name="value">The value to check.</param>
+        public static bool IsSubscribable(object value) {
+            return false;
+        }
+
+        /// <summary>
+        /// Returns true if the value is an observable, false otherwise.
+        /// </summary>
+        /// <param name="value">The value to check.</param>
+        public static bool IsObservable(object value) {
+            return false;
+        }
+
+        /// <summary>
+        /// Returns true if the value is an writable observable, false otherwise.
+        /// </summary>
+        /// <param name="value">The value to check.</param>
+        public static bool IsWriteableObservable(object value) {
+            return false;
+        }
+
+        /// <summary>
+        /// Creates an subscribable value.
+        /// </summary>
+        /// <typeparam name="T">The type of the subscribable.</typeparam>
+        /// <returns>A new subscribable value instance.</returns>
+        public static Subscribable<T> Subscribable<T>() {
+            return null;
+        }
+
+        /// <summary>
+        /// Creates an observable value.
+        /// </summary>
+        /// <typeparam name="T">The type of the observable.</typeparam>
+        /// <returns>A new observable value instance.</returns>
+        public static Observable<T> Observable<T>() {
+            return null;
+        }
+
+        /// <summary>
+        /// Creates an observable with an initial value.
+        /// </summary>
+        /// <typeparam name="T">The type of the observable.</typeparam>
+        /// <param name="initialValue">The initial value.</param>
+        /// <returns>A new observable value instance.</returns>
+        public static Observable<T> Observable<T>(T initialValue) {
+            return null;
+        }
+
+        /// <summary>
+        /// Creates an empty observable array.
+        /// </summary>
+        /// <returns>A new observable array.</returns>
+        /// <typeparam name="T">The type of items in the array.</typeparam>
+        public static ObservableArray<T> ObservableArray<T>() {
+            return null;
+        }
+
+        /// <summary>
+        /// Creates an observable array with some initial items.
+        /// </summary>
+        /// <param name="initialItems">A sequence of initial items.</param>
+        /// <returns>A new observable array.</returns>
+        /// <typeparam name="T">The type of items in the array.</typeparam>
+        public static ObservableArray<T> ObservableArray<T>(IEnumerable<T> initialItems) {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts a model into the equivalent JSON representation.
+        /// </summary>
+        /// <param name="model">The model object to convert.</param>
+        /// <returns>The JSON string representing the model data.</returns>
+        [ScriptName("toJSON")]
+        public static string ToJson(object model) {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts a model into the equivalent vanilla script object.
+        /// </summary>
+        /// <param name="model">The model object to convert.</param>
+        /// <returns>The vanilla script object representing the model data.</returns>
+        [ScriptName("toJS")]
+        public static object ToObject(object model) {
+            return null;
+        }
+
+        /// <summary>
+        /// Converts a model into the equivalent vanilla script object.
+        /// </summary>
+        /// <param name="model">The model object to convert.</param>
+        /// <returns>The vanilla script object representing the model data.</returns>
+        [ScriptName("toJS")]
+        public static T ToObject<T>(object model) {
+            return default(T);
+        }
+
+        /// <summary>
+        /// If the provided value is an observable, return its value, otherwise just pass it through.
+        /// </summary>
+        /// <param name="value">The value to unwrap.</param>
+        [ScriptAlias("ko.utils.unwrapObservable")]
+        public static T UnwrapObservable<T>(object value) {
+            return default(T);
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/Knockout.csproj b/src/Libraries/Knockout/Knockout.csproj
new file mode 100644
index 000000000..97e030537
--- /dev/null
+++ b/src/Libraries/Knockout/Knockout.csproj
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DCA0235F-88C1-43A0-A8DB-FF765D344E06}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>KnockoutApi</RootNamespace>
+    <AssemblyName>Script.Knockout</AssemblyName>
+    <NoStdLib>True</NoStdLib>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>false</DelaySign>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>none</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\bin\Debug\Script.Knockout.xml</DocumentationFile>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\bin\Release\Script.Knockout.xml</DocumentationFile>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="BindingContext.cs" />
+    <Compile Include="CompareResult.cs" />
+    <Compile Include="KnockoutMappingArrayCreateOptions.cs" />
+    <Compile Include="KnockoutMappingArraySpecification.cs" />
+    <Compile Include="KnockoutMappingCreateOptions.cs" />
+    <Compile Include="KnockoutMappingUpdateOptions.cs" />
+    <Compile Include="DependentObservableOptions.cs" />
+    <Compile Include="BindingHandler.cs" />
+    <Compile Include="KnockoutMapping.cs" />
+    <Compile Include="KnockoutMappingPropertySpecification.cs" />
+    <Compile Include="KnockoutMappingSpecification.cs" />
+    <Compile Include="KnockoutUtils.cs" />
+    <Compile Include="ObservableArray.cs" />
+    <Compile Include="DependentObservable.cs" />
+    <Compile Include="Knockout.cs" />
+    <Compile Include="Observable.cs" />
+    <Compile Include="Subscribable.cs" />
+    <Compile Include="CompareResultStatus.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
+    </Compile>
+    <ScriptInfo Include="Properties\ScriptInfo.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\CoreLib\CoreLib.csproj">
+      <Project>{36D4B098-A21C-4725-ACD3-400922885F38}</Project>
+      <Name>CoreLib</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Web\Web.csproj">
+      <Project>{3681A9A8-FC40-4125-B842-7775713C8DCE}</Project>
+      <Name>Web</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(ScriptInfo)" DestinationFiles="$(OutputPath)$(AssemblyName).txt" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Libraries/Knockout/KnockoutMapping.cs b/src/Libraries/Knockout/KnockoutMapping.cs
new file mode 100644
index 000000000..be855b40c
--- /dev/null
+++ b/src/Libraries/Knockout/KnockoutMapping.cs
@@ -0,0 +1,164 @@
+// KnockoutMapping.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    /// <summary>
+    /// Provides functionality for mapping between knockout models and JSON or
+    /// vanilla script objects.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class KnockoutMapping {
+
+        private KnockoutMapping() {
+        }
+
+        /// <summary>
+        /// Creates a model instance from the specified JSON string.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="jsonData">The JSON data.</param>
+        /// <returns>A new instance of the model.</returns>
+        [ScriptName("fromJSON")]
+        public TModel ModelFromJson<TModel>(string jsonData) {
+            return default(TModel);
+        }
+
+        /// <summary>
+        /// Creates a model instance from the specified JSON string and a
+        /// custom mapping.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="jsonData">The JSON data.</param>
+        /// <param name="mapping">The mapping rules to apply.</param>
+        /// <returns>A new instance of the model.</returns>
+        [ScriptName("fromJSON")]
+        public TModel ModelFromJson<TModel>(string jsonData, KnockoutMappingSpecification mapping) {
+            return default(TModel);
+        }
+
+        /// <summary>
+        /// Creates a model array from the specified JSON string and a
+        /// custom mapping.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="jsonData">The JSON data.</param>
+        /// <param name="mapping">The mapping rules to apply.</param>
+        /// <returns>A new instance of the model.</returns>
+        [ScriptName("fromJSON")]
+        public ObservableArray<TModel> ModelFromJson<TModel>(string jsonData, KnockoutMappingArraySpecification mapping) {
+            return null;
+        }
+
+        /// <summary>
+        /// Creates a model instance from the specified script object.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="data">The vanilla script object.</param>
+        /// <returns>A new instance of the model.</returns>
+        [ScriptName("fromJS")]
+        public TModel ModelFromObject<TModel>(object data) {
+            return default(TModel);
+        }
+
+        /// <summary>
+        /// Creates a model instance from the specified script object and a
+        /// custom mapping.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="data">The vanilla script object.</param>
+        /// <param name="mapping">The mapping rules to apply.</param>
+        /// <returns>A new instance of the model.</returns>
+        [ScriptName("fromJS")]
+        public TModel ModelFromObject<TModel>(object data, KnockoutMappingSpecification mapping) {
+            return default(TModel);
+        }
+
+        /// <summary>
+        /// Creates a model array from the specified script object and a
+        /// custom mapping.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="data">The vanilla script object.</param>
+        /// <param name="mapping">The mapping rules to apply.</param>
+        /// <returns>A new instance of the model.</returns>
+        [ScriptName("fromJS")]
+        public Observable<TModel> ModelFromObject<TModel>(object data, KnockoutMappingArraySpecification<TModel> mapping) {
+            return null;
+        }
+
+        /// <summary>
+        /// Updates a model instance from the specified script object and a
+        /// custom mapping.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="data">The vanilla script object.</param>
+        /// <param name="mapping">The mapping rules to apply.</param>
+        /// <param name="target">The mapping rules to apply.</param>
+        /// <returns>A new instance of the model.</returns>
+        [ScriptName("fromJS")]
+        public TModel ModelFromObject<TModel>(object data, KnockoutMappingSpecification mapping, TModel target) {
+            return default(TModel);
+        }
+
+        /// <summary>
+        /// Creates a model array from the specified script object and a
+        /// custom mapping.
+        /// </summary>
+        /// <typeparam name="TModel">The type of the model.</typeparam>
+        /// <param name="data">The vanilla script object.</param>
+        /// <param name="mapping">The mapping rules to apply.</param>
+        /// <param name="target">The mapping rules to apply.</param>
+        /// <returns>A new instance of the model.</returns>
+        [ScriptName("fromJS")]
+        public Observable<TModel> ModelFromObject<TModel>(object data, KnockoutMappingArraySpecification<TModel> mapping, ObservableArray<TModel> target) {
+            return null;
+        }
+
+        /// <summary>
+        /// Unwraps the given view model
+        /// </summary>
+        /// <param name="model">The model to unwrap</param>
+        /// <returns>The unwrapped view model</returns>
+        [ScriptName("toJS")]
+        public object ModelToObject(object model) {
+            return null;
+        }
+
+        /// <summary>
+        /// Unwraps the given view model
+        /// </summary>
+        /// <param name="model">The model to unwrap</param>
+        /// <returns>The unwrapped view model</returns>
+        [ScriptName("toJS")]
+        public T ModelToObject<T>(object model) {
+            return default(T);
+        }
+
+        /// <summary>
+        /// Updates the specified model with the specified JSON string.
+        /// </summary>
+        /// <typeparam name="TModel">The tyoe of the model.</typeparam>
+        /// <param name="model">The model to update.</param>
+        /// <param name="jsonData">The JSON string representing the new values.</param>
+        [ScriptName("updateFromJSON")]
+        public void UpdateFromJson<TModel>(TModel model, string jsonData) {
+        }
+
+        /// <summary>
+        /// Updates the specified model with the specified script object.
+        /// </summary>
+        /// <typeparam name="TModel">The tyoe of the model.</typeparam>
+        /// <param name="model">The model to update.</param>
+        /// <param name="data">The script object representing the new values.</param>
+        [ScriptName("updateFromJS")]
+        public void UpdateFromObject<TModel>(TModel model, object data) {
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/KnockoutMappingArrayCreateOptions.cs b/src/Libraries/Knockout/KnockoutMappingArrayCreateOptions.cs
new file mode 100644
index 000000000..ae6ae9969
--- /dev/null
+++ b/src/Libraries/Knockout/KnockoutMappingArrayCreateOptions.cs
@@ -0,0 +1,37 @@
+// KnockoutMappingArrayCreateOptions.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Object")]
+    public sealed class KnockoutMappingArrayCreateOptions {
+
+        [IntrinsicProperty]
+        public object Data {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Parent {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Skip {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/KnockoutMappingArraySpecification.cs b/src/Libraries/Knockout/KnockoutMappingArraySpecification.cs
new file mode 100644
index 000000000..c16c519a9
--- /dev/null
+++ b/src/Libraries/Knockout/KnockoutMappingArraySpecification.cs
@@ -0,0 +1,43 @@
+// KnockoutMappingArraySpecification.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Object")]
+    public abstract class KnockoutMappingArraySpecification {
+
+        internal KnockoutMappingArraySpecification() {
+        }
+    }
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Object")]
+    public sealed class KnockoutMappingArraySpecification<TModel> : KnockoutMappingArraySpecification {
+
+        [IntrinsicProperty]
+        public Func<KnockoutMappingArrayCreateOptions, TModel> Create {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public Func<TModel, object> Key {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/KnockoutMappingCreateOptions.cs b/src/Libraries/Knockout/KnockoutMappingCreateOptions.cs
new file mode 100644
index 000000000..d93323374
--- /dev/null
+++ b/src/Libraries/Knockout/KnockoutMappingCreateOptions.cs
@@ -0,0 +1,34 @@
+// KnockoutMappingCreateOptions.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Object")]
+    public sealed class KnockoutMappingCreateOptions {
+
+        [IntrinsicProperty]
+        public object Data {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Parent {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/KnockoutMappingPropertySpecification.cs b/src/Libraries/Knockout/KnockoutMappingPropertySpecification.cs
new file mode 100644
index 000000000..bb50a5568
--- /dev/null
+++ b/src/Libraries/Knockout/KnockoutMappingPropertySpecification.cs
@@ -0,0 +1,43 @@
+// KnockoutMappingPropertySpecification.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Object")]
+    public abstract class KnockoutMappingPropertySpecification {
+
+        protected KnockoutMappingPropertySpecification() {
+        }
+    }
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Object")]
+    public sealed class KnockoutMappingPropertySpecification<TModel> : KnockoutMappingPropertySpecification {
+
+        [IntrinsicProperty]
+        public Func<KnockoutMappingCreateOptions, TModel> Create {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public Func<KnockoutMappingUpdateOptions, TModel> Update {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/KnockoutMappingSpecification.cs b/src/Libraries/Knockout/KnockoutMappingSpecification.cs
new file mode 100644
index 000000000..1ea8146a8
--- /dev/null
+++ b/src/Libraries/Knockout/KnockoutMappingSpecification.cs
@@ -0,0 +1,52 @@
+// KnockoutMappingSpecification.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Object")]
+    public sealed class KnockoutMappingSpecification {
+
+        [IntrinsicProperty]
+        public string[] Copy {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string[] Ignore {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string[] Include {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public KnockoutMappingPropertySpecification this[string propertyName] {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/KnockoutMappingUpdateOptions.cs b/src/Libraries/Knockout/KnockoutMappingUpdateOptions.cs
new file mode 100644
index 000000000..24f415c3a
--- /dev/null
+++ b/src/Libraries/Knockout/KnockoutMappingUpdateOptions.cs
@@ -0,0 +1,43 @@
+// KnockoutMappingUpdateOptions.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Object")]
+    public sealed class KnockoutMappingUpdateOptions {
+
+        [IntrinsicProperty]
+        public object Data {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Observable {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Parent {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/KnockoutUtils.cs b/src/Libraries/Knockout/KnockoutUtils.cs
new file mode 100644
index 000000000..c2d0e02f6
--- /dev/null
+++ b/src/Libraries/Knockout/KnockoutUtils.cs
@@ -0,0 +1,183 @@
+// KnockoutApi.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+using System.Html;
+
+namespace KnockoutApi {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("ko.utils")]
+    public static class KnockoutUtils {
+
+        /// <summary>
+        /// Returns the First Matching Item (predicate function) from the given array
+        /// </summary>
+        public static T ArrayFirst<T>(IEnumerable<T> array, Func<T, bool> predicate, object owner) {
+            return default(T);
+        }
+
+        /// <summary>
+        /// Applies the predicate filter to the given array
+        /// Returns the matching items as a new array
+        /// </summary>
+        public static T[] ArrayFilter<T>(IEnumerable<T> array, Func<T, bool> predicate) {
+            return null;
+        }
+
+        /// <summary>
+        /// Applies the Action to each item in the given array
+        /// </summary>
+        public static void ArrayForEach<T>(IEnumerable<T> array, Action<T> action) {
+        }
+
+        /// <summary>
+        /// Returns a new array containing distinct values only
+        /// </summary>
+        public static T[] ArrayGetDistinctValues<T>(IEnumerable<T> array) {
+            return null;
+        }
+
+        /// <summary>
+        /// Finds and Returns the Index of the item in the given array
+        /// </summary>
+        /// <returns>Returns the Index number of -1 if not found</returns>
+        public static int ArrayIndexOf<T>(IEnumerable<T> array, T item) {
+            return -1;
+        }
+
+        /// <summary>
+        /// Processes each item in the given array and applies the mapping function
+        /// Returns the Mapping Results
+        /// </summary>
+        public static TOut[] ArrayMap<T, TOut>(IEnumerable<T> array, Func<T, TOut> mapping) {
+            return null;
+        }
+
+        /// <summary>
+        /// Pushes each item into the given array
+        /// </summary>
+        public static void ArrayPushAll<T>(IEnumerable<T> array, params T[] items) {
+        }
+
+        /// <summary>
+        /// Removes the Specified item from the given array
+        /// </summary>
+        public static void ArrayRemoveItem<T>(IEnumerable<T> array, T item) {
+        }
+
+        /// <summary>
+        /// Compares the changes between two arrays
+        /// </summary>
+        public static CompareResult<T>[] CompareArrays<T>(IEnumerable<T> oldArray, IEnumerable<T> newArray) {
+            return null;
+        }
+
+        /// <summary>
+        /// Compares the changes between two arrays
+        /// </summary>
+        public static CompareResult<T>[] CompareArrays<T>(IEnumerable<T> oldArray, IEnumerable<T> newArray, int maxEditsToConsider) {
+            return null;
+        }
+
+        public static T Extend<T>(T target, object source) {
+            return default(T);
+        }
+
+        /// <summary>
+        /// Finds the Matching Field Elements (input) in the given Form Element and the given fieldName
+        /// </summary>
+        public static Element[] GetFormFields(Element form, string fieldName) {
+            return null;
+        }
+
+        /// <summary>
+        /// Finds the Matching Field Elements (input) in the given Form Element and the given regular expression
+        /// </summary>
+        public static Element[] GetFormFields(Element form, RegularExpression match) {
+            return null;
+        }
+
+        /// <summary>
+        /// Parses the Json String into a native javascript object
+        /// </summary>
+        /// <param name="jsonString"></param>
+        public static T ParseJson<T>(string jsonString) {
+            return default(T);
+        }
+
+        /// <summary>
+        /// Makes a Post Request to the specified url or using the specified Form element
+        /// </summary>
+        /// <param name="urlOrForm"></param>
+        /// <param name="data"></param>
+        /// <param name="options">{ "params": [], "includeFields": [], "submitter": [] }</param>
+        public static void PostJson(object urlOrForm, object data, Dictionary options) {
+        }
+
+        /// <summary>
+        /// Returns an Array of numbers starting from the specified minimum to the maximum
+        /// </summary>
+        public static int[] Range(int min, int max) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns an Array of numbers starting from the specified minimum to the maximum
+        /// </summary>
+        public static int[] Range(Observable<int> min, Observable<int> max) {
+            return null;
+        }
+
+        /// <summary>
+        /// Registers an Event Handler for the given element
+        /// </summary>
+        public static void RegisterEventHandler(Element element, string eventType, EventHandler handler) {
+        }
+
+        /// <summary>
+        /// Returns a json string from the specified object
+        /// Requires Native JSON support or json2.js
+        /// </summary>
+        public static string StringifyJson(object obj) {
+            return null;
+        }
+
+        /// <summary>
+        /// Triggers the specified event on the given element
+        /// i.e. produce a 'click' event on a input element
+        /// </summary>
+        public static void TriggerEvent(Element element, string eventType) {
+        }
+
+        /// <summary>
+        /// If the provided value is an observable, return its value, otherwise just pass it through.
+        /// </summary>
+        /// <param name="value">The value to unwrap.</param>
+        public static T UnwrapObservable<T>(T value) {
+            return default(T);
+        }
+
+        /// <summary>
+        /// If the provided value is an observable, return its value, otherwise just pass it through.
+        /// </summary>
+        /// <param name="value">The value to unwrap.</param>
+        public static T UnwrapObservable<T>(Observable<T> value) {
+            return default(T);
+        }
+
+        /// <summary>
+        /// If the provided value is an observable, return its value, otherwise just pass it through.
+        /// </summary>
+        /// <param name="value">The value to unwrap.</param>
+        public static T[] UnwrapObservable<T>(ObservableArray<T> value) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/Observable.cs b/src/Libraries/Knockout/Observable.cs
new file mode 100644
index 000000000..32cf972b7
--- /dev/null
+++ b/src/Libraries/Knockout/Observable.cs
@@ -0,0 +1,77 @@
+// Observable.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Collections;
+
+namespace KnockoutApi {
+
+    /// <summary>
+    /// Represents an object containing an observable value.
+    /// </summary>
+    /// <typeparam name="T">The type of the contained value.</typeparam>
+    [Imported]
+    [IgnoreNamespace]
+    public class Observable<T> : Subscribable<T> {
+
+        internal Observable() {
+        }
+
+        /// <summary>
+        /// Gets the current value within the observable object.
+        /// </summary>
+        /// <returns>The current value.</returns>
+        [ScriptName("")]
+        public T GetValue() {
+            return default(T);
+        }
+
+        /// <summary>
+        /// Sets the value within the observable object.
+        /// </summary>
+        /// <param name="value">The new value.</param>
+        [ScriptName("")]
+        public void SetValue(T value) {
+        }
+
+        /// <summary>
+        /// Notifies All Subscribers that the Value has Changed
+        /// Called internally with SetValue
+        /// </summary>
+        public void ValueHasMutated() {
+        }
+
+        /// <summary>
+        /// Notifies All Subscribers BEFORE the Value has Changed
+        /// Called internally with SetValue
+        /// </summary>
+        public void ValueWillMutate() {
+        }
+
+        /// <summary>
+        /// For Primitive Types ko will handle Equality internally
+        /// For complex types a supplied function can be assigned to improve
+        /// change (mutation) detection
+        /// </summary>
+        [IntrinsicProperty]
+        public Func<T, T, bool> EqualityComparer {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// For dependent observables, we throttle *evaluations* so that, no matter how fast its dependencies        
+        /// notify updates, the target doesn't re-evaluate (and hence doesn't notify) faster than a certain rate
+        /// For writable targets (observables, or writable dependent observables), we throttle *writes*        
+        /// so the target cannot change value synchronously or faster than a certain rate
+        /// </summary>
+        /// <param name="options"></param>
+        /// <returns>Returns 'this' inorder to support chaining methods</returns>
+        public new Observable<T> Extend(Dictionary options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/ObservableArray.cs b/src/Libraries/Knockout/ObservableArray.cs
new file mode 100644
index 000000000..011d743ef
--- /dev/null
+++ b/src/Libraries/Knockout/ObservableArray.cs
@@ -0,0 +1,203 @@
+// ObservableArray.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    /// <summary>
+    /// Represents an array of items that can be observed for changes to the set of
+    /// contained items.
+    /// </summary>
+    /// <typeparam name="T">The type of the contained values.</typeparam>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class ObservableArray<T> : Observable<T[]> {
+
+        private ObservableArray() {
+        }
+
+        /// <summary>
+        /// Marks all values that match the given parameter as deleted.
+        /// </summary>
+        /// <param name="value">The value to mark as deleted.</param>
+        public void Destroy(T value) {
+        }
+
+        /// <summary>
+        /// Marks all values that satisfy the predicate as deleted.
+        /// </summary>
+        /// <param name="predicate">The predicate.</param>
+        public void Destroy(Func<T, bool> predicate) {
+        }
+
+        /// <summary>
+        /// Marks all values that satisfy the given parameters as deleted.
+        /// </summary>
+        /// <param name="values">An array of items to destroy.</param>
+        public void DestroyAll(params T[] values) {
+        }
+
+        /// <summary>
+        /// Gets the underlying items within the observable array.
+        /// This is a Copy of the Values in the Observable
+        /// </summary>
+        /// <returns>The collection of items.</returns>
+        [ScriptName("")]
+        public T[] GetItems() {
+            return null;
+        }
+
+        /// <summary>
+        /// Sets the underlying items within the observable array.
+        /// </summary>
+        [ScriptName("")]
+        public void SetItems(T[] values) {
+        }
+
+        /// <summary>
+        /// Returns the index of the first array item that equals the value.
+        /// </summary>
+        /// <param name="value">The value to check.</param>
+        /// <returns>The index of the matching item; -1 if there is no match.</returns>
+        public int IndexOf(T value) {
+            return 0;
+        }
+
+        /// <summary>
+        /// Removes the last value from the array and returns it.
+        /// </summary>
+        /// <returns>The last value.</returns>
+        public T Pop() {
+            return default(T);
+        }
+
+        /// <summary>
+        /// Adds the value and notifies observers.
+        /// </summary>
+        /// <param name="value">The value to add.</param>
+        public void Push(T value) {
+        }
+
+        /// <summary>
+        /// Replaces the Specified Item with the NewItem
+        /// </summary>
+        public void Replace(T oldItem, T newItem) {
+        }
+
+        /// <summary>
+        /// Removes all values that match the given parameter and returns them.
+        /// </summary>
+        /// <param name="value">The value to remove.</param>
+        /// <returns>The removed values.</returns>
+        public T[] Remove(T value) {
+            return null;
+        }
+
+        /// <summary>
+        /// Removes all values that satisfy the predicate and returns them.
+        /// </summary>
+        /// <param name="predicate">The removal predicate.</param>
+        /// <returns>The removed values.</returns>
+        public T[] Remove(Func<T, bool> predicate) {
+            return null;
+        }
+
+        /// <summary>
+        /// Removes all values from the array.
+        /// </summary>
+        /// <returns>The removed values</returns>
+        public T[] RemoveAll() {
+            return null;
+        }
+
+        /// <summary>
+        /// Removes all values that satisfy the given parameters and returns them.
+        /// </summary>
+        /// <param name="values">An array of items to remove.</param>
+        /// <returns>The removed values.</returns>
+        public T[] RemoveAll(params T[] values) {
+            return null;
+        }
+
+        /// <summary>
+        /// Reverses the order of the array.
+        /// </summary>
+        public void Reverse() {
+        }
+
+        /// <summary>
+        /// Removes the first value from the array and returns it
+        /// </summary>
+        /// <returns>The removed value.</returns>
+        public T Shift() {
+            return default(T);
+        }
+
+        /// <summary>
+        /// Native Javascript Splice Function
+        /// Modifies the Existing Sequence
+        /// </summary>
+        /// <param name="index">Required. An integer that specifies at what position to add/remove elements</param>
+        /// <param name="howmany">Required. The number of elements to be removed. If set to 0, no elements will be removed</param>
+        /// <param name="args">Optional. The new element(s) to be added to the array</param>
+        public void Splice(int index, int howmany, params T[] args) {
+        }
+
+        /// <summary>
+        /// Returns elements from start index to the end of the array.
+        /// </summary>
+        /// <param name="start">Starting point of the sequence, if negative then it starts from the end.</param>
+        /// <returns>The matched items.</returns>
+        public T[] Slice(int start) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns elements from start index to end index.
+        /// </summary>
+        /// <param name="start">Starting point of the sequence, if negative then it starts from the end.</param>
+        /// <param name="end">End point of the sequence.</param>
+        /// <returns>The matched items.</returns>
+        public T[] Slice(int start, int end) {
+            return null;
+        }
+
+        /// <summary>
+        /// Performs a default alphanumeric sort on the elements of the array.
+        /// </summary>
+        public void Sort() {
+        }
+
+        /// <summary>
+        /// Performs a sort using the comparator function.
+        /// </summary>
+        /// <param name="comparator">The comparing function.</param>
+        public void Sort(Func<T, T, int> comparator) {
+        }
+
+        /// <summary>
+        /// Inserts the value at the beginning of the array.
+        /// </summary>
+        /// <param name="value">The value to insert.</param>
+        public void Unshift(T value) {
+        }
+
+        /// <summary>
+        /// For dependent observables, we throttle *evaluations* so that, no matter how fast its dependencies        
+        /// notify updates, the target doesn't re-evaluate (and hence doesn't notify) faster than a certain rate
+        /// For writable targets (observables, or writable dependent observables), we throttle *writes*        
+        /// so the target cannot change value synchronously or faster than a certain rate
+        /// </summary>
+        /// <param name="options"></param>
+        /// <returns>Extend is Chainable</returns>
+        public new ObservableArray<T> Extend(Dictionary options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Knockout/Properties/AssemblyInfo.cs b/src/Libraries/Knockout/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..0c27441c8
--- /dev/null
+++ b/src/Libraries/Knockout/Properties/AssemblyInfo.cs
@@ -0,0 +1,12 @@
+// AssemblyInfo.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Script.Knockout")]
+[assembly: AssemblyDescription("Script# Knockout API")]
+[assembly: ScriptAssembly("Knockout")]
diff --git a/src/Libraries/Knockout/Properties/ScriptInfo.txt b/src/Libraries/Knockout/Properties/ScriptInfo.txt
new file mode 100644
index 000000000..8b19dea85
--- /dev/null
+++ b/src/Libraries/Knockout/Properties/ScriptInfo.txt
@@ -0,0 +1,10 @@
+Knockout
+===============================================================================
+
+This assembly provides access to Knockout APIs. This is only meant for use at
+development time, so you can reference and compile your c# code against the
+Knockout APIs. You must include the appropriate Knockout scripts in your page for
+runtime functionality.
+
+More information is on http://knockoutjs.com/ and
+https://github.com/SteveSanderson/knockout.
diff --git a/src/Libraries/Knockout/Subscribable.cs b/src/Libraries/Knockout/Subscribable.cs
new file mode 100644
index 000000000..084aef072
--- /dev/null
+++ b/src/Libraries/Knockout/Subscribable.cs
@@ -0,0 +1,94 @@
+// BindingHandler.cs
+// Script#/Libraries/Knockout
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+namespace KnockoutApi {
+
+    /// <summary>
+    /// Represents an object containing an subscribable value.
+    /// </summary>
+    /// <typeparam name="T">The type of the contained value.</typeparam>
+    [Imported]
+    [IgnoreNamespace]
+    public abstract class Subscribable<T> : IDisposable {
+
+        internal Subscribable() {
+        }
+
+        /// <summary>
+        /// Disposes this Subscribable
+        /// </summary>
+        public void Dispose() {
+        }
+
+        /// <summary>
+        /// For dependent observables, we throttle *evaluations* so that, no matter how fast its dependencies        
+        /// notify updates, the target doesn't re-evaluate (and hence doesn't notify) faster than a certain rate
+        /// For writable targets (observables, or writable dependent observables), we throttle *writes*        
+        /// so the target cannot change value synchronously or faster than a certain rate
+        /// </summary>
+        /// <param name="options"></param>
+        /// <returns>Extend is Chainable</returns>
+        public Subscribable<T> Extend(Dictionary options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Get Subscription Count
+        /// </summary>
+        /// <returns>Returns the Number of Subscribers</returns>
+        public int GetSubscriptionsCount() {
+            return 0;
+        }
+
+        /// <summary>
+        /// Sets the Value and Notifies all of the Subscribers
+        /// </summary>
+        /// <param name="value">The Value to be Set</param>
+        public void NotifySubscribers(T value) {
+        }
+
+        /// <summary>
+        /// Sets the Value and Notifies all of the Subscribers for the Specified Event
+        /// </summary>
+        /// <param name="value">The Value to be Set</param>
+        /// <param name="eventName">[Optional] Event Name</param>
+        public void NotifySubscribers(T value, string eventName) {
+        }
+
+        /// <summary>
+        /// Subscribes to change notifications raised when the value changes.
+        /// </summary>
+        /// <param name="changeCallback">The callback to invoke.</param>
+        /// <returns>A subscription cookie that can be disposed to unsubscribe.</returns>
+        public IDisposable Subscribe(Action<T> changeCallback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Subscribes to change notifications raised when the value changes.
+        /// </summary>
+        /// <param name="changeCallback">The callback to invoke.</param>
+        /// <param name="callBackTarget">callback target</param>
+        /// <returns>A subscription cookie that can be disposed to unsubscribe.</returns>
+        public IDisposable Subscribe(Action<T> changeCallback, object callBackTarget) {
+            return null;
+        }
+
+        /// <summary>
+        /// Subscribes to change notifications raised when the value changes.
+        /// </summary>
+        /// <param name="changeCallback">The callback to invoke.</param>
+        /// <param name="callBackTarget">callback target</param>
+        /// <param name="eventName">event registration</param>
+        /// <returns>A subscription cookie that can be disposed to unsubscribe.</returns>
+        public IDisposable Subscribe(Action<T> changeCallback, object callBackTarget, string eventName) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Libraries.snk b/src/Libraries/Libraries.snk
deleted file mode 100644
index 5b5c9508e..000000000
Binary files a/src/Libraries/Libraries.snk and /dev/null differ
diff --git a/src/Libraries/Microsoft/BingMaps/BingMaps.csproj b/src/Libraries/Microsoft/BingMaps/BingMaps.csproj
index 10feeaddb..d4ec9b340 100644
--- a/src/Libraries/Microsoft/BingMaps/BingMaps.csproj
+++ b/src/Libraries/Microsoft/BingMaps/BingMaps.csproj
@@ -11,9 +11,9 @@
     <RootNamespace>Microsoft.Maps</RootNamespace>
     <AssemblyName>Script.Microsoft.BingMaps</AssemblyName>
     <NoStdLib>True</NoStdLib>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\Libraries.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -40,11 +40,20 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib">
-      <HintPath>..\..\..\..\bin\ref\mscorlib.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
+    <Compile Include="MapEntityEventArgs.cs" />
+    <Compile Include="MapEntityCollectionEventArgs.cs" />
+    <Compile Include="Location\GeoLocationError.cs" />
+    <Compile Include="Location\GeoLocation.cs" />
+    <Compile Include="Location\GeoLocationCircleOptions.cs" />
+    <Compile Include="Location\GeoLocationOptions.cs" />
+    <Compile Include="Location\GeoLocationProvider.cs" />
+    <Compile Include="MapModuleOptions.cs" />
+    <Compile Include="MapModule.cs" />
+    <Compile Include="MapTileUriGenerator.cs" />
+    <Compile Include="MapTile.cs" />
+    <Compile Include="MapInfoboxAction.cs" />
+    <Compile Include="MapAnimationVisibility.cs" />
+    <Compile Include="MapShape.cs" />
     <Compile Include="MapEventTarget.cs" />
     <Compile Include="MapEventArgs.cs" />
     <Compile Include="MapInfoboxOptions.cs" />
@@ -77,16 +86,41 @@
     <Compile Include="MapLocation.cs" />
     <Compile Include="MapPoint.cs" />
     <Compile Include="Map.cs" />
+    <Compile Include="Traffic\TrafficLayer.cs" />
+    <Compile Include="VenueMaps\VenueEntity.cs" />
+    <Compile Include="VenueMaps\VenueEntityPolygon.cs" />
+    <Compile Include="VenueMaps\VenueFootprint.cs" />
+    <Compile Include="VenueMaps\VenueType.cs" />
+    <Compile Include="VenueMaps\VenueFloor.cs" />
+    <Compile Include="VenueMaps\VenueMetadata.cs" />
+    <Compile Include="VenueMaps\Venue.cs" />
+    <Compile Include="VenueMaps\VenueMapSuccessCallback.cs" />
+    <Compile Include="VenueMaps\VenueMapErrorCallback.cs" />
+    <Compile Include="VenueMaps\VenueMapSearchCallback.cs" />
+    <Compile Include="VenueMaps\VenueMapSearchOptions.cs" />
+    <Compile Include="VenueMaps\VenueMap.cs" />
+    <Compile Include="VenueMaps\VenueMapOptions.cs" />
+    <Compile Include="VenueMaps\VenueMapFactory.cs" />
+  </ItemGroup>
+  <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
-      <Link>Properties\CommonAssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
     </Compile>
+    <ScriptInfo Include="Properties\ScriptInfo.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Core\CoreLib\CoreLib.csproj">
+      <Project>{36D4B098-A21C-4725-ACD3-400922885F38}</Project>
+      <Name>CoreLib</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Web\Web.csproj">
       <Project>{3681A9A8-FC40-4125-B842-7775713C8DCE}</Project>
       <Name>Web</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(ScriptInfo)" DestinationFiles="$(OutputPath)$(AssemblyName).txt" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Libraries/Microsoft/BingMaps/Location/GeoLocation.cs b/src/Libraries/Microsoft/BingMaps/Location/GeoLocation.cs
new file mode 100644
index 000000000..94942320a
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/Location/GeoLocation.cs
@@ -0,0 +1,42 @@
+// GeoLocation.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Html.Services;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.Location {
+
+    [Imported]
+    [ScriptName("Object")]
+    public sealed class GeoLocation {
+
+        private GeoLocation() {
+        }
+
+        [IntrinsicProperty]
+        public MapLocation Center {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("position.coords")]
+        public GeoCoordinates Coordinates {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("position.timestamp")]
+        public string Timestamp {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/Location/GeoLocationCircleOptions.cs b/src/Libraries/Microsoft/BingMaps/Location/GeoLocationCircleOptions.cs
new file mode 100644
index 000000000..7bdced484
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/Location/GeoLocationCircleOptions.cs
@@ -0,0 +1,22 @@
+// GeoLocationCircleOptions.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.Location {
+
+    // TODO: Make properties
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class GeoLocationCircleOptions {
+
+        public MapPolygonOptions PolygonOptions;
+
+        public bool ShowOnMap;
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/Location/GeoLocationError.cs b/src/Libraries/Microsoft/BingMaps/Location/GeoLocationError.cs
new file mode 100644
index 000000000..d7bc97f1c
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/Location/GeoLocationError.cs
@@ -0,0 +1,41 @@
+// GeoLocationError.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.Location {
+
+    [Imported]
+    [ScriptName("Object")]
+    public sealed class GeoLocationError {
+
+        private GeoLocationError() {
+        }
+
+        [IntrinsicProperty]
+        public int ErrorCode {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("internalError.code")]
+        public int InternalCode {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("internalError.message")]
+        public string Message {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/Location/GeoLocationOptions.cs b/src/Libraries/Microsoft/BingMaps/Location/GeoLocationOptions.cs
new file mode 100644
index 000000000..bf8f0cf8a
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/Location/GeoLocationOptions.cs
@@ -0,0 +1,32 @@
+// GeoLocationOptions.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.Location {
+
+    // TODO: Make properties
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class GeoLocationOptions {
+
+        public bool EnableHighAccuracy;
+
+        public Action<GeoLocationError> ErrorCallback;
+
+        public int MaximumAge;
+
+        public bool ShowAccuracyCircle;
+
+        public Action<GeoLocation> SuccessCallback;
+
+        public int Timeout;
+
+        public bool UpdateMapView;
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/Location/GeoLocationProvider.cs b/src/Libraries/Microsoft/BingMaps/Location/GeoLocationProvider.cs
new file mode 100644
index 000000000..567aa4062
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/Location/GeoLocationProvider.cs
@@ -0,0 +1,33 @@
+// GeoLocationProvider.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.Location {
+
+    [Imported]
+    [ScriptNamespace("Microsoft.Maps")]
+    public sealed class GeoLocationProvider {
+
+        public GeoLocationProvider(Map map) {
+        }
+
+        public void AddAccuracyCircle(MapLocation location, double radius, int segments, GeoLocationCircleOptions options) {
+        }
+
+        public void CancelRequest() {
+        }
+
+        public void GetCurrentPosition() {
+        }
+
+        public void GetCurrentPosition(GeoLocationOptions options) {
+        }
+
+        public void RemoveAccuracyCircle() {
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/Map.cs b/src/Libraries/Microsoft/BingMaps/Map.cs
index c0960a530..a9a7d404f 100644
--- a/src/Libraries/Microsoft/BingMaps/Map.cs
+++ b/src/Libraries/Microsoft/BingMaps/Map.cs
@@ -1,9 +1,6 @@
 // Map.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -135,6 +132,18 @@ public bool IsRotationEnabled() {
             return false;
         }
 
+        [ScriptAlias("Microsoft.Maps.loadModule")]
+        public static void LoadModule(MapModule module, MapModuleOptions options) {
+        }
+
+        [ScriptAlias("Microsoft.Maps.loadModule")]
+        public static void LoadModule(string moduleName, MapModuleOptions options) {
+        }
+
+        [ScriptAlias("Microsoft.Maps.registerModule")]
+        public static void RegisterModule(string moduleName, string moduleUrl) {
+        }
+
         public void SetOptions(MapOptions options) {
         }
 
diff --git a/src/Libraries/Microsoft/BingMaps/MapAltitudeMode.cs b/src/Libraries/Microsoft/BingMaps/MapAltitudeMode.cs
index 11f8b147f..11dbfb7a4 100644
--- a/src/Libraries/Microsoft/BingMaps/MapAltitudeMode.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapAltitudeMode.cs
@@ -1,9 +1,6 @@
 // MapAltitudeMode.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/MapAnimationVisibility.cs b/src/Libraries/Microsoft/BingMaps/MapAnimationVisibility.cs
new file mode 100644
index 000000000..be15f848a
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/MapAnimationVisibility.cs
@@ -0,0 +1,21 @@
+// MapAnimationVisibility.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps {
+
+    [Imported]
+    [ScriptName("AnimationVisibility")]
+    public enum MapAnimationVisibility {
+
+        Auto,
+
+        Hide,
+
+        Show
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/MapBounds.cs b/src/Libraries/Microsoft/BingMaps/MapBounds.cs
index 3647e5c51..a7895a8ea 100644
--- a/src/Libraries/Microsoft/BingMaps/MapBounds.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapBounds.cs
@@ -1,9 +1,6 @@
 // MapBounds.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/MapColor.cs b/src/Libraries/Microsoft/BingMaps/MapColor.cs
index 52a37d9df..133cbfea0 100644
--- a/src/Libraries/Microsoft/BingMaps/MapColor.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapColor.cs
@@ -1,9 +1,6 @@
 // MapColor.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -14,6 +11,7 @@ namespace Microsoft.Maps {
     // TODO: Members
 
     [Imported]
+    [ScriptName("Color")]
     public sealed class MapColor {
 
         public MapColor(int a, int r, int g, int b) {
diff --git a/src/Libraries/Microsoft/BingMaps/MapEntity.cs b/src/Libraries/Microsoft/BingMaps/MapEntity.cs
index 478fc910e..5cf2efc15 100644
--- a/src/Libraries/Microsoft/BingMaps/MapEntity.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapEntity.cs
@@ -1,9 +1,6 @@
 // MapEntity.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -15,5 +12,9 @@ namespace Microsoft.Maps {
     public abstract class MapEntity {
 
         public object Data;
+
+        public bool GetVisible() {
+            return false;
+        }
     }
 }
diff --git a/src/Libraries/Microsoft/BingMaps/MapEntityCollection.cs b/src/Libraries/Microsoft/BingMaps/MapEntityCollection.cs
index 3db9b63f2..924678547 100644
--- a/src/Libraries/Microsoft/BingMaps/MapEntityCollection.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapEntityCollection.cs
@@ -1,9 +1,6 @@
 // MapEntityCollection.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -47,6 +44,9 @@ public int IndexOf(MapEntity entity) {
         public void Insert(MapEntity entity, int index) {
         }
 
+        public void Insert(MapEntityCollection entities, int index) {
+        }
+
         public MapEntity Pop() {
             return null;
         }
@@ -61,6 +61,10 @@ public MapEntity Remove(MapEntity entity) {
             return null;
         }
 
+        public MapEntity Remove(MapEntityCollection entities) {
+            return null;
+        }
+
         public MapEntity RemoveAt(int index) {
             return null;
         }
diff --git a/src/Libraries/Microsoft/BingMaps/MapEntityCollectionEventArgs.cs b/src/Libraries/Microsoft/BingMaps/MapEntityCollectionEventArgs.cs
new file mode 100644
index 000000000..d0dd6f96f
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/MapEntityCollectionEventArgs.cs
@@ -0,0 +1,25 @@
+// MapEntityCollectionEventArgs.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps {
+
+    // TODO: Make properties
+
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class MapEntityCollectionEventArgs : MapEventArgs {
+
+        private MapEntityCollectionEventArgs() {
+        }
+
+        public MapEntityCollection Collection;
+        public MapEntity Entity;
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/MapEntityCollectionOptions.cs b/src/Libraries/Microsoft/BingMaps/MapEntityCollectionOptions.cs
index 9c162bd91..85d5cd229 100644
--- a/src/Libraries/Microsoft/BingMaps/MapEntityCollectionOptions.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapEntityCollectionOptions.cs
@@ -1,9 +1,6 @@
 // MapEntityCollectionOptions.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/MapEntityEventArgs.cs b/src/Libraries/Microsoft/BingMaps/MapEntityEventArgs.cs
new file mode 100644
index 000000000..41e8b8d40
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/MapEntityEventArgs.cs
@@ -0,0 +1,24 @@
+// MapEntityEventArgs.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps {
+
+    // TODO: Make properties
+
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class MapEntityEventArgs : MapEventArgs {
+
+        private MapEntityEventArgs() {
+        }
+
+        public MapEntity Entity;
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/MapEventArgs.cs b/src/Libraries/Microsoft/BingMaps/MapEventArgs.cs
index 706478f7b..a5aa5ea8c 100644
--- a/src/Libraries/Microsoft/BingMaps/MapEventArgs.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapEventArgs.cs
@@ -1,9 +1,6 @@
 // MapEventArgs.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/MapEventTarget.cs b/src/Libraries/Microsoft/BingMaps/MapEventTarget.cs
index dca7d571b..a801f9b5a 100644
--- a/src/Libraries/Microsoft/BingMaps/MapEventTarget.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapEventTarget.cs
@@ -1,9 +1,6 @@
 // MapEventTarget.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/MapEvents.cs b/src/Libraries/Microsoft/BingMaps/MapEvents.cs
index a02e19913..8b87a7fcd 100644
--- a/src/Libraries/Microsoft/BingMaps/MapEvents.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapEvents.cs
@@ -1,9 +1,6 @@
 // MapEvents.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -27,6 +24,10 @@ public static object AddHandler(MapEntity entity, string eventName, MapEventHand
             return null;
         }
 
+        public static object AddHandler(MapEntityCollection entities, string eventName, MapEventHandler handler) {
+            return null;
+        }
+
         public static object AddThrottledHandler(Map map, string eventName, MapEventHandler handler, int interval) {
             return null;
         }
@@ -35,6 +36,10 @@ public static object AddThrottledHandler(MapEntity entity, string eventName, Map
             return null;
         }
 
+        public static object AddThrottledHandler(MapEntityCollection entities, string eventName, MapEventHandler handler, int interval) {
+            return null;
+        }
+
         public static void RemoveHandler(object handlerID) {
         }
     }
diff --git a/src/Libraries/Microsoft/BingMaps/MapInfobox.cs b/src/Libraries/Microsoft/BingMaps/MapInfobox.cs
index d12c992d5..4acaa83a6 100644
--- a/src/Libraries/Microsoft/BingMaps/MapInfobox.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapInfobox.cs
@@ -1,9 +1,6 @@
-// MapInfoBox.cs
+// MapInfobox.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/MapInfoboxAction.cs b/src/Libraries/Microsoft/BingMaps/MapInfoboxAction.cs
new file mode 100644
index 000000000..9c532f146
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/MapInfoboxAction.cs
@@ -0,0 +1,21 @@
+// MapInfoboxAction.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps {
+
+    // TODO: Make properties
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class MapInfoBoxAction {
+
+        public string Label;
+        public string EventHandler;
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/MapInfoboxOptions.cs b/src/Libraries/Microsoft/BingMaps/MapInfoboxOptions.cs
index 46da322b9..e667f3acb 100644
--- a/src/Libraries/Microsoft/BingMaps/MapInfoboxOptions.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapInfoboxOptions.cs
@@ -1,9 +1,6 @@
-// MapInfoBoxOptions.cs
+// MapInfoboxOptions.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -18,12 +15,13 @@ namespace Microsoft.Maps {
     [ScriptName("Object")]
     public sealed class MapInfoboxOptions {
 
+        public MapInfoBoxAction[] Actions;
         public string Description;
         public int Height;
         public string HtmlContent;
         public string ID;
-        public MapLocation location;
-        public MapPoint offset;
+        public MapLocation Location;
+        public MapPoint Offset;
         public bool ShowCloseButton;
         public bool ShowPointer;
         public string Title;
diff --git a/src/Libraries/Microsoft/BingMaps/MapKeyEventArgs.cs b/src/Libraries/Microsoft/BingMaps/MapKeyEventArgs.cs
index 1d1befb8a..854bbd9a7 100644
--- a/src/Libraries/Microsoft/BingMaps/MapKeyEventArgs.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapKeyEventArgs.cs
@@ -1,9 +1,6 @@
 // MapKeyEventArgs.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/MapLabelOverlay.cs b/src/Libraries/Microsoft/BingMaps/MapLabelOverlay.cs
index f0f8f09e3..346284ba7 100644
--- a/src/Libraries/Microsoft/BingMaps/MapLabelOverlay.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapLabelOverlay.cs
@@ -1,9 +1,6 @@
 // MapLabelOverlay.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/MapLocation.cs b/src/Libraries/Microsoft/BingMaps/MapLocation.cs
index 901455baf..ea56a3316 100644
--- a/src/Libraries/Microsoft/BingMaps/MapLocation.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapLocation.cs
@@ -1,9 +1,6 @@
 // MapLocation.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/MapModule.cs b/src/Libraries/Microsoft/BingMaps/MapModule.cs
new file mode 100644
index 000000000..030d4d4e2
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/MapModule.cs
@@ -0,0 +1,25 @@
+// MapModule.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps {
+
+    [Imported]
+    [NamedValues]
+    [IgnoreNamespace]
+    public enum MapModule {
+
+        [ScriptName("Microsoft.Maps.Directions")]
+        Directions,
+
+        [ScriptName("Microsoft.Maps.Traffic")]
+        Traffic,
+
+        [ScriptName("Microsoft.Maps.VenueMaps")]
+        VenueMaps
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/MapModuleOptions.cs b/src/Libraries/Microsoft/BingMaps/MapModuleOptions.cs
new file mode 100644
index 000000000..ad9eb7eb1
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/MapModuleOptions.cs
@@ -0,0 +1,18 @@
+// MapModuleOptions.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class MapModuleOptions {
+
+        public Action Callback;
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/MapMouseEventArgs.cs b/src/Libraries/Microsoft/BingMaps/MapMouseEventArgs.cs
index 3253e3dfd..c829cca9b 100644
--- a/src/Libraries/Microsoft/BingMaps/MapMouseEventArgs.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapMouseEventArgs.cs
@@ -1,9 +1,6 @@
 // MapMouseEventArgs.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/MapOptions.cs b/src/Libraries/Microsoft/BingMaps/MapOptions.cs
index 4f4f420ca..82c769499 100644
--- a/src/Libraries/Microsoft/BingMaps/MapOptions.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapOptions.cs
@@ -1,9 +1,6 @@
 // MapOptions.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -18,6 +15,7 @@ namespace Microsoft.Maps {
     [IgnoreNamespace]
     public sealed class MapOptions {
 
+        public MapColor BackgroundColor;
         public bool ShowDashboard;
         public bool ShowBreadcrumb;
         public int Zoom;
@@ -33,6 +31,16 @@ public sealed class MapOptions {
         public bool ShowNavControl;
         public bool ShowLogo;
         public bool DisableUserInput;
+        public bool DisableBirdseye;
+        public bool DisableKeyboardInput;
+        public bool DisableMouseInput;
+        public bool DisablePanning;
+        public bool DisableTouchInput;
+        public bool DisableZooming;
+        public bool FixedMapPosition;
+        public bool UseInertia;
+        public double InertiaIntensity;
+        public int TileBuffer;
         [ScriptName("mapTypeId")]
         public MapType MapType;
     }
diff --git a/src/Libraries/Microsoft/BingMaps/MapPoint.cs b/src/Libraries/Microsoft/BingMaps/MapPoint.cs
index 7afdd6649..80452f074 100644
--- a/src/Libraries/Microsoft/BingMaps/MapPoint.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapPoint.cs
@@ -1,9 +1,6 @@
 // MapPoint.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/MapPointReference.cs b/src/Libraries/Microsoft/BingMaps/MapPointReference.cs
index a3b4d171f..89d54ab5b 100644
--- a/src/Libraries/Microsoft/BingMaps/MapPointReference.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapPointReference.cs
@@ -1,9 +1,6 @@
 // MapPointReference.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/MapPolygon.cs b/src/Libraries/Microsoft/BingMaps/MapPolygon.cs
index 37cb27f37..5d677d12c 100644
--- a/src/Libraries/Microsoft/BingMaps/MapPolygon.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapPolygon.cs
@@ -1,9 +1,6 @@
 // MapPolygon.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -15,12 +12,19 @@ namespace Microsoft.Maps {
 
     [Imported]
     [ScriptName("Polygon")]
-    public sealed class MapPolygon : MapEntity {
+    public sealed class MapPolygon : MapShape {
 
         public MapPolygon(MapLocation[] locations) {
         }
 
         public MapPolygon(MapLocation[] locations, MapPolygonOptions options) {
         }
+
+        public MapColor GetFillColor() {
+            return null;
+        }
+
+        public void SetOptions(MapPolygonOptions options) {
+        }
     }
 }
diff --git a/src/Libraries/Microsoft/BingMaps/MapPolygonOptions.cs b/src/Libraries/Microsoft/BingMaps/MapPolygonOptions.cs
index 1e9d307e1..39790294d 100644
--- a/src/Libraries/Microsoft/BingMaps/MapPolygonOptions.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapPolygonOptions.cs
@@ -1,9 +1,6 @@
 // MapPolygonOptions.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -20,6 +17,7 @@ public sealed class MapPolygonOptions {
 
         public int StrokeThickness;
         public MapColor StrokeColor;
+        public string StrokeDashArray;
         public MapColor FillColor;
         public bool Visible;
     }
diff --git a/src/Libraries/Microsoft/BingMaps/MapPolyline.cs b/src/Libraries/Microsoft/BingMaps/MapPolyline.cs
index 10ec07e31..3ab412c06 100644
--- a/src/Libraries/Microsoft/BingMaps/MapPolyline.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapPolyline.cs
@@ -1,9 +1,6 @@
 // MapPolyline.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -15,12 +12,15 @@ namespace Microsoft.Maps {
 
     [Imported]
     [ScriptName("Polyline")]
-    public sealed class MapPolyline : MapEntity {
+    public sealed class MapPolyline : MapShape {
 
         public MapPolyline(MapLocation[] locations) {
         }
 
         public MapPolyline(MapLocation[] locations, MapPolylineOptions options) {
         }
+
+        public void SetOptions(MapPolylineOptions options) {
+        }
     }
 }
diff --git a/src/Libraries/Microsoft/BingMaps/MapPolylineOptions.cs b/src/Libraries/Microsoft/BingMaps/MapPolylineOptions.cs
index cd138ee40..ce1c4b8a1 100644
--- a/src/Libraries/Microsoft/BingMaps/MapPolylineOptions.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapPolylineOptions.cs
@@ -1,9 +1,6 @@
 // MapPolylineOptions.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -20,6 +17,7 @@ public sealed class MapPolylineOptions {
 
         public int StrokeThickness;
         public MapColor StrokeColor;
+        public string StrokeDashArray;
         public bool Visible;
     }
 }
diff --git a/src/Libraries/Microsoft/BingMaps/MapPushpin.cs b/src/Libraries/Microsoft/BingMaps/MapPushpin.cs
index 0eac29212..55bce03a1 100644
--- a/src/Libraries/Microsoft/BingMaps/MapPushpin.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapPushpin.cs
@@ -1,9 +1,6 @@
 // MapPushpin.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -23,6 +20,10 @@ public MapPushpin(MapLocation location) {
         public MapPushpin(MapLocation location, MapPushpinOptions options) {
         }
 
+        public MapLocation GetLocation() {
+            return null;
+        }
+
         public void SetLocation(MapLocation location) {
         }
 
diff --git a/src/Libraries/Microsoft/BingMaps/MapPushpinOptions.cs b/src/Libraries/Microsoft/BingMaps/MapPushpinOptions.cs
index 0e2edcaf7..b1c4109a6 100644
--- a/src/Libraries/Microsoft/BingMaps/MapPushpinOptions.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapPushpinOptions.cs
@@ -1,9 +1,6 @@
 // MapPushpinOptions.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/MapShape.cs b/src/Libraries/Microsoft/BingMaps/MapShape.cs
new file mode 100644
index 000000000..33cf3db16
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/MapShape.cs
@@ -0,0 +1,33 @@
+// MapEntity.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps {
+
+    [Imported]
+    public abstract class MapShape : MapEntity {
+
+        public MapLocation[] GetLocations() {
+            return null;
+        }
+
+        public MapColor GetStrokeColor() {
+            return null;
+        }
+
+        public string GetStrokeDashArray() {
+            return null;
+        }
+
+        public int GetStrokeThickness() {
+            return 0;
+        }
+
+        public void SetLocations(MapLocation[] locations) {
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/MapTile.cs b/src/Libraries/Microsoft/BingMaps/MapTile.cs
new file mode 100644
index 000000000..de3bcd2d2
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/MapTile.cs
@@ -0,0 +1,25 @@
+// MapTile.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps {
+
+    // TODO: Make properties
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class MapTile {
+
+        private MapTile() {
+        }
+
+        public int LevelOfDetail;
+        public int X;
+        public int Y;
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/MapTileLayer.cs b/src/Libraries/Microsoft/BingMaps/MapTileLayer.cs
index d0f9db3f7..7071c9d7b 100644
--- a/src/Libraries/Microsoft/BingMaps/MapTileLayer.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapTileLayer.cs
@@ -1,9 +1,6 @@
 // MapTileLayer.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -15,9 +12,24 @@ namespace Microsoft.Maps {
 
     [Imported]
     [ScriptName("TileLayer")]
-    public class MapTileLayer {
+    public class MapTileLayer : MapEntity {
 
         public MapTileLayer(MapTileLayerOptions options) {
         }
+
+        public double GetOpacity() {
+            return 0;
+        }
+
+        public MapTileSource GetTileSource() {
+            return null;
+        }
+
+        public int GetZIndex() {
+            return 0;
+        }
+
+        public void SetOptions(MapTileLayerOptions options) {
+        }
     }
 }
diff --git a/src/Libraries/Microsoft/BingMaps/MapTileLayerOptions.cs b/src/Libraries/Microsoft/BingMaps/MapTileLayerOptions.cs
index ed052ab66..ba752b7bb 100644
--- a/src/Libraries/Microsoft/BingMaps/MapTileLayerOptions.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapTileLayerOptions.cs
@@ -1,9 +1,6 @@
 // MapTileLayerOptions.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -21,5 +18,7 @@ public sealed class MapTileLayerOptions {
         public double Opacity;
         public int ZIndex;
         public MapTileSource Mercator;
+        public bool Visible;
+        public MapAnimationVisibility AnimationDisplay;
     }
 }
diff --git a/src/Libraries/Microsoft/BingMaps/MapTileSource.cs b/src/Libraries/Microsoft/BingMaps/MapTileSource.cs
index 5842f5a73..30ca37d26 100644
--- a/src/Libraries/Microsoft/BingMaps/MapTileSource.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapTileSource.cs
@@ -1,9 +1,6 @@
 // MapTileSource.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -14,10 +11,22 @@ namespace Microsoft.Maps {
     // TODO: Other members
 
     [Imported]
-    [ScriptName("TileLayer")]
+    [ScriptName("TileSource")]
     public class MapTileSource {
 
         public MapTileSource(MapTileSourceOptions options) {
         }
+
+        public int GetHeight() {
+            return 0;
+        }
+
+        public string GetUriConstructor() {
+            return null;
+        }
+
+        public int GetWidth() {
+            return 0;
+        }
     }
 }
diff --git a/src/Libraries/Microsoft/BingMaps/MapTileSourceOptions.cs b/src/Libraries/Microsoft/BingMaps/MapTileSourceOptions.cs
index 5f713955c..9ae9e57ea 100644
--- a/src/Libraries/Microsoft/BingMaps/MapTileSourceOptions.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapTileSourceOptions.cs
@@ -1,9 +1,6 @@
 // MapTileSourceOptions.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -22,5 +19,7 @@ public sealed class MapTileSourceOptions {
         public double Height;
         [ScriptName("uriConstructor")]
         public string UriFormat;
+        [ScriptName("uriConstructor")]
+        public MapTileUriGenerator UriGenerator;
     }
 }
diff --git a/src/Libraries/Microsoft/BingMaps/MapTileUriGenerator.cs b/src/Libraries/Microsoft/BingMaps/MapTileUriGenerator.cs
new file mode 100644
index 000000000..b008d258b
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/MapTileUriGenerator.cs
@@ -0,0 +1,12 @@
+// MapTileUriGenerator.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps {
+
+    public delegate string MapTileUriGenerator(MapTile tile);
+}
diff --git a/src/Libraries/Microsoft/BingMaps/MapType.cs b/src/Libraries/Microsoft/BingMaps/MapType.cs
index 4deb6de50..e350cdbb6 100644
--- a/src/Libraries/Microsoft/BingMaps/MapType.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapType.cs
@@ -1,9 +1,6 @@
 // MapType.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -21,6 +18,9 @@ public enum MapType {
 
         Aerial,
 
-        Birdseye
+        Birdseye,
+
+        [ScriptName("mercator")]
+        Custom
     }
 }
diff --git a/src/Libraries/Microsoft/BingMaps/MapViewOptions.cs b/src/Libraries/Microsoft/BingMaps/MapViewOptions.cs
index 65676b2a1..6a7a9df41 100644
--- a/src/Libraries/Microsoft/BingMaps/MapViewOptions.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapViewOptions.cs
@@ -1,9 +1,6 @@
 // MapViewOptions.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -21,6 +18,8 @@ public sealed class MapViewOptions {
         [ScriptName("mapTypeId")]
         public MapType MapType;
         public MapLocation Center;
+        public MapPoint CenterOffset;
+        public int Heading;
         public int Zoom;
         public int Padding;
         public MapBounds Bounds;
diff --git a/src/Libraries/Microsoft/BingMaps/MapZoomRange.cs b/src/Libraries/Microsoft/BingMaps/MapZoomRange.cs
index b3a458961..cb102ff33 100644
--- a/src/Libraries/Microsoft/BingMaps/MapZoomRange.cs
+++ b/src/Libraries/Microsoft/BingMaps/MapZoomRange.cs
@@ -1,9 +1,6 @@
 // MapZoomRange.cs
 // Script#/Libraries/Microsoft/BingMaps
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/BingMaps/Properties/AssemblyInfo.cs b/src/Libraries/Microsoft/BingMaps/Properties/AssemblyInfo.cs
index 08aa91ea5..448629185 100644
--- a/src/Libraries/Microsoft/BingMaps/Properties/AssemblyInfo.cs
+++ b/src/Libraries/Microsoft/BingMaps/Properties/AssemblyInfo.cs
@@ -1,8 +1,6 @@
 // AssemblyInfo.cs
-// Script#/Runtime/jQuery
-// Copyright (c) Nikhil Kothari, 2006
-//
-// Assembly Metadata
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Microsoft/Microsoft.txt b/src/Libraries/Microsoft/BingMaps/Properties/ScriptInfo.txt
similarity index 64%
rename from src/Libraries/Microsoft/Microsoft.txt
rename to src/Libraries/Microsoft/BingMaps/Properties/ScriptInfo.txt
index c8798bc08..441e4d23d 100644
--- a/src/Libraries/Microsoft/Microsoft.txt
+++ b/src/Libraries/Microsoft/BingMaps/Properties/ScriptInfo.txt
@@ -1,8 +1,6 @@
-Script# Microsoft API Assemblies
+Bing Maps Control
 ===============================================================================
 
-Script.Microsoft.BingMaps.dll
--------------------------------------------------------------------------------
 This matches the API provided by Microsoft for the Bing Maps v7 control.
 More information about the control can be found at:
 http://msdn.microsoft.com/en-us/library/gg427610.aspx
diff --git a/src/Libraries/Microsoft/BingMaps/Traffic/TrafficLayer.cs b/src/Libraries/Microsoft/BingMaps/Traffic/TrafficLayer.cs
new file mode 100644
index 000000000..cc6ac220e
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/Traffic/TrafficLayer.cs
@@ -0,0 +1,27 @@
+// TrafficLayer.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.Traffic {
+
+    [Imported]
+    public sealed class TrafficLayer {
+
+        public TrafficLayer(Map map) {
+        }
+
+        public MapTileLayer GetTileLayer() {
+            return null;
+        }
+
+        public void Hide() {
+        }
+
+        public void Show() {
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/VenueMaps/Venue.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/Venue.cs
new file mode 100644
index 000000000..88be94e94
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/Venue.cs
@@ -0,0 +1,33 @@
+// Venue.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.VenueMaps {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class Venue {
+
+        private Venue() {
+        }
+
+        [IntrinsicProperty]
+        public double Distance {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public VenueMetadata Metadata {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueEntity.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueEntity.cs
new file mode 100644
index 000000000..c572144b3
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueEntity.cs
@@ -0,0 +1,75 @@
+// VenueEntity.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.VenueMaps {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class VenueEntity {
+
+        private VenueEntity() {
+        }
+
+        [IntrinsicProperty]
+        public MapBounds Bounds {
+            get {
+                return null;
+            }
+        }
+
+        [ScriptName("categoryName")]
+        [IntrinsicProperty]
+        public string Category {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public MapLocation Center {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public VenueFloor Floor {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string ID {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public MapLocation[] Locations {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Name {
+            get {
+                return null;
+            }
+        }
+
+        public void Highlight() {
+        }
+
+        public void Unhighlight() {
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueEntityPolygon.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueEntityPolygon.cs
new file mode 100644
index 000000000..ad4d8de21
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueEntityPolygon.cs
@@ -0,0 +1,40 @@
+// VenueEntityPolygon.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.VenueMaps {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class VenueEntityPolygon {
+
+        private VenueEntityPolygon() {
+        }
+
+        [IntrinsicProperty]
+        public MapBounds Bounds {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public MapLocation Center {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public MapLocation[] Locations {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueFloor.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueFloor.cs
new file mode 100644
index 000000000..e3a019067
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueFloor.cs
@@ -0,0 +1,41 @@
+// VenueFloor.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.VenueMaps {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class VenueFloor {
+
+        private VenueFloor() {
+        }
+
+        [ScriptName("primitives")]
+        [IntrinsicProperty]
+        public VenueEntity[] Entities {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Name {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public int[] ZoomRange {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueFootprint.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueFootprint.cs
new file mode 100644
index 000000000..d00df0b00
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueFootprint.cs
@@ -0,0 +1,33 @@
+// VenueFootprint.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.VenueMaps {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class VenueFootprint {
+
+        private VenueFootprint() {
+        }
+
+        [IntrinsicProperty]
+        public VenueEntityPolygon[] Polygons {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public int[] ZoomRange {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMap.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMap.cs
new file mode 100644
index 000000000..6d64e411c
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMap.cs
@@ -0,0 +1,110 @@
+// VenueMap.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.VenueMaps {
+
+    [Imported]
+    public sealed class VenueMap {
+
+        private VenueMap() {
+        }
+
+        [IntrinsicProperty]
+        public string Address {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public MapViewOptions BestMapView {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public MapLocation Center {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string DefaultFloor {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string FloorHeader {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public VenueFloor[] Floors {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public VenueFootprint Footprint {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string ID {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Name {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string PhoneNumber {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public VenueType Type {
+            get {
+                return VenueType.Mall;
+            }
+        }
+
+        public void Dispose() {
+        }
+
+        public string GetActiveFloor() {
+            return null;
+        }
+
+        public void Hide() {
+        }
+
+        public void SetActiveFloor(string venueMapID, string floor) {
+        }
+
+        public void Show() {
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapErrorCallback.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapErrorCallback.cs
new file mode 100644
index 000000000..0c763c6e9
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapErrorCallback.cs
@@ -0,0 +1,12 @@
+// VenueMapErrorCallback.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.VenueMaps {
+
+    public delegate void VenueMapErrorCallback(int errorCode, VenueMapOptions options);
+}
diff --git a/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapFactory.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapFactory.cs
new file mode 100644
index 000000000..97dfa229b
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapFactory.cs
@@ -0,0 +1,24 @@
+// VenueMapFactory.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.VenueMaps {
+
+    [Imported]
+    public sealed class VenueMapFactory {
+
+        public VenueMapFactory(Map map) {
+        }
+
+        public void Create(VenueMapOptions options) {
+        }
+
+        [ScriptName("getNearbyVenues")]
+        public void Search(VenueMapSearchOptions searchOptions) {
+        }
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapOptions.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapOptions.cs
new file mode 100644
index 000000000..119e42bc8
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapOptions.cs
@@ -0,0 +1,27 @@
+// VenueMapOptions.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.VenueMaps {
+
+    // TODO: Make properties
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class VenueMapOptions {
+
+        [ScriptName("error")]
+        public VenueMapErrorCallback ErrorCallback;
+
+        [ScriptName("success")]
+        public VenueMapSuccessCallback SuccessCallback;
+
+        [ScriptName("venueMapId")]
+        public string VenueMapID;
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapSearchCallback.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapSearchCallback.cs
new file mode 100644
index 000000000..cbec51ad3
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapSearchCallback.cs
@@ -0,0 +1,12 @@
+// VenueMapSearchCallback.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.VenueMaps {
+
+    public delegate void VenueMapSearchCallback(Venue[] venues);
+}
diff --git a/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapSearchOptions.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapSearchOptions.cs
new file mode 100644
index 000000000..42926a1c8
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapSearchOptions.cs
@@ -0,0 +1,26 @@
+// VenueMapSearchOptions.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.VenueMaps {
+
+    // TODO: Make properties
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class VenueMapSearchOptions {
+
+        public VenueMapSearchCallback Callback;
+
+        public MapLocation Location;
+
+        public Map Map;
+
+        public double Radius;
+    }
+}
diff --git a/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapSuccessCallback.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapSuccessCallback.cs
new file mode 100644
index 000000000..9c28b4c9d
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMapSuccessCallback.cs
@@ -0,0 +1,12 @@
+// VenueMapSuccessCallback.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps.VenueMaps {
+
+    public delegate void VenueMapSuccessCallback(VenueMap venueMap, VenueMapOptions options);
+}
diff --git a/src/Libraries/Windows/Gadgets/SidebarTimeZone.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMetadata.cs
similarity index 50%
rename from src/Libraries/Windows/Gadgets/SidebarTimeZone.cs
rename to src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMetadata.cs
index 073bef417..f0aa8985a 100644
--- a/src/Libraries/Windows/Gadgets/SidebarTimeZone.cs
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueMetadata.cs
@@ -1,83 +1,91 @@
-// SidebarTimeZone.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// VenueMapOptions.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
 using System.Runtime.CompilerServices;
 
-namespace System.Gadgets {
+namespace Microsoft.Maps.VenueMaps {
 
-    /// <summary>
-    /// Contains information about a particular time zone.
-    /// </summary>
-    [IgnoreNamespace]
     [Imported]
-    public sealed class SidebarTimeZone {
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class VenueMetadata {
 
-        private SidebarTimeZone() {
+        private VenueMetadata() {
         }
 
+        [PreserveCase]
         [IntrinsicProperty]
-        public long Bias {
+        public string DefaultFloor {
             get {
-                return 0;
+                return null;
             }
         }
 
+        [PreserveCase]
         [IntrinsicProperty]
-        public string DisplayName {
+        public string FloorHeader {
             get {
                 return null;
             }
         }
 
-        [IntrinsicProperty]
         [PreserveCase]
-        public long DSTBias {
+        [IntrinsicProperty]
+        public VenueFloor[] Floors {
             get {
-                return 0;
+                return null;
             }
         }
 
-        [IntrinsicProperty]
         [PreserveCase]
-        public DateTime DSTDate {
+        [IntrinsicProperty]
+        public VenueFootprint Footprint {
             get {
-                return default(DateTime);
+                return null;
             }
         }
 
+        [ScriptName("MapId")]
         [IntrinsicProperty]
-        [PreserveCase]
-        public string DSTDisplayName {
+        public string ID {
             get {
                 return null;
             }
         }
 
+        [ScriptName("CenterLat")]
         [IntrinsicProperty]
-        public string Name {
+        public double Latitude {
             get {
-                return null;
+                return 0;
             }
         }
 
+        [ScriptName("CenterLong")]
         [IntrinsicProperty]
-        public DateTime StandardDate {
+        public double Longitude {
             get {
-                return default(DateTime);
+                return 0;
             }
         }
 
+        [PreserveCase]
         [IntrinsicProperty]
-        public string StandardDisplayName {
+        public string Name {
             get {
                 return null;
             }
         }
+
+        [ScriptName("MapType")]
+        [IntrinsicProperty]
+        public VenueType Type {
+            get {
+                return VenueType.Mall;
+            }
+        }
     }
 }
diff --git a/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueType.cs b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueType.cs
new file mode 100644
index 000000000..323d3c1e6
--- /dev/null
+++ b/src/Libraries/Microsoft/BingMaps/VenueMaps/VenueType.cs
@@ -0,0 +1,17 @@
+// VenueType.cs
+// Script#/Libraries/Microsoft/BingMaps
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Maps {
+
+    [Imported]
+    [NamedValues]
+    public enum VenueType {
+
+        Mall
+    }
+}
diff --git a/src/Libraries/Web/Html/ActiveXObject.cs b/src/Libraries/Web/Html/ActiveXObject.cs
index 4d3e4771d..733779f37 100644
--- a/src/Libraries/Web/Html/ActiveXObject.cs
+++ b/src/Libraries/Web/Html/ActiveXObject.cs
@@ -1,9 +1,6 @@
 // ActiveXObject.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System.Runtime.CompilerServices;
diff --git a/src/Libraries/Web/Html/AnchorElement.cs b/src/Libraries/Web/Html/AnchorElement.cs
index bf4d83e64..b92eca441 100644
--- a/src/Libraries/Web/Html/AnchorElement.cs
+++ b/src/Libraries/Web/Html/AnchorElement.cs
@@ -1,9 +1,6 @@
 // AnchorElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -44,5 +41,14 @@ public string Target {
             set {
             }
         }
+        
+        [IntrinsicProperty]
+        public string Download {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
     }
 }
diff --git a/src/Libraries/Web/Html/AreaElement.cs b/src/Libraries/Web/Html/AreaElement.cs
index 00141e11a..a4ca40fe8 100644
--- a/src/Libraries/Web/Html/AreaElement.cs
+++ b/src/Libraries/Web/Html/AreaElement.cs
@@ -1,9 +1,6 @@
 // AreaElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/AudioElement.cs b/src/Libraries/Web/Html/AudioElement.cs
new file mode 100644
index 000000000..be987f655
--- /dev/null
+++ b/src/Libraries/Web/Html/AudioElement.cs
@@ -0,0 +1,75 @@
+// AudioElement.cs
+// Script#/Libraries/Web
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Html {
+
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class AudioElement : Element {
+
+        private AudioElement() {
+        }
+
+        [IntrinsicProperty]
+        public double CurrentTime {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public double Duration {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public bool Ended {
+            get {
+                return false;
+            }
+        }
+
+        [IntrinsicProperty]
+        public bool Paused {
+            get {
+                return false;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Src {
+            get {
+                return "";
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public float Volume {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        public void Load() {
+        }
+
+        public void Pause() {
+        }
+
+        public void Play() {
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/CanvasElement.cs b/src/Libraries/Web/Html/CanvasElement.cs
index c3995d5a7..1b18d1cf0 100644
--- a/src/Libraries/Web/Html/CanvasElement.cs
+++ b/src/Libraries/Web/Html/CanvasElement.cs
@@ -1,9 +1,6 @@
 // CanvasElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/CheckBoxElement.cs b/src/Libraries/Web/Html/CheckBoxElement.cs
index 370d8563d..37e2f9c20 100644
--- a/src/Libraries/Web/Html/CheckBoxElement.cs
+++ b/src/Libraries/Web/Html/CheckBoxElement.cs
@@ -1,9 +1,6 @@
 // CheckBoxElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -26,5 +23,12 @@ public bool Checked {
             set {
             }
         }
+
+        [IntrinsicProperty]
+        public bool DefaultChecked {
+            get {
+                return false;
+            }
+        }
     }
 }
diff --git a/src/Libraries/Web/Html/ClientRect.cs b/src/Libraries/Web/Html/ClientRect.cs
new file mode 100644
index 000000000..5584b0baf
--- /dev/null
+++ b/src/Libraries/Web/Html/ClientRect.cs
@@ -0,0 +1,47 @@
+// ClientRect.cs
+// Script#/Libraries/Web
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace System.Html {
+
+    [IgnoreNamespace]
+    [Imported]
+    public sealed class ClientRect {
+
+        private ClientRect() {
+        }
+
+        [IntrinsicProperty]
+        public double Bottom {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public double Left {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public double Right {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public double Top {
+            get {
+                return 0;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/ClientRectList.cs b/src/Libraries/Web/Html/ClientRectList.cs
new file mode 100644
index 000000000..59b95ec54
--- /dev/null
+++ b/src/Libraries/Web/Html/ClientRectList.cs
@@ -0,0 +1,33 @@
+// ClientRectList.cs
+// Script#/Libraries/Web
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace System.Html {
+
+    [IgnoreNamespace]
+    [Imported]
+    public sealed class ClientRectList {
+
+        private ClientRectList() {
+        }
+
+        [IntrinsicProperty]
+        public int Length {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public ClientRect this[int index] {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/CustomEvent.cs b/src/Libraries/Web/Html/CustomEvent.cs
index 5d9e6c84c..8c1b0355d 100644
--- a/src/Libraries/Web/Html/CustomEvent.cs
+++ b/src/Libraries/Web/Html/CustomEvent.cs
@@ -1,9 +1,6 @@
 // CustomEvent.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Data/ApplicationCache.cs b/src/Libraries/Web/Html/Data/ApplicationCache.cs
index 3c7a53f0f..1a7fd8cbe 100644
--- a/src/Libraries/Web/Html/Data/ApplicationCache.cs
+++ b/src/Libraries/Web/Html/Data/ApplicationCache.cs
@@ -1,9 +1,6 @@
 // ApplicationCache.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Data/ApplicationCacheEvent.cs b/src/Libraries/Web/Html/Data/ApplicationCacheEvent.cs
index c6ca396c4..b15576328 100644
--- a/src/Libraries/Web/Html/Data/ApplicationCacheEvent.cs
+++ b/src/Libraries/Web/Html/Data/ApplicationCacheEvent.cs
@@ -1,9 +1,6 @@
 // ApplicationCacheEvent.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -22,47 +19,47 @@ public enum ApplicationCacheEvent {
         /// <summary>
         /// Raised when the update process finishes for the first time
         /// </summary>
-        [ScriptName("oncached")]
-        OnCached,
+        [ScriptName("cached")]
+        Cached,
 
         /// <summary>
         /// Raised when the cache update process begins.
         /// </summary>
-        [ScriptName("onchecking")]
-        OnChecking,
+        [ScriptName("checking")]
+        Checking,
 
         /// <summary>
         /// Raised when the update process begins downloading resources
         /// in the manifest file.
         /// </summary>
-        [ScriptName("ondownloading")]
-        OnDownloading,
+        [ScriptName("downloading")]
+        Downloading,
 
         /// <summary>
         /// Raised when an error occurs.
         /// </summary>
-        [ScriptName("onerror")]
-        OnError,
+        [ScriptName("error")]
+        Error,
 
         /// <summary>
         /// Raised when the update process finishes but the manifest
         /// file does not change.
         /// </summary>
-        [ScriptName("onnoupdate")]
-        OnNoUpdate,
+        [ScriptName("noupdate")]
+        NoUpdate,
 
         /// <summary>
         /// Raised when each resource in the manifest file begins to download.
         /// </summary>
-        [ScriptName("onprogress")]
-        OnProgress,
+        [ScriptName("progress")]
+        Progress,
 
         /// <summary>
         /// Raised when there is an existing application cache,
         /// the update process finishes, and there is a new application
         /// cache ready for use.
         /// </summary>
-        [ScriptName("onupdateready")]
-        OnUpdateReady
+        [ScriptName("updateready")]
+        UpdateReady
     }
 }
diff --git a/src/Libraries/Web/Html/Data/ApplicationCacheStatus.cs b/src/Libraries/Web/Html/Data/ApplicationCacheStatus.cs
index d17bbb4ef..dfffb7a94 100644
--- a/src/Libraries/Web/Html/Data/ApplicationCacheStatus.cs
+++ b/src/Libraries/Web/Html/Data/ApplicationCacheStatus.cs
@@ -1,9 +1,6 @@
 // ApplicationCacheStatus.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -44,6 +41,11 @@ public enum ApplicationCacheStatus {
         /// Resources have finished downloading and the new cache
         /// is ready to be used.
         /// </summary>
-        UpdateReady = 4
+        UpdateReady = 4,
+
+        /// <summary>
+        /// Resources hare finished downloading, but are obsolete.
+        /// </summary>
+        Obsolete = 5
     }
 }
diff --git a/src/Libraries/Web/Html/Data/SqlDatabase.cs b/src/Libraries/Web/Html/Data/SqlDatabase.cs
index 0cb2e9e1c..a0649cb5c 100644
--- a/src/Libraries/Web/Html/Data/SqlDatabase.cs
+++ b/src/Libraries/Web/Html/Data/SqlDatabase.cs
@@ -1,9 +1,6 @@
 // SqlDatabase.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Data/SqlError.cs b/src/Libraries/Web/Html/Data/SqlError.cs
index 164e4dc99..dc21ad409 100644
--- a/src/Libraries/Web/Html/Data/SqlError.cs
+++ b/src/Libraries/Web/Html/Data/SqlError.cs
@@ -1,9 +1,6 @@
 // SqlError.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Data/SqlResultSet.cs b/src/Libraries/Web/Html/Data/SqlResultSet.cs
index 5ff2892db..6af8a6cb3 100644
--- a/src/Libraries/Web/Html/Data/SqlResultSet.cs
+++ b/src/Libraries/Web/Html/Data/SqlResultSet.cs
@@ -1,9 +1,6 @@
 // SqlResultSet.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Data/SqlResultSetRow.cs b/src/Libraries/Web/Html/Data/SqlResultSetRow.cs
index 01fa3e8a6..e88dde25b 100644
--- a/src/Libraries/Web/Html/Data/SqlResultSetRow.cs
+++ b/src/Libraries/Web/Html/Data/SqlResultSetRow.cs
@@ -1,9 +1,6 @@
 // SqlResultSetRow.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Data/SqlResultSetRowList.cs b/src/Libraries/Web/Html/Data/SqlResultSetRowList.cs
index 33fd08c9e..3de885cea 100644
--- a/src/Libraries/Web/Html/Data/SqlResultSetRowList.cs
+++ b/src/Libraries/Web/Html/Data/SqlResultSetRowList.cs
@@ -1,9 +1,6 @@
 // SqlResultSetRowList.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Data/SqlTransaction.cs b/src/Libraries/Web/Html/Data/SqlTransaction.cs
index a0dd60839..38168fd6d 100644
--- a/src/Libraries/Web/Html/Data/SqlTransaction.cs
+++ b/src/Libraries/Web/Html/Data/SqlTransaction.cs
@@ -1,9 +1,6 @@
 // SqlTransaction.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Data/Storage.cs b/src/Libraries/Web/Html/Data/Storage.cs
index b5ad2b49a..77b7b5bd0 100644
--- a/src/Libraries/Web/Html/Data/Storage.cs
+++ b/src/Libraries/Web/Html/Data/Storage.cs
@@ -1,9 +1,6 @@
 // Storage.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/DataFormat.cs b/src/Libraries/Web/Html/DataFormat.cs
index 159105af5..bca0e55d9 100644
--- a/src/Libraries/Web/Html/DataFormat.cs
+++ b/src/Libraries/Web/Html/DataFormat.cs
@@ -1,9 +1,6 @@
 // DataFormat.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/DataTransfer.cs b/src/Libraries/Web/Html/DataTransfer.cs
index 7996209d4..a7368b552 100644
--- a/src/Libraries/Web/Html/DataTransfer.cs
+++ b/src/Libraries/Web/Html/DataTransfer.cs
@@ -1,9 +1,6 @@
 // DataTransfer.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/DivElement.cs b/src/Libraries/Web/Html/DivElement.cs
index 4e8e01a1c..dff49f26d 100644
--- a/src/Libraries/Web/Html/DivElement.cs
+++ b/src/Libraries/Web/Html/DivElement.cs
@@ -1,9 +1,6 @@
 // DivElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Document.cs b/src/Libraries/Web/Html/Document.cs
index adcf8054e..81c274ae3 100644
--- a/src/Libraries/Web/Html/Document.cs
+++ b/src/Libraries/Web/Html/Document.cs
@@ -1,9 +1,6 @@
 // Document.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -86,6 +83,13 @@ public static WindowInstance ParentWindow {
             }
         }
 
+        [IntrinsicProperty]
+        public static string ReadyState {
+            get {
+                return null;
+            }
+        }
+        
         [IntrinsicProperty]
         public static string Referrer {
             get {
@@ -133,6 +137,9 @@ public static void AddEventListener(string eventName, ElementEventListener liste
         public static void AddEventListener(string eventName, ElementEventListener listener, bool useCapture) {
         }
 
+        public static void AttachEvent(string eventName, ElementEventHandler handler) {
+        }
+
         public static ElementAttribute CreateAttribute(string name) {
             return null;
         }
@@ -153,6 +160,9 @@ public static Element CreateTextNode(string data) {
             return null;
         }
 
+        public static void DetachEvent(string eventName, ElementEventHandler handler) {
+        }
+
         public static bool DispatchEvent(MutableEvent eventObject) {
             return false;
         }
@@ -172,6 +182,10 @@ public static Element GetElementById(string id) {
             return null;
         }
 
+        public static TElement GetElementById<TElement>(string id) where TElement : Element {
+            return null;
+        }
+
         public static ElementCollection GetElementsByClassName(string className) {
             return null;
         }
diff --git a/src/Libraries/Web/Html/DocumentFragment.cs b/src/Libraries/Web/Html/DocumentFragment.cs
index ad83ddbd4..585dbc8d0 100644
--- a/src/Libraries/Web/Html/DocumentFragment.cs
+++ b/src/Libraries/Web/Html/DocumentFragment.cs
@@ -1,9 +1,6 @@
 // DOMDocumentFragment.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/DocumentImplementation.cs b/src/Libraries/Web/Html/DocumentImplementation.cs
index aec963d01..f89c15abe 100644
--- a/src/Libraries/Web/Html/DocumentImplementation.cs
+++ b/src/Libraries/Web/Html/DocumentImplementation.cs
@@ -1,9 +1,6 @@
 // DocumentImplementation.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/DocumentInstance.cs b/src/Libraries/Web/Html/DocumentInstance.cs
index 6be9c89d2..2feab949f 100644
--- a/src/Libraries/Web/Html/DocumentInstance.cs
+++ b/src/Libraries/Web/Html/DocumentInstance.cs
@@ -1,9 +1,6 @@
 // DocumentInstance.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -88,6 +85,13 @@ public WindowInstance ParentWindow {
             }
         }
 
+        [IntrinsicProperty]
+        public string ReadyState {
+            get {
+                return null;
+            }
+        }
+        
         [IntrinsicProperty]
         public string Referrer {
             get {
@@ -135,6 +139,9 @@ public void AddEventListener(string eventName, ElementEventListener listener) {
         public void AddEventListener(string eventName, ElementEventListener listener, bool useCapture) {
         }
 
+        public void AttachEvent(string eventName, ElementEventHandler handler) {
+        }
+
         public void Close() {
         }
 
@@ -142,7 +149,7 @@ public ElementAttribute CreateAttribute(string name) {
             return null;
         }
 
-        public DocumentInstance CreateDocumentFragment() {
+        public DocumentFragment CreateDocumentFragment() {
             return null;
         }
 
@@ -158,6 +165,9 @@ public Element CreateTextNode(string tagName) {
             return null;
         }
 
+        public void DetachEvent(string eventName, ElementEventHandler handler) {
+        }
+
         public bool DispatchEvent(MutableEvent eventObject) {
             return false;
         }
@@ -177,6 +187,10 @@ public Element GetElementById(string id) {
             return null;
         }
 
+        public TElement GetElementById<TElement>(string id) where TElement : Element {
+            return null;
+        }
+
         public ElementCollection GetElementsByClassName(string className) {
             return null;
         }
diff --git a/src/Libraries/Web/Html/DropEffect.cs b/src/Libraries/Web/Html/DropEffect.cs
index 976a5a36b..0f1ea9e94 100644
--- a/src/Libraries/Web/Html/DropEffect.cs
+++ b/src/Libraries/Web/Html/DropEffect.cs
@@ -1,9 +1,6 @@
 // DropEffect.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/DropEffects.cs b/src/Libraries/Web/Html/DropEffects.cs
index 178aeee41..a75b4ed09 100644
--- a/src/Libraries/Web/Html/DropEffects.cs
+++ b/src/Libraries/Web/Html/DropEffects.cs
@@ -1,9 +1,6 @@
 // DropEffects.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Editing/ControlRange.cs b/src/Libraries/Web/Html/Editing/ControlRange.cs
index b5c12bf1a..50418f934 100644
--- a/src/Libraries/Web/Html/Editing/ControlRange.cs
+++ b/src/Libraries/Web/Html/Editing/ControlRange.cs
@@ -1,9 +1,6 @@
 // ControlRange.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Editing/Range.cs b/src/Libraries/Web/Html/Editing/Range.cs
index 4eeff12bf..8db1c2504 100644
--- a/src/Libraries/Web/Html/Editing/Range.cs
+++ b/src/Libraries/Web/Html/Editing/Range.cs
@@ -1,9 +1,6 @@
 // Range.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Editing/Selection.cs b/src/Libraries/Web/Html/Editing/Selection.cs
index c6fa8d358..d21483a97 100644
--- a/src/Libraries/Web/Html/Editing/Selection.cs
+++ b/src/Libraries/Web/Html/Editing/Selection.cs
@@ -1,9 +1,6 @@
 // Selection.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Editing/TextRange.cs b/src/Libraries/Web/Html/Editing/TextRange.cs
index a8c85fbc7..908843e82 100644
--- a/src/Libraries/Web/Html/Editing/TextRange.cs
+++ b/src/Libraries/Web/Html/Editing/TextRange.cs
@@ -1,9 +1,6 @@
 // TextRange.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Element.cs b/src/Libraries/Web/Html/Element.cs
index 70ef81fdc..953721916 100644
--- a/src/Libraries/Web/Html/Element.cs
+++ b/src/Libraries/Web/Html/Element.cs
@@ -1,9 +1,6 @@
 // Element.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -59,6 +56,13 @@ public string ClassName {
             }
         }
 
+        [IntrinsicProperty]
+        public TokenList ClassList {
+            get {
+                return null;
+            }
+        }
+
         [IntrinsicProperty]
         public int ClientHeight {
             get {
@@ -347,11 +351,18 @@ public Element AppendChild(Element child) {
             return null;
         }
 
+        public Element AppendChild(DocumentFragment child) {
+            return null;
+        }
+
         [ScriptSkip]
         public TElement As<TElement>() where TElement : Element {
             return null;
         }
 
+        public void AttachEvent(string eventName, ElementEventHandler handler) {
+        }
+
         public void Blur() {
         }
 
@@ -370,6 +381,9 @@ public bool Contains(Element element) {
             return false;
         }
 
+        public void DetachEvent(string eventName, ElementEventHandler handler) {
+        }
+
         public bool DispatchEvent(MutableEvent eventObject) {
             return false;
         }
@@ -397,6 +411,10 @@ public ElementAttribute GetAttributeNode(ElementAttributeName name) {
             return null;
         }
 
+        public ClientRectList GetClientRects() {
+            return null;
+        }
+
         public ElementCollection GetElementsByClassName(string className) {
             return null;
         }
@@ -405,6 +423,14 @@ public ElementCollection GetElementsByTagName(string tagName) {
             return null;
         }
 
+        public bool HasAttribute(string name) {
+            return false;
+        }
+
+        public bool HasAttribute(ElementAttributeName name) {
+            return false;
+        }
+
         public bool HasChildNodes() {
             return false;
         }
diff --git a/src/Libraries/Web/Html/ElementAttribute.cs b/src/Libraries/Web/Html/ElementAttribute.cs
index 92f656bf3..25ebd979b 100644
--- a/src/Libraries/Web/Html/ElementAttribute.cs
+++ b/src/Libraries/Web/Html/ElementAttribute.cs
@@ -1,9 +1,6 @@
 // ElementAttribute.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/ElementAttributeCollection.cs b/src/Libraries/Web/Html/ElementAttributeCollection.cs
index cabb68846..e9d05d024 100644
--- a/src/Libraries/Web/Html/ElementAttributeCollection.cs
+++ b/src/Libraries/Web/Html/ElementAttributeCollection.cs
@@ -1,9 +1,6 @@
 // ElementAttributeCollection.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/ElementAttributeName.cs b/src/Libraries/Web/Html/ElementAttributeName.cs
index 0d13d2ce2..a5fc87c76 100644
--- a/src/Libraries/Web/Html/ElementAttributeName.cs
+++ b/src/Libraries/Web/Html/ElementAttributeName.cs
@@ -1,9 +1,6 @@
 // ElementAttributeName.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/ElementCollection.cs b/src/Libraries/Web/Html/ElementCollection.cs
index c666b4905..9f3c5f176 100644
--- a/src/Libraries/Web/Html/ElementCollection.cs
+++ b/src/Libraries/Web/Html/ElementCollection.cs
@@ -1,9 +1,6 @@
 // ElementCollection.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/ElementEvent.cs b/src/Libraries/Web/Html/ElementEvent.cs
index 7c692f1a8..b66d9dfa3 100644
--- a/src/Libraries/Web/Html/ElementEvent.cs
+++ b/src/Libraries/Web/Html/ElementEvent.cs
@@ -1,9 +1,6 @@
 // ElementEvent.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -135,9 +132,9 @@ public Element Target {
         }
 
         [IntrinsicProperty]
-        public DateTime TimeStamp {
+        public Date TimeStamp {
             get {
-                return default(DateTime);
+                return null;
             }
         }
 
diff --git a/src/Libraries/Web/Html/ElementEventHandler.cs b/src/Libraries/Web/Html/ElementEventHandler.cs
index 180b357bd..8e0b12898 100644
--- a/src/Libraries/Web/Html/ElementEventHandler.cs
+++ b/src/Libraries/Web/Html/ElementEventHandler.cs
@@ -1,9 +1,6 @@
 // ElementEventHandler.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -13,5 +10,5 @@ namespace System.Html {
 
     [IgnoreNamespace]
     [Imported]
-    public delegate void ElementEventListener(ElementEvent e);
+    public delegate void ElementEventHandler();
 }
diff --git a/src/Libraries/Web/Html/ElementEventListener.cs b/src/Libraries/Web/Html/ElementEventListener.cs
new file mode 100644
index 000000000..a3fcbc22e
--- /dev/null
+++ b/src/Libraries/Web/Html/ElementEventListener.cs
@@ -0,0 +1,14 @@
+// ElementEventListener.cs
+// Script#/Libraries/Web
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Html {
+
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void ElementEventListener(ElementEvent e);
+}
diff --git a/src/Libraries/Web/Html/ElementType.cs b/src/Libraries/Web/Html/ElementType.cs
index ddfac5817..d887f8077 100644
--- a/src/Libraries/Web/Html/ElementType.cs
+++ b/src/Libraries/Web/Html/ElementType.cs
@@ -1,9 +1,6 @@
 // ElementType.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/ErrorHandler.cs b/src/Libraries/Web/Html/ErrorHandler.cs
index 545dda399..dd223e9ae 100644
--- a/src/Libraries/Web/Html/ErrorHandler.cs
+++ b/src/Libraries/Web/Html/ErrorHandler.cs
@@ -1,9 +1,6 @@
 // ErrorHandler.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/FormElement.cs b/src/Libraries/Web/Html/FormElement.cs
index ecddba2c3..ad484637b 100644
--- a/src/Libraries/Web/Html/FormElement.cs
+++ b/src/Libraries/Web/Html/FormElement.cs
@@ -1,9 +1,6 @@
 // FormElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/GestureEvent.cs b/src/Libraries/Web/Html/GestureEvent.cs
index e69fbb566..0371e6525 100644
--- a/src/Libraries/Web/Html/GestureEvent.cs
+++ b/src/Libraries/Web/Html/GestureEvent.cs
@@ -1,9 +1,6 @@
 // GestureEvent.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/History.cs b/src/Libraries/Web/Html/History.cs
index 1495592a6..610c8d61b 100644
--- a/src/Libraries/Web/Html/History.cs
+++ b/src/Libraries/Web/Html/History.cs
@@ -1,9 +1,6 @@
 // History.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -18,10 +15,77 @@ public sealed class History {
         private History() {
         }
 
+        /// <summary>
+        /// Retrieves the number of elements in the history list.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Length {
+            get {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the current state object.
+        /// </summary>
+        [IntrinsicProperty]
+        public object State {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Navigates to the previous page in history.
+        /// </summary>
         public void Back() {
         }
 
+        /// <summary>
+        /// Navigates to the next page in history.
+        /// </summary>
         public void Forward() {
         }
+
+        /// <summary>
+        /// Navigates to a page in history relative to the current page.
+        /// </summary>
+        /// <param name="delta">The number of pages in history to go back (negative) or forward (positive).</param>
+        public void Go(int delta) {
+        }
+
+        /// <summary>
+        /// Pushes the given data onto the session history stack.
+        /// </summary>
+        /// <param name="data">The data to serialize into JSON format.</param>
+        /// <param name="title">The title to place into history.</param>
+        public void PushState(object data, string title) {
+        }
+
+        /// <summary>
+        /// Pushes the given data onto the session history stack.
+        /// </summary>
+        /// <param name="data">The data to serialize into JSON format.</param>
+        /// <param name="title">The title to place into history.</param>
+        /// <param name="url">The URL to place into history.</param>
+        public void PushState(object data, string title, string url) {
+        }
+
+        /// <summary>
+        /// Updates the most recent entry on the history stack.
+        /// </summary>
+        /// <param name="data">The data to serialize into JSON format.</param>
+        /// <param name="title">The title to place into history.</param>
+        public void ReplaceState(object data, string title) {
+        }
+
+        /// <summary>
+        /// Updates the most recent entry on the history stack.
+        /// </summary>
+        /// <param name="data">The data to serialize into JSON format.</param>
+        /// <param name="title">The title to place into history.</param>
+        /// <param name="url">The URL to place into history.</param>
+        public void ReplaceState(object data, string title, string url) {
+        }
     }
 }
diff --git a/src/Libraries/Web/Html/IElementEventHandler.cs b/src/Libraries/Web/Html/IElementEventHandler.cs
index 58242028f..231c348f2 100644
--- a/src/Libraries/Web/Html/IElementEventHandler.cs
+++ b/src/Libraries/Web/Html/IElementEventHandler.cs
@@ -1,9 +1,6 @@
 // IElementEventHandler.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/IFrameElement.cs b/src/Libraries/Web/Html/IFrameElement.cs
index 24ae86749..9d7ed4a78 100644
--- a/src/Libraries/Web/Html/IFrameElement.cs
+++ b/src/Libraries/Web/Html/IFrameElement.cs
@@ -1,9 +1,6 @@
 // IFrameElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/ImageElement.cs b/src/Libraries/Web/Html/ImageElement.cs
index 80d00e6e6..822996d46 100644
--- a/src/Libraries/Web/Html/ImageElement.cs
+++ b/src/Libraries/Web/Html/ImageElement.cs
@@ -1,9 +1,6 @@
 // ImageElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -13,9 +10,16 @@ namespace System.Html {
 
     [IgnoreNamespace]
     [Imported]
+    [ScriptName("Image")]
     public sealed class ImageElement : Element {
 
-        private ImageElement() {
+        public ImageElement() {
+        }
+
+        public ImageElement(int width) {
+        }
+
+        public ImageElement(int width, int height) {
         }
 
         [IntrinsicProperty]
diff --git a/src/Libraries/Web/Html/InputElement.cs b/src/Libraries/Web/Html/InputElement.cs
index 10b08bb15..b221dd9e2 100644
--- a/src/Libraries/Web/Html/InputElement.cs
+++ b/src/Libraries/Web/Html/InputElement.cs
@@ -1,9 +1,6 @@
 // InputElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -18,6 +15,13 @@ public class InputElement : Element {
         protected internal InputElement() {
         }
 
+        [IntrinsicProperty]
+        public string DefaultValue {
+            get {
+                return null;
+            }
+        }
+
         [IntrinsicProperty]
         public FormElement Form {
             get {
@@ -51,5 +55,8 @@ public string Value {
             set {
             }
         }
+
+        public void Select() {
+        }
     }
 }
diff --git a/src/Libraries/Web/Html/Location.cs b/src/Libraries/Web/Html/Location.cs
index b9e392214..da007c77b 100644
--- a/src/Libraries/Web/Html/Location.cs
+++ b/src/Libraries/Web/Html/Location.cs
@@ -1,9 +1,6 @@
 // Location.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -79,6 +76,26 @@ public string Search {
             }
         }
 
+        /// <summary>
+        /// Navigates the window to a new location and updates the browser's history.
+        /// </summary>
+        /// <param name="url">The URL to navigate to.</param>
+        public void Assign(string url) {
+        }
+
+        /// <summary>
+        /// Reload the current document.
+        /// </summary>
+        public void Reload() {
+        }
+
+        /// <summary>
+        /// Reload the current document.
+        /// </summary>
+        /// <param name="forceGet">If true, the document will be reloaded from the server, otherwise it may be loaded from the browser's cache.</param>
+        public void Reload(bool forceGet) {
+        }
+
         /// <summary>
         /// Navigates the window to a new location without updating the browser's history.
         /// </summary>
diff --git a/src/Libraries/Web/Html/MapElement.cs b/src/Libraries/Web/Html/MapElement.cs
index e91763f4c..7033a3e2c 100644
--- a/src/Libraries/Web/Html/MapElement.cs
+++ b/src/Libraries/Web/Html/MapElement.cs
@@ -1,9 +1,6 @@
 // MapElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Filters/VisualFilter.cs b/src/Libraries/Web/Html/Media/Filters/VisualFilter.cs
index 18120d731..bd2e9d4b6 100644
--- a/src/Libraries/Web/Html/Media/Filters/VisualFilter.cs
+++ b/src/Libraries/Web/Html/Media/Filters/VisualFilter.cs
@@ -1,9 +1,6 @@
 // VisualFilter.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Filters/VisualFilterCollection.cs b/src/Libraries/Web/Html/Media/Filters/VisualFilterCollection.cs
index 920e0e478..15f3daa4c 100644
--- a/src/Libraries/Web/Html/Media/Filters/VisualFilterCollection.cs
+++ b/src/Libraries/Web/Html/Media/Filters/VisualFilterCollection.cs
@@ -1,9 +1,6 @@
 // VisualFilterCollection.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Filters/VisualTransition.cs b/src/Libraries/Web/Html/Media/Filters/VisualTransition.cs
index cf90028ac..b61b17f38 100644
--- a/src/Libraries/Web/Html/Media/Filters/VisualTransition.cs
+++ b/src/Libraries/Web/Html/Media/Filters/VisualTransition.cs
@@ -1,9 +1,6 @@
 // VisualTransition.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Filters/VisualTransitionState.cs b/src/Libraries/Web/Html/Media/Filters/VisualTransitionState.cs
index 1663eb877..b6b854d33 100644
--- a/src/Libraries/Web/Html/Media/Filters/VisualTransitionState.cs
+++ b/src/Libraries/Web/Html/Media/Filters/VisualTransitionState.cs
@@ -1,9 +1,6 @@
 // VisualTransitionState.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Graphics/CanvasContext.cs b/src/Libraries/Web/Html/Media/Graphics/CanvasContext.cs
index 0dc614c96..a53d7515c 100644
--- a/src/Libraries/Web/Html/Media/Graphics/CanvasContext.cs
+++ b/src/Libraries/Web/Html/Media/Graphics/CanvasContext.cs
@@ -1,9 +1,6 @@
 // CanvasContext.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Graphics/CanvasContext2D.cs b/src/Libraries/Web/Html/Media/Graphics/CanvasContext2D.cs
index ae28532b4..9914ca8aa 100644
--- a/src/Libraries/Web/Html/Media/Graphics/CanvasContext2D.cs
+++ b/src/Libraries/Web/Html/Media/Graphics/CanvasContext2D.cs
@@ -1,9 +1,6 @@
 // CanvasContext2D.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -99,6 +96,18 @@ public object StrokeStyle {
             set;
         }
 
+        [IntrinsicProperty]
+        public TextAlign TextAlign {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        public TextBaseline TextBaseline {
+            get;
+            set;
+        }
+
         public void Arc(double x, double y, double radius, double startAngle, double endAngle, bool anticlockwise) {
         }
 
diff --git a/src/Libraries/Web/Html/Media/Graphics/CompositeOperation.cs b/src/Libraries/Web/Html/Media/Graphics/CompositeOperation.cs
index d117f8248..4f1de8ae9 100644
--- a/src/Libraries/Web/Html/Media/Graphics/CompositeOperation.cs
+++ b/src/Libraries/Web/Html/Media/Graphics/CompositeOperation.cs
@@ -1,9 +1,6 @@
 // CompositeOperation.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Graphics/Gradient.cs b/src/Libraries/Web/Html/Media/Graphics/Gradient.cs
index ac84b6843..f8c174900 100644
--- a/src/Libraries/Web/Html/Media/Graphics/Gradient.cs
+++ b/src/Libraries/Web/Html/Media/Graphics/Gradient.cs
@@ -1,9 +1,6 @@
 // Gradient.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Graphics/ImageData.cs b/src/Libraries/Web/Html/Media/Graphics/ImageData.cs
index ffadf5598..a91f1d8ee 100644
--- a/src/Libraries/Web/Html/Media/Graphics/ImageData.cs
+++ b/src/Libraries/Web/Html/Media/Graphics/ImageData.cs
@@ -1,9 +1,6 @@
 // ImageData.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Graphics/LineCap.cs b/src/Libraries/Web/Html/Media/Graphics/LineCap.cs
index 56a6cfb3e..03c866bed 100644
--- a/src/Libraries/Web/Html/Media/Graphics/LineCap.cs
+++ b/src/Libraries/Web/Html/Media/Graphics/LineCap.cs
@@ -1,9 +1,6 @@
 // LineCap.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Graphics/LineJoin.cs b/src/Libraries/Web/Html/Media/Graphics/LineJoin.cs
index 30da92f3a..93957508e 100644
--- a/src/Libraries/Web/Html/Media/Graphics/LineJoin.cs
+++ b/src/Libraries/Web/Html/Media/Graphics/LineJoin.cs
@@ -1,9 +1,6 @@
 // LineJoin.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Graphics/Pattern.cs b/src/Libraries/Web/Html/Media/Graphics/Pattern.cs
index ca4cc410e..39b7dce78 100644
--- a/src/Libraries/Web/Html/Media/Graphics/Pattern.cs
+++ b/src/Libraries/Web/Html/Media/Graphics/Pattern.cs
@@ -1,9 +1,6 @@
 // Pattern.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Graphics/PixelArray.cs b/src/Libraries/Web/Html/Media/Graphics/PixelArray.cs
index a692c9b91..e03ea812b 100644
--- a/src/Libraries/Web/Html/Media/Graphics/PixelArray.cs
+++ b/src/Libraries/Web/Html/Media/Graphics/PixelArray.cs
@@ -1,9 +1,6 @@
 // PixelArray.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Graphics/Rendering.cs b/src/Libraries/Web/Html/Media/Graphics/Rendering.cs
index 72c8d0f0e..bc1335223 100644
--- a/src/Libraries/Web/Html/Media/Graphics/Rendering.cs
+++ b/src/Libraries/Web/Html/Media/Graphics/Rendering.cs
@@ -1,9 +1,6 @@
 // Rendering.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Graphics/TextAlign.cs b/src/Libraries/Web/Html/Media/Graphics/TextAlign.cs
index c16dc1ceb..ebdaf9af2 100644
--- a/src/Libraries/Web/Html/Media/Graphics/TextAlign.cs
+++ b/src/Libraries/Web/Html/Media/Graphics/TextAlign.cs
@@ -1,9 +1,6 @@
 // TextAlign.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Graphics/TextBaseline.cs b/src/Libraries/Web/Html/Media/Graphics/TextBaseline.cs
index 5e22649f1..ac4b583ba 100644
--- a/src/Libraries/Web/Html/Media/Graphics/TextBaseline.cs
+++ b/src/Libraries/Web/Html/Media/Graphics/TextBaseline.cs
@@ -1,9 +1,6 @@
 // TextBaseline.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Media/Graphics/TextMetrics.cs b/src/Libraries/Web/Html/Media/Graphics/TextMetrics.cs
index 068190517..8123960e0 100644
--- a/src/Libraries/Web/Html/Media/Graphics/TextMetrics.cs
+++ b/src/Libraries/Web/Html/Media/Graphics/TextMetrics.cs
@@ -1,9 +1,6 @@
 // TextMetrics.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/MutableEvent.cs b/src/Libraries/Web/Html/MutableEvent.cs
index 6cb1849bc..79f54607a 100644
--- a/src/Libraries/Web/Html/MutableEvent.cs
+++ b/src/Libraries/Web/Html/MutableEvent.cs
@@ -1,9 +1,6 @@
 // MutableEvent.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Navigator.cs b/src/Libraries/Web/Html/Navigator.cs
index 7416681f5..6ba1c6294 100644
--- a/src/Libraries/Web/Html/Navigator.cs
+++ b/src/Libraries/Web/Html/Navigator.cs
@@ -1,9 +1,6 @@
 // Navigator.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -19,6 +16,19 @@ public sealed class Navigator {
         private Navigator() {
         }
 
+        /// <summary>
+        /// Returns the name of the browser.
+        /// </summary>
+        [IntrinsicProperty]
+        public string AppName {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns the version of the browser.
+        /// </summary>
         [IntrinsicProperty]
         public string AppVersion {
             get {
@@ -26,6 +36,9 @@ public string AppVersion {
             }
         }
 
+        /// <summary>
+        /// Retrieves the current language (applies to IE and Opera).
+        /// </summary>
         [IntrinsicProperty]
         public string BrowserLanguage {
             get {
@@ -40,6 +53,36 @@ public bool CookieEnabled {
             }
         }
 
+        /// <summary>
+        /// Returns a string representing the language of the browser (applies to Gecko, Opera, and WebKit).
+        /// </summary>
+        [IntrinsicProperty]
+        public string Language {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the default language used by the operating system (applies to IE).
+        /// </summary>
+        [IntrinsicProperty]
+        public string SystemLanguage {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Retrieves the operating system's natural language setting (applies to IE and Opera).
+        /// </summary>
+        [IntrinsicProperty]
+        public string UserLanguage {
+            get {
+                return null;
+            }
+        }
+
         [IntrinsicProperty]
         public GeolocationService Geolocation {
             get {
@@ -54,6 +97,9 @@ public bool OnLine {
             }
         }
 
+        /// <summary>
+        /// Returns the name of the platform.
+        /// </summary>
         [IntrinsicProperty]
         public string Platform {
             get {
@@ -61,6 +107,16 @@ public string Platform {
             }
         }
 
+        /// <summary>
+        /// Returns a PluginArray object, listing the plugins installed in the application.
+        /// </summary>
+        [IntrinsicProperty]
+        public PluginArray Plugins {
+            get {
+                return null;
+            }
+        }
+
         [IntrinsicProperty]
         public bool Standalone {
             get {
@@ -68,6 +124,9 @@ public bool Standalone {
             }
         }
 
+        /// <summary>
+        /// Returns the complete User-Agent header.
+        /// </summary>
         [IntrinsicProperty]
         public string UserAgent {
             get {
diff --git a/src/Libraries/Web/Html/OptionElement.cs b/src/Libraries/Web/Html/OptionElement.cs
index 8fe1cf7df..c1477f019 100644
--- a/src/Libraries/Web/Html/OptionElement.cs
+++ b/src/Libraries/Web/Html/OptionElement.cs
@@ -1,9 +1,6 @@
 // OptionElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Orientation.cs b/src/Libraries/Web/Html/Orientation.cs
index 8f4b53c1a..700c472ce 100644
--- a/src/Libraries/Web/Html/Orientation.cs
+++ b/src/Libraries/Web/Html/Orientation.cs
@@ -1,9 +1,6 @@
 // Orientation.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -20,6 +17,8 @@ public enum Orientation {
 
         LeftLandscape = 90,
 
-        RightLandscape = -90
+        RightLandscape = -90,
+
+        UpsideDownPortrait = 180
     }
 }
diff --git a/src/Libraries/Web/Html/Plugin.cs b/src/Libraries/Web/Html/Plugin.cs
new file mode 100644
index 000000000..4242dafa8
--- /dev/null
+++ b/src/Libraries/Web/Html/Plugin.cs
@@ -0,0 +1,61 @@
+// Plugin.cs
+// Script#/Libraries/Web
+// This source code is subject to terms and conditions of the Microsoft
+// Public License. A copy of the license can be found in License.txt.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Html {
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Object")]
+    public sealed class Plugin {
+
+        private Plugin() {
+        }
+
+        /// <summary>
+        /// A human readable description of the plugin.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Description {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// The filename of the plugin file.
+        /// </summary>
+        [IntrinsicProperty]
+        [ScriptName("filename")]
+        public string FileName {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// The name of the plugin.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Name {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// The plugin's version number string.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Version {
+            get {
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/PluginArray.cs b/src/Libraries/Web/Html/PluginArray.cs
new file mode 100644
index 000000000..75a5a64b8
--- /dev/null
+++ b/src/Libraries/Web/Html/PluginArray.cs
@@ -0,0 +1,66 @@
+// PluginArray.cs
+// Script#/Libraries/Web
+// This source code is subject to terms and conditions of the Microsoft
+// Public License. A copy of the license can be found in License.txt.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Html {
+
+    [IgnoreNamespace]
+    [Imported]
+    public sealed class PluginArray {
+
+        private PluginArray() {
+        }
+
+        /// <summary>
+        /// The number of plugins in the array.
+        /// </summary>
+        [IntrinsicProperty]
+        public long Length {
+            get {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// Returns the Plugin at the specified index into the array.
+        /// </summary>
+        [IntrinsicProperty]
+        public Plugin this[int index] {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns the Plugin with the specified name.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        [IntrinsicProperty]
+        public Plugin this[string name] {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Returns the Plugin at the specified index into the array.
+        /// </summary>
+        [ScriptName("item")]
+        public Plugin ItemAt(int index) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns the Plugin with the specified name.
+        /// </summary>
+        public Plugin NamedItem(string name) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/Screen.cs b/src/Libraries/Web/Html/Screen.cs
index 6de58d398..7653f0ba0 100644
--- a/src/Libraries/Web/Html/Screen.cs
+++ b/src/Libraries/Web/Html/Screen.cs
@@ -1,9 +1,6 @@
 // Screen.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/ScriptElement.cs b/src/Libraries/Web/Html/ScriptElement.cs
index 4e1b1eb10..df7ac8840 100644
--- a/src/Libraries/Web/Html/ScriptElement.cs
+++ b/src/Libraries/Web/Html/ScriptElement.cs
@@ -1,9 +1,6 @@
 // ScriptElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/SelectElement.cs b/src/Libraries/Web/Html/SelectElement.cs
index cd5fb9d49..061a6d29b 100644
--- a/src/Libraries/Web/Html/SelectElement.cs
+++ b/src/Libraries/Web/Html/SelectElement.cs
@@ -1,9 +1,6 @@
 // SelectElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Services/GeoCoordinates.cs b/src/Libraries/Web/Html/Services/GeoCoordinates.cs
index f7a7a0ecd..83e94f0f9 100644
--- a/src/Libraries/Web/Html/Services/GeoCoordinates.cs
+++ b/src/Libraries/Web/Html/Services/GeoCoordinates.cs
@@ -1,9 +1,6 @@
 // GeoCoordinates.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Services/Geolocation.cs b/src/Libraries/Web/Html/Services/Geolocation.cs
index df7082a80..df48f0a97 100644
--- a/src/Libraries/Web/Html/Services/Geolocation.cs
+++ b/src/Libraries/Web/Html/Services/Geolocation.cs
@@ -1,9 +1,6 @@
 // Geolocation.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Services/GeolocationError.cs b/src/Libraries/Web/Html/Services/GeolocationError.cs
index 3a8ef48d2..ec35ccbaa 100644
--- a/src/Libraries/Web/Html/Services/GeolocationError.cs
+++ b/src/Libraries/Web/Html/Services/GeolocationError.cs
@@ -1,9 +1,6 @@
 // GeolocationError.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Services/GeolocationErrorCode.cs b/src/Libraries/Web/Html/Services/GeolocationErrorCode.cs
index 1ba3079b2..0db67d3af 100644
--- a/src/Libraries/Web/Html/Services/GeolocationErrorCode.cs
+++ b/src/Libraries/Web/Html/Services/GeolocationErrorCode.cs
@@ -1,9 +1,6 @@
 // GeolocationErrorCode.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Services/GeolocationOptions.cs b/src/Libraries/Web/Html/Services/GeolocationOptions.cs
index f64383c7d..93842d31a 100644
--- a/src/Libraries/Web/Html/Services/GeolocationOptions.cs
+++ b/src/Libraries/Web/Html/Services/GeolocationOptions.cs
@@ -1,9 +1,6 @@
 // GeolocationOptions.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Services/GeolocationService.cs b/src/Libraries/Web/Html/Services/GeolocationService.cs
index ae7c8e6d3..5d94554f5 100644
--- a/src/Libraries/Web/Html/Services/GeolocationService.cs
+++ b/src/Libraries/Web/Html/Services/GeolocationService.cs
@@ -1,9 +1,6 @@
 // GeolocationService.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -34,15 +31,15 @@ public void GetCurrentPosition(GeolocationSuccessCallback successCallback, Geolo
         public void GetCurrentPosition(GeolocationSuccessCallback successCallback, GeolocationErrorCallback errorCallback, GeolocationOptions options) {
         }
 
-        public object WatchCurrentPosition(GeolocationSuccessCallback successCallback) {
+        public object WatchPosition(GeolocationSuccessCallback successCallback) {
             return null;
         }
 
-        public object WatchCurrentPosition(GeolocationSuccessCallback successCallback, GeolocationErrorCallback errorCallback) {
+        public object WatchPosition(GeolocationSuccessCallback successCallback, GeolocationErrorCallback errorCallback) {
             return null;
         }
 
-        public object WatchCurrentPosition(GeolocationSuccessCallback successCallback, GeolocationErrorCallback errorCallback, GeolocationOptions options) {
+        public object WatchPosition(GeolocationSuccessCallback successCallback, GeolocationErrorCallback errorCallback, GeolocationOptions options) {
             return null;
         }
     }
diff --git a/src/Libraries/Web/Html/Style.cs b/src/Libraries/Web/Html/Style.cs
index 173fef4ca..880e1bb5a 100644
--- a/src/Libraries/Web/Html/Style.cs
+++ b/src/Libraries/Web/Html/Style.cs
@@ -1,9 +1,6 @@
 // Style.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -358,6 +355,16 @@ public string Color {
             }
         }
 
+        /// <summary>The side of the object the text will flow.</summary>
+        [IntrinsicProperty]
+        public string CssFloat {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
         /// <summary>The persisted representation of this style.</summary>
         [IntrinsicProperty]
         public string CssText {
diff --git a/src/Libraries/Web/Html/TableCellElement.cs b/src/Libraries/Web/Html/TableCellElement.cs
index d4bdb86fa..0b47b4e74 100644
--- a/src/Libraries/Web/Html/TableCellElement.cs
+++ b/src/Libraries/Web/Html/TableCellElement.cs
@@ -1,9 +1,6 @@
 // TableCellElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/TableElement.cs b/src/Libraries/Web/Html/TableElement.cs
index 478082c5b..9bb5d2ba1 100644
--- a/src/Libraries/Web/Html/TableElement.cs
+++ b/src/Libraries/Web/Html/TableElement.cs
@@ -1,9 +1,6 @@
 // TableElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/TableRowElement.cs b/src/Libraries/Web/Html/TableRowElement.cs
index 279d04cb7..20c8d0fbf 100644
--- a/src/Libraries/Web/Html/TableRowElement.cs
+++ b/src/Libraries/Web/Html/TableRowElement.cs
@@ -1,9 +1,6 @@
 // TableRowElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/TableSectionElement.cs b/src/Libraries/Web/Html/TableSectionElement.cs
index 49795ccc5..c4f853279 100644
--- a/src/Libraries/Web/Html/TableSectionElement.cs
+++ b/src/Libraries/Web/Html/TableSectionElement.cs
@@ -1,9 +1,6 @@
 // TableSectionElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/TextAreaElement.cs b/src/Libraries/Web/Html/TextAreaElement.cs
index 4bb92f647..7d93acaad 100644
--- a/src/Libraries/Web/Html/TextAreaElement.cs
+++ b/src/Libraries/Web/Html/TextAreaElement.cs
@@ -1,9 +1,6 @@
 // TextAreaElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/TextElement.cs b/src/Libraries/Web/Html/TextElement.cs
index 0bdae8b63..a2f59e072 100644
--- a/src/Libraries/Web/Html/TextElement.cs
+++ b/src/Libraries/Web/Html/TextElement.cs
@@ -1,9 +1,6 @@
 // InputElement.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -35,8 +32,5 @@ public bool ReadOnly {
             set {
             }
         }
-
-        public void Select() {
-        }
     }
 }
diff --git a/src/Libraries/Web/Html/TokenList.cs b/src/Libraries/Web/Html/TokenList.cs
new file mode 100644
index 000000000..e1169fe9f
--- /dev/null
+++ b/src/Libraries/Web/Html/TokenList.cs
@@ -0,0 +1,51 @@
+// TokenList.cs
+// Script#/Libraries/Web
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Html {
+
+    [IgnoreNamespace]
+    [Imported]
+    public sealed class TokenList {
+
+        private TokenList() {
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("length")]
+        public int Count {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public string this[int index] {
+            get {
+                return null;
+            }
+        }
+
+        public bool Contains(string token) {
+            return false;
+        }
+
+        public void Add(string token) {
+        }
+
+        public void Remove(string token) {
+        }
+
+        public bool Toggle(string token) {
+            return false;
+        }
+
+        public override string ToString() {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Html/TouchEvent.cs b/src/Libraries/Web/Html/TouchEvent.cs
index 8e5ac25c8..9faa3bd26 100644
--- a/src/Libraries/Web/Html/TouchEvent.cs
+++ b/src/Libraries/Web/Html/TouchEvent.cs
@@ -1,9 +1,6 @@
 // TouchEvent.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/TouchInfo.cs b/src/Libraries/Web/Html/TouchInfo.cs
index 22188092e..f1f2d57f3 100644
--- a/src/Libraries/Web/Html/TouchInfo.cs
+++ b/src/Libraries/Web/Html/TouchInfo.cs
@@ -1,9 +1,6 @@
 // TouchInfo.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Html/Window.cs b/src/Libraries/Web/Html/Window.cs
index cdcb7b1b5..70fba18a2 100644
--- a/src/Libraries/Web/Html/Window.cs
+++ b/src/Libraries/Web/Html/Window.cs
@@ -1,9 +1,6 @@
 // Window.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -96,14 +93,14 @@ public static History History {
         }
 
         [IntrinsicProperty]
-        public int InnerHeight {
+        public static int InnerHeight {
             get {
                 return 0;
             }
         }
 
         [IntrinsicProperty]
-        public int InnerWidth {
+        public static int InnerWidth {
             get {
                 return 0;
             }
@@ -161,14 +158,14 @@ public static Orientation Orientation {
         }
 
         [IntrinsicProperty]
-        public int OuterHeight {
+        public static int OuterHeight {
             get {
                 return 0;
             }
         }
 
         [IntrinsicProperty]
-        public int OuterWidth {
+        public static int OuterWidth {
             get {
                 return 0;
             }
@@ -249,15 +246,69 @@ public static void AddEventListener(string eventName, ElementEventListener liste
         public static void AddEventListener(string eventName, ElementEventListener listener, bool useCapture) {
         }
 
-        public static void ClearInterval(int intervalID) {
+        /// <summary>
+        /// Displays a message box containing the specified message text.
+        /// </summary>
+        /// <param name="message">The text of the message.</param>
+        [ScriptAlias("alert")]
+        public static void Alert(string message) {
+        }
+
+        /// <summary>
+        /// Displays a message box containing the specified value converted
+        /// into a string.
+        /// </summary>
+        /// <param name="b">The boolean to display.</param>
+        [ScriptAlias("alert")]
+        public static void Alert(bool b) {
+        }
+
+        /// <summary>
+        /// Displays a message box containing the specified value converted
+        /// into a string.
+        /// </summary>
+        /// <param name="d">The date to display.</param>
+        [ScriptAlias("alert")]
+        public static void Alert(Date d) {
+        }
+
+        /// <summary>
+        /// Displays a message box containing the specified value converted
+        /// into a string.
+        /// </summary>
+        /// <param name="n">The number to display.</param>
+        [ScriptAlias("alert")]
+        public static void Alert(Number n) {
+        }
+
+        /// <summary>
+        /// Displays a message box containing the specified value converted
+        /// into a string.
+        /// </summary>
+        /// <param name="o">The object to display.</param>
+        [ScriptAlias("alert")]
+        public static void Alert(object o) {
         }
 
-        public static void ClearTimeout(int timeoutID) {
+        public static void AttachEvent(string eventName, ElementEventHandler handler) {
         }
 
         public static void Close() {
         }
 
+        /// <summary>
+        /// Prompts the user with a yes/no question.
+        /// </summary>
+        /// <param name="message">The text of the question.</param>
+        /// <returns>true if the user chooses yes; false otherwise.</returns>
+        [ScriptAlias("confirm")]
+        public static bool Confirm(string message) {
+            return false;
+        }
+
+        public static void DetachEvent(string eventName, ElementEventHandler handler) {
+        }
+
         public static bool DispatchEvent(MutableEvent eventObject) {
             return false;
         }
@@ -284,6 +335,27 @@ public static WindowInstance Open(string url, string targetName, string features
         public static void Print() {
         }
 
+        /// <summary>
+        /// Prompts the user to enter a value.
+        /// </summary>
+        /// <param name="message">The text of the prompt.</param>
+        /// <returns>The value entered by the user.</returns>
+        [ScriptAlias("prompt")]
+        public static string Prompt(string message) {
+            return null;
+        }
+
+        /// <summary>
+        /// Prompts the user to enter a value.
+        /// </summary>
+        /// <param name="message">The text of the prompt.</param>
+        /// <param name="defaultValue">The default value for the prompt.</param>
+        /// <returns>The value entered by the user.</returns>
+        [ScriptAlias("prompt")]
+        public static string Prompt(string message, string defaultValue) {
+            return null;
+        }
+
         /// <summary>
         /// Removes a listener for the specified event.
         /// </summary>
@@ -310,30 +382,6 @@ public static void ScrollBy(int x, int y) {
         public static void ScrollTo(int x, int y) {
         }
 
-        public static int SetInterval(string code, int milliseconds) {
-            return 0;
-        }
-
-        public static int SetInterval(Action callback, int milliseconds) {
-            return 0;
-        }
-
-        public static int SetInterval(Delegate d, int milliseconds) {
-            return 0;
-        }
-
-        public static int SetTimeout(string code, int milliseconds) {
-            return 0;
-        }
-
-        public static int SetTimeout(Action callback, int milliseconds) {
-            return 0;
-        }
-
-        public static int SetTimeout(Delegate d, int milliseconds) {
-            return 0;
-        }
-
         public static SqlDatabase OpenDatabase(string name, string version) {
             return null;
         }
diff --git a/src/Libraries/Web/Html/WindowInstance.cs b/src/Libraries/Web/Html/WindowInstance.cs
index f29d9275a..6789b0f25 100644
--- a/src/Libraries/Web/Html/WindowInstance.cs
+++ b/src/Libraries/Web/Html/WindowInstance.cs
@@ -1,9 +1,6 @@
 // WindowInstance.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -52,6 +49,20 @@ public IFrameElement FrameElement {
             }
         }
 
+        [IntrinsicProperty]
+        public int InnerHeight {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public int InnerWidth {
+            get {
+                return 0;
+            }
+        }
+
         [IntrinsicProperty]
         public Location Location {
             get {
@@ -73,6 +84,20 @@ public WindowInstance Opener {
             }
         }
 
+        [IntrinsicProperty]
+        public static int OuterHeight {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public static int OuterWidth {
+            get {
+                return 0;
+            }
+        }
+
         [IntrinsicProperty]
         public int PageXOffset {
             get {
@@ -134,9 +159,15 @@ public void AddEventListener(string eventName, ElementEventListener listener) {
         public void AddEventListener(string eventName, ElementEventListener listener, bool useCapture) {
         }
 
+        public void AttachEvent(string eventName, ElementEventHandler handler) {
+        }
+
         public void Close() {
         }
 
+        public void DetachEvent(string eventName, ElementEventHandler handler) {
+        }
+
         public bool DispatchEvent(MutableEvent eventObject) {
             return false;
         }
diff --git a/src/Libraries/Web/Html/messageevent.cs b/src/Libraries/Web/Html/messageevent.cs
index dab4d09f7..afdec00cf 100644
--- a/src/Libraries/Web/Html/messageevent.cs
+++ b/src/Libraries/Web/Html/messageevent.cs
@@ -1,9 +1,6 @@
 // MessageEvent.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Loader.cs b/src/Libraries/Web/Loader.cs
new file mode 100644
index 000000000..267beede8
--- /dev/null
+++ b/src/Libraries/Web/Loader.cs
@@ -0,0 +1,67 @@
+// Loader.cs
+// Script#/Libraries/Web
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("loader")]
+    public static class Loader {
+
+        /// <summary>
+        /// Loads the specified scripts.
+        /// </summary>
+        /// <param name="scriptNames">The names of scripts that are required and must be loaded.</param>
+        public static void LoadScripts(string[] scriptNames) {
+        }
+
+        /// <summary>
+        /// Loads the specified scripts and invokes the specified callback once they have been
+        /// loaded.
+        /// </summary>
+        /// <param name="scriptNames">The names of scripts that are required and must be loaded.</param>
+        /// <param name="callback">A callback to be invoked once the scripts have been loaded.</param>
+        public static void LoadScripts(string[] scriptNames, Action callback) {
+        }
+
+        /// <summary>
+        /// Loads the specified scripts and invokes the specified callback once they have been
+        /// loaded.
+        /// </summary>
+        /// <param name="scriptNames">The names of scripts that are required and must be loaded.</param>
+        /// <param name="callback">A callback to be invoked once the scripts have been loaded.</param>
+        /// <param name="context">The object to be passed in into the callback.</param>
+        /// <typeparam name="TContext">The type of the context object.</typeparam>
+        public static void LoadScripts<TContext>(string[] scriptNames, Action<TContext> callback, TContext context) {
+        }
+
+        /// <summary>
+        /// Registers the specified callback to be invoked when the DOM is ready,
+        /// and before any script loading has begun.
+        /// </summary>
+        /// <param name="callback">The callback to invoke.</param>
+        [ScriptName("init")]
+        public static void OnInit(Action callback) {
+        }
+
+        /// <summary>
+        /// Registers a callback to be invoked once any necessary scripts
+        /// have been loaded.
+        /// </summary>
+        /// <param name="callback">The callback to be invoked.</param>
+        [ScriptName("ready")]
+        public static void OnReady(Action callback) {
+        }
+
+        /// <summary>
+        /// Registers information about a script.
+        /// </summary>
+        /// <param name="scriptInfo">The information about a script.</param>
+        public static void RegisterScript(ScriptInfo scriptInfo) {
+        }
+    }
+}
diff --git a/src/Libraries/Web/Net/HttpVerb.cs b/src/Libraries/Web/Net/HttpVerb.cs
index c1a89d0b7..27f5fed3e 100644
--- a/src/Libraries/Web/Net/HttpVerb.cs
+++ b/src/Libraries/Web/Net/HttpVerb.cs
@@ -1,9 +1,6 @@
 // HttpVerb.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Net/ReadyState.cs b/src/Libraries/Web/Net/ReadyState.cs
index c24c71007..57821b96c 100644
--- a/src/Libraries/Web/Net/ReadyState.cs
+++ b/src/Libraries/Web/Net/ReadyState.cs
@@ -1,9 +1,6 @@
 // ReadyState.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/Net/XmlHttpRequest.cs b/src/Libraries/Web/Net/XmlHttpRequest.cs
index 0b5b911ef..32a6dc487 100644
--- a/src/Libraries/Web/Net/XmlHttpRequest.cs
+++ b/src/Libraries/Web/Net/XmlHttpRequest.cs
@@ -1,9 +1,6 @@
 // XMLHttpRequest.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -80,16 +77,16 @@ public void Open(string method, string url) {
         public void Open(HttpVerb verb, string url) {
         }
 
-        public void Open(string method, string url, bool async) {
+        public void Open(string method, string url, bool @async) {
         }
 
-        public void Open(HttpVerb verb, string url, bool async) {
+        public void Open(HttpVerb verb, string url, bool @async) {
         }
 
-        public void Open(string method, string url, bool async, string userName, string password) {
+        public void Open(string method, string url, bool @async, string userName, string password) {
         }
 
-        public void Open(HttpVerb verb, string url, bool async, string userName, string password) {
+        public void Open(HttpVerb verb, string url, bool @async, string userName, string password) {
         }
 
         public void Send() {
diff --git a/src/Libraries/Web/Properties/AssemblyInfo.cs b/src/Libraries/Web/Properties/AssemblyInfo.cs
index 430121cfd..a94fdf1d0 100644
--- a/src/Libraries/Web/Properties/AssemblyInfo.cs
+++ b/src/Libraries/Web/Properties/AssemblyInfo.cs
@@ -1,5 +1,6 @@
 // AssemblyInfo.cs
-// Script#/Runtime/Web
+// Script#/Libraries/Web
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/Web/ScriptInfo.cs b/src/Libraries/Web/ScriptInfo.cs
new file mode 100644
index 000000000..06a571a06
--- /dev/null
+++ b/src/Libraries/Web/ScriptInfo.cs
@@ -0,0 +1,35 @@
+// ScriptInfo.cs
+// Script#/Libraries/Web
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+    [IgnoreNamespace]
+    [Imported]
+    [ScriptName("Object")]
+    public sealed class ScriptInfo {
+
+        [IntrinsicProperty]
+        [ScriptName("requires")]
+        public string[] Dependencies {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        public string Name {
+            get;
+            set;
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("src")]
+        public string Source {
+            get;
+            set;
+        }
+    }
+}
diff --git a/src/Libraries/Web/Web.csproj b/src/Libraries/Web/Web.csproj
index a3a28e2df..3c1abc55d 100644
--- a/src/Libraries/Web/Web.csproj
+++ b/src/Libraries/Web/Web.csproj
@@ -11,10 +11,10 @@
     <RootNamespace>System</RootNamespace>
     <AssemblyName>Script.Web</AssemblyName>
     <NoStdLib>True</NoStdLib>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\Libraries.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -31,6 +31,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
@@ -39,21 +40,23 @@
     <DocumentationFile>..\..\..\bin\Release\Script.Web.xml</DocumentationFile>
     <NoWarn>1591, 0661, 0660, 1684</NoWarn>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib">
-      <HintPath>..\..\..\bin\ref\mscorlib.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="Html\ActiveXObject.cs" />
     <Compile Include="Html\AnchorElement.cs" />
     <Compile Include="Html\AreaElement.cs" />
+    <Compile Include="Html\AudioElement.cs" />
     <Compile Include="Html\CheckBoxElement.cs" />
     <Compile Include="Html\CanvasElement.cs" />
+    <Compile Include="Html\ClientRectList.cs" />
+    <Compile Include="Html\ElementEventListener.cs" />
     <Compile Include="Html\GestureEvent.cs" />
     <Compile Include="Html\CustomEvent.cs" />
     <Compile Include="Html\Media\Graphics\Rendering.cs" />
     <Compile Include="Html\MutableEvent.cs" />
+    <Compile Include="Html\ClientRect.cs" />
+    <Compile Include="Html\Plugin.cs" />
+    <Compile Include="Html\PluginArray.cs" />
+    <Compile Include="Html\TokenList.cs" />
     <Compile Include="Html\TouchInfo.cs" />
     <Compile Include="Html\TouchEvent.cs" />
     <Compile Include="Html\Data\ApplicationCache.cs" />
@@ -138,9 +141,11 @@
     <Compile Include="Net\ReadyState.cs" />
     <Compile Include="Net\XmlHttpRequest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
-      <Link>Properties\CommonAssemblyInfo.cs</Link>
+    <Compile Include="..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
     </Compile>
+    <Compile Include="Loader.cs" />
+    <Compile Include="ScriptInfo.cs" />
     <Compile Include="Xml\XmlAttribute.cs" />
     <Compile Include="Xml\XmlDocument.cs" />
     <Compile Include="Xml\XmlDocumentParser.cs" />
@@ -150,5 +155,11 @@
     <Compile Include="Xml\XmlNodeType.cs" />
     <Compile Include="Xml\XmlText.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\CoreLib\CoreLib.csproj">
+      <Project>{36D4B098-A21C-4725-ACD3-400922885F38}</Project>
+      <Name>CoreLib</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Libraries/Web/Xml/XmlAttribute.cs b/src/Libraries/Web/Xml/XmlAttribute.cs
index 97be1e1f2..36611fc2f 100644
--- a/src/Libraries/Web/Xml/XmlAttribute.cs
+++ b/src/Libraries/Web/Xml/XmlAttribute.cs
@@ -1,9 +1,6 @@
 // XmlAttribute.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System.Runtime.CompilerServices;
diff --git a/src/Libraries/Web/Xml/XmlDocument.cs b/src/Libraries/Web/Xml/XmlDocument.cs
index dbce225d7..139d90f15 100644
--- a/src/Libraries/Web/Xml/XmlDocument.cs
+++ b/src/Libraries/Web/Xml/XmlDocument.cs
@@ -1,9 +1,6 @@
 // XmlDocument.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System.Runtime.CompilerServices;
diff --git a/src/Libraries/Web/Xml/XmlDocumentParser.cs b/src/Libraries/Web/Xml/XmlDocumentParser.cs
index 70951a95f..2008fa56c 100644
--- a/src/Libraries/Web/Xml/XmlDocumentParser.cs
+++ b/src/Libraries/Web/Xml/XmlDocumentParser.cs
@@ -1,22 +1,20 @@
 // XmlDocumentParser.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
+using System;
 using System.Runtime.CompilerServices;
 
 namespace System.Xml {
 
     [IgnoreNamespace]
     [Imported]
-    public static class XmlDocumentParser {
+    [ScriptName("DOMParser")]
+    public sealed class XmlDocumentParser {
 
-        [ScriptAlias("ss.parseXml")]
-        public static XmlDocument Parse(string markup) {
-           return null;
+        public XmlDocument ParseFromString(string markup, string mimeType) {
+            return null;
         }
     }
 }
diff --git a/src/Libraries/Web/Xml/XmlNamedNodeMap.cs b/src/Libraries/Web/Xml/XmlNamedNodeMap.cs
index 7140acc48..531f96dfe 100644
--- a/src/Libraries/Web/Xml/XmlNamedNodeMap.cs
+++ b/src/Libraries/Web/Xml/XmlNamedNodeMap.cs
@@ -1,9 +1,6 @@
 // XmlNamedNodeMap.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System.Collections;
diff --git a/src/Libraries/Web/Xml/XmlNode.cs b/src/Libraries/Web/Xml/XmlNode.cs
index fc7c25eef..1ab9dc6ab 100644
--- a/src/Libraries/Web/Xml/XmlNode.cs
+++ b/src/Libraries/Web/Xml/XmlNode.cs
@@ -1,9 +1,6 @@
 // XmlNode.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System.Runtime.CompilerServices;
diff --git a/src/Libraries/Web/Xml/XmlNodeList.cs b/src/Libraries/Web/Xml/XmlNodeList.cs
index fada64f2a..90082d83d 100644
--- a/src/Libraries/Web/Xml/XmlNodeList.cs
+++ b/src/Libraries/Web/Xml/XmlNodeList.cs
@@ -1,9 +1,6 @@
 // XmlNodeList.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System.Collections;
diff --git a/src/Libraries/Web/Xml/XmlNodeType.cs b/src/Libraries/Web/Xml/XmlNodeType.cs
index caf132132..6e9b9ac42 100644
--- a/src/Libraries/Web/Xml/XmlNodeType.cs
+++ b/src/Libraries/Web/Xml/XmlNodeType.cs
@@ -1,9 +1,6 @@
 // XmlNodeType.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System.Runtime.CompilerServices;
diff --git a/src/Libraries/Web/Xml/XmlText.cs b/src/Libraries/Web/Xml/XmlText.cs
index 18682819b..72c0a7c33 100644
--- a/src/Libraries/Web/Xml/XmlText.cs
+++ b/src/Libraries/Web/Xml/XmlText.cs
@@ -1,9 +1,6 @@
 // XmlText.cs
 // Script#/Libraries/Web
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System.Runtime.CompilerServices;
diff --git a/src/Libraries/Windows/Gadgets/EnvironmentService.cs b/src/Libraries/Windows/Gadgets/EnvironmentService.cs
deleted file mode 100644
index d3ec4f0cb..000000000
--- a/src/Libraries/Windows/Gadgets/EnvironmentService.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// EnvironmentService.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    /// <summary>
-    /// Represents the current machine.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public static class EnvironmentService {
-
-        [IntrinsicProperty]
-        public static string MachineName {
-            get {
-                return null;
-            }
-        }
-
-        public static string GetEnvironmentVariable(string name) {
-            return null;
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/GadgetSettings.cs b/src/Libraries/Windows/Gadgets/GadgetSettings.cs
deleted file mode 100644
index a3cbe1615..000000000
--- a/src/Libraries/Windows/Gadgets/GadgetSettings.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// GadgetSettings.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    /// <summary>
-    /// Allows reading and writing settings for the gadget.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class GadgetSettings {
-
-        private GadgetSettings() {
-        }
-
-        public object Read(string name) {
-            return null;
-        }
-
-        public string ReadString(string name) {
-            return null;
-        }
-
-        public void Write(string name, object value) {
-        }
-
-        public void WriteString(string name, string value) {
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/GadgetSettingsCloseAction.cs b/src/Libraries/Windows/Gadgets/GadgetSettingsCloseAction.cs
deleted file mode 100644
index 1cf4ecf45..000000000
--- a/src/Libraries/Windows/Gadgets/GadgetSettingsCloseAction.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// GadgetSettingsCloseAction.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    [IgnoreNamespace]
-    [Imported]
-    public enum GadgetSettingsCloseAction {
-
-        Commit = 0,
-
-        Cancel = 1
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/GadgetSettingsDialogAction.cs b/src/Libraries/Windows/Gadgets/GadgetSettingsDialogAction.cs
deleted file mode 100644
index 2b68d9c2e..000000000
--- a/src/Libraries/Windows/Gadgets/GadgetSettingsDialogAction.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// GadgetSettingsDialogAction.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class GadgetSettingsDialogAction {
-
-        private GadgetSettingsDialogAction() {
-        }
-
-        [IntrinsicProperty]
-        public GadgetSettingsCloseAction Cancel {
-            get {
-                return GadgetSettingsCloseAction.Cancel;
-            }
-        }
-
-        [IntrinsicProperty]
-        public GadgetSettingsCloseAction Commit {
-            get {
-                return GadgetSettingsCloseAction.Commit;
-            }
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/GadgetSettingsDialogCallback.cs b/src/Libraries/Windows/Gadgets/GadgetSettingsDialogCallback.cs
deleted file mode 100644
index 62016b000..000000000
--- a/src/Libraries/Windows/Gadgets/GadgetSettingsDialogCallback.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-// GadgetSettingsDialogCallback.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    [IgnoreNamespace]
-    [Imported]
-    public delegate void GadgetSettingsDialogCallback(GadgetSettingsEvent e);
-}
diff --git a/src/Libraries/Windows/Gadgets/GadgetSettingsEvent.cs b/src/Libraries/Windows/Gadgets/GadgetSettingsEvent.cs
deleted file mode 100644
index 580595964..000000000
--- a/src/Libraries/Windows/Gadgets/GadgetSettingsEvent.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-// GadgetSettingsEvent.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    /// <summary>
-    /// Allows handling cancelation and closing of the gadget's settings dialog.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class GadgetSettingsEvent {
-
-        private GadgetSettingsEvent() {
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public GadgetSettingsDialogAction Action {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        public bool Cancel {
-            get {
-                return false;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public bool Cancellable {
-            get {
-                return false;
-            }
-        }
-
-        [IntrinsicProperty]
-        public GadgetSettingsCloseAction CloseAction {
-            get {
-                return GadgetSettingsCloseAction.Cancel;
-            }
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/GadgetTransition.cs b/src/Libraries/Windows/Gadgets/GadgetTransition.cs
deleted file mode 100644
index fa08fb24b..000000000
--- a/src/Libraries/Windows/Gadgets/GadgetTransition.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// GadgetTransition.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Html;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    [IgnoreNamespace]
-    [Imported]
-    public enum GadgetTransition {
-
-        None = 0,
-
-        Morph = 1
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/ShellService.cs b/src/Libraries/Windows/Gadgets/ShellService.cs
deleted file mode 100644
index f37f627cf..000000000
--- a/src/Libraries/Windows/Gadgets/ShellService.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-// ShellService.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    [IgnoreNamespace]
-    [Imported]
-    public static class ShellService {
-
-        public static void Execute(string fileName) {
-        }
-
-        public static void Execute(string fileName, string arguments) {
-        }
-
-        public static void Execute(string fileName, string arguments, string startDirectory) {
-        }
-
-        public static void Execute(string fileName, string arguments, string startDirectory, string action) {
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/SideShow.cs b/src/Libraries/Windows/Gadgets/SideShow.cs
deleted file mode 100644
index 2eb8f6dd3..000000000
--- a/src/Libraries/Windows/Gadgets/SideShow.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-// SideShow.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    [IgnoreNamespace]
-    [Imported]
-    public static class SideShow {
-
-        public static Action ApplicationEvent {
-            get {
-                return null;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public static bool Enabled {
-            get {
-                return false;
-            }
-        }
-
-        public static void AddImage(int id, string fileName) {
-        }
-
-        public static void AddText(int id, string text) {
-        }
-
-        public static void Remove(int id) {
-        }
-
-        public static void RemoveAll() {
-        }
-
-        public static void SetFriendlyName(string name) {
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/Sidebar.cs b/src/Libraries/Windows/Gadgets/Sidebar.cs
deleted file mode 100644
index a1f6c1960..000000000
--- a/src/Libraries/Windows/Gadgets/Sidebar.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Sidebar.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    /// <summary>
-    /// Represents the sidebar behavior associated with the gadget.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public static class Sidebar {
-
-        [IntrinsicProperty]
-        public static SidebarDockSide DockSide {
-            get {
-                return SidebarDockSide.Left;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static Action OnDockSideChanged {
-            get {
-                return null;
-            }
-            set {
-            }
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/SidebarBackgroundElement.cs b/src/Libraries/Windows/Gadgets/SidebarBackgroundElement.cs
deleted file mode 100644
index ff0a1d082..000000000
--- a/src/Libraries/Windows/Gadgets/SidebarBackgroundElement.cs
+++ /dev/null
@@ -1,132 +0,0 @@
-// SidebarBackgroundElement.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Html;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class SidebarBackgroundElement : Element {
-
-        private SidebarBackgroundElement() {
-        }
-
-        [IntrinsicProperty]
-        public new int Blur {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Brightness {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Height {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Left {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Opacity {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Rotation {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int SoftEdge {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public string Src {
-            get {
-                return null;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Top {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Width {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        public void AddGlow(string color, int radius, int alpha) {
-        }
-
-        public SidebarImageElement AddImageObject(string source, int xOffset, int yOffset) {
-            return null;
-        }
-
-        public void AddShadow(string color, int radius, int alpha, int xOffset, int yOffset) {
-        }
-
-        public SidebarTextElement AddTextObject(string text, string font, int fontSize, string color, int xOffset, int yOffset) {
-            return null;
-        }
-
-        public void Move(int x, int y) {
-        }
-
-        public void RemoveObjects() {
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/SidebarDockSide.cs b/src/Libraries/Windows/Gadgets/SidebarDockSide.cs
deleted file mode 100644
index 1632d34d9..000000000
--- a/src/Libraries/Windows/Gadgets/SidebarDockSide.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-// SidebarDockSide.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    /// <summary>
-    /// Represents side of the screen where the sidebar is docked.
-    /// </summary>
-    [IgnoreNamespace]
-    [NamedValues]
-    [Imported]
-    public enum SidebarDockSide {
-
-        Left = 0,
-
-        Right = 1
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/SidebarImageElement.cs b/src/Libraries/Windows/Gadgets/SidebarImageElement.cs
deleted file mode 100644
index a91989642..000000000
--- a/src/Libraries/Windows/Gadgets/SidebarImageElement.cs
+++ /dev/null
@@ -1,118 +0,0 @@
-// SidebarImageElement.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Html;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class SidebarImageElement : Element {
-
-        private SidebarImageElement() {
-        }
-
-        [IntrinsicProperty]
-        public new int Blur {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Brightness {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Height {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Left {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Opacity {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Rotation {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int SoftEdge {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public string Src {
-            get {
-                return null;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Top {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Width {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        public void AddGlow(string color, int radius, int alpha) {
-        }
-
-        public void AddShadow(string color, int radius, int alpha, int xOffset, int yOffset) {
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/SidebarTextAlignment.cs b/src/Libraries/Windows/Gadgets/SidebarTextAlignment.cs
deleted file mode 100644
index f5a3413e1..000000000
--- a/src/Libraries/Windows/Gadgets/SidebarTextAlignment.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-// SidebarTextAlignment.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    [IgnoreNamespace]
-    [Imported]
-    public enum SidebarTextAlignment {
-
-        Left = 1,
-
-        Center = 2,
-
-        Right = 3
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/SidebarTextElement.cs b/src/Libraries/Windows/Gadgets/SidebarTextElement.cs
deleted file mode 100644
index 42679a824..000000000
--- a/src/Libraries/Windows/Gadgets/SidebarTextElement.cs
+++ /dev/null
@@ -1,163 +0,0 @@
-// SidebarTextElement.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Html;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class SidebarTextElement : Element {
-
-        private SidebarTextElement() {
-        }
-
-        [IntrinsicProperty]
-        public SidebarTextAlignment Align {
-            get {
-                return SidebarTextAlignment.Left;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public new int Blur {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Brightness {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public string Color {
-            get {
-                return null;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public string Font {
-            get {
-                return null;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int FontSize {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Height {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Left {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Opacity {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Rotation {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int SoftEdge {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public string Src {
-            get {
-                return null;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Top {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public string Value {
-            get {
-                return null;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        public int Width {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        public void AddGlow(string color, int radius, int alpha) {
-        }
-
-        public void AddShadow(string color, int radius, int alpha, int xOffset, int yOffset) {
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/SidebarTimeZoneCollection.cs b/src/Libraries/Windows/Gadgets/SidebarTimeZoneCollection.cs
deleted file mode 100644
index 8432ecbb7..000000000
--- a/src/Libraries/Windows/Gadgets/SidebarTimeZoneCollection.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-// SidebarTimeZoneCollection.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class SidebarTimeZoneCollection {
-
-        private SidebarTimeZoneCollection() {
-        }
-
-        [IntrinsicProperty]
-        public int Count {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        public SidebarTimeZone this[int index] {
-            get {
-                return null;
-            }
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/SoundService.cs b/src/Libraries/Windows/Gadgets/SoundService.cs
deleted file mode 100644
index 962f5c25b..000000000
--- a/src/Libraries/Windows/Gadgets/SoundService.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// SoundService.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    /// <summary>
-    /// A service that enables playing sounds.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public static class SoundService {
-
-        public static void Beep() {
-        }
-
-        public static void PlaySound(string soundFile) {
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Gadgets/TimeService.cs b/src/Libraries/Windows/Gadgets/TimeService.cs
deleted file mode 100644
index c4e2310e6..000000000
--- a/src/Libraries/Windows/Gadgets/TimeService.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-// TimeService.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Gadgets {
-
-    /// <summary>
-    /// A service that enables retrieving time and time zone information.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public static class TimeService {
-
-        [IntrinsicProperty]
-        public static SidebarTimeZone[] TimeZones {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static SidebarTimeZone CurrentTimeZone {
-            get {
-                return null;
-            }
-        }
-
-        public static DateTime GetLocalTime(SidebarTimeZone timeZone) {
-            return default(DateTime);
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Html/Applications/ApplicationBorder.cs b/src/Libraries/Windows/Html/Applications/ApplicationBorder.cs
deleted file mode 100644
index 57dd6ddb1..000000000
--- a/src/Libraries/Windows/Html/Applications/ApplicationBorder.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-// ApplicationBorder.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Html.Applications {
-
-    [IgnoreNamespace]
-    [NamedValues]
-    [Imported]
-    public enum ApplicationBorder {
-
-        Thick = 0,
-
-        Dialog = 1,
-
-        None = 2,
-
-        Thin = 3
-    }
-}
diff --git a/src/Libraries/Windows/Html/Applications/ApplicationBorderStyle.cs b/src/Libraries/Windows/Html/Applications/ApplicationBorderStyle.cs
deleted file mode 100644
index 2d34a90df..000000000
--- a/src/Libraries/Windows/Html/Applications/ApplicationBorderStyle.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// ApplicationBorderStyle.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Html.Applications {
-
-    [IgnoreNamespace]
-    [NamedValues]
-    [Imported]
-    public enum ApplicationBorderStyle {
-
-        Normal = 0,
-
-        Complex = 1,
-
-        Raised = 2,
-
-        Static = 3,
-
-        Sunken = 4
-    }
-}
diff --git a/src/Libraries/Windows/Html/Applications/ApplicationFrame.cs b/src/Libraries/Windows/Html/Applications/ApplicationFrame.cs
deleted file mode 100644
index 782a509a0..000000000
--- a/src/Libraries/Windows/Html/Applications/ApplicationFrame.cs
+++ /dev/null
@@ -1,152 +0,0 @@
-// ApplicationFrame.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Html;
-using System.Runtime.CompilerServices;
-
-namespace System.Html.Applications {
-
-    [IgnoreNamespace]
-    [Imported]
-    public static class ApplicationFrame {
-
-        [IntrinsicProperty]
-        public static string ApplicationName {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static ApplicationBorder Border {
-            get {
-                return ApplicationBorder.Thick;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static ApplicationBorderStyle BorderStyle {
-            get {
-                return ApplicationBorderStyle.Normal;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static YesNoState Caption {
-            get {
-                return YesNoState.Yes;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static string CommandLine {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static YesNoState ContextMenu {
-            get {
-                return YesNoState.Yes;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static string Icon {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static YesNoState InnerBorder {
-            get {
-                return YesNoState.Yes;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static YesNoState MaximizeButton {
-            get {
-                return YesNoState.Yes;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static YesNoState MinimizeButton {
-            get {
-                return YesNoState.Yes;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static YesNoState Navigable {
-            get {
-                return YesNoState.Yes;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static YesNoState Scroll {
-            get {
-                return YesNoState.Yes;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static YesNoState ScrollFlat {
-            get {
-                return YesNoState.Yes;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static YesNoState Selection {
-            get {
-                return YesNoState.Yes;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static YesNoState ShowInTaskBar {
-            get {
-                return YesNoState.Yes;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static YesNoState SingleInstance {
-            get {
-                return YesNoState.Yes;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static YesNoState SysMenu {
-            get {
-                return YesNoState.Yes;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static string Version {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        public static ApplicationWindowState WindowState {
-            get {
-                return ApplicationWindowState.Normal;
-            }
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Html/Applications/ApplicationWindowState.cs b/src/Libraries/Windows/Html/Applications/ApplicationWindowState.cs
deleted file mode 100644
index bdf52b110..000000000
--- a/src/Libraries/Windows/Html/Applications/ApplicationWindowState.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// ApplicationWindowState.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Html.Applications {
-
-    [IgnoreNamespace]
-    [NamedValues]
-    [Imported]
-    public enum ApplicationWindowState {
-
-        Normal = 0,
-
-        Maximize = 1,
-
-        Minimize = 2
-    }
-}
diff --git a/src/Libraries/Windows/Html/Applications/YesNoState.cs b/src/Libraries/Windows/Html/Applications/YesNoState.cs
deleted file mode 100644
index 7eda4fa06..000000000
--- a/src/Libraries/Windows/Html/Applications/YesNoState.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// YesNoState.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Html.Applications {
-
-    [IgnoreNamespace]
-    [NamedValues]
-    [Imported]
-    public enum YesNoState {
-
-        [ScriptName("yes")]
-        Yes = 0,
-
-        [ScriptName("no")]
-        No = 1
-    }
-}
diff --git a/src/Libraries/Windows/Properties/AssemblyInfo.cs b/src/Libraries/Windows/Properties/AssemblyInfo.cs
deleted file mode 100644
index 592b0e04f..000000000
--- a/src/Libraries/Windows/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// AssemblyInfo.cs
-// Script#/Runtime/Windows
-//
-
-using System;
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-[assembly: AssemblyTitle("Script.Windows")]
-[assembly: AssemblyDescription("Script# Windows Application APIs")]
-[assembly: ScriptAssembly("Windows")]
diff --git a/src/Libraries/Windows/Properties/Feeds.js b/src/Libraries/Windows/Properties/Feeds.js
deleted file mode 100644
index 32e10f31e..000000000
--- a/src/Libraries/Windows/Properties/Feeds.js
+++ /dev/null
@@ -1,8 +0,0 @@
-function FeedsManager() {
-    try {
-        return new ActiveXObject('Microsoft.FeedsManager');
-    }
-    catch (ex) {
-    }
-    return null;
-}
diff --git a/src/Libraries/Windows/Properties/FileSystem.js b/src/Libraries/Windows/Properties/FileSystem.js
deleted file mode 100644
index c249a2b57..000000000
--- a/src/Libraries/Windows/Properties/FileSystem.js
+++ /dev/null
@@ -1,8 +0,0 @@
-function FileSystemObject() {
-    try {
-        return new ActiveXObject('Scripting.FileSystemObject');
-    }
-    catch (ex) {
-    }
-    return null;
-}
diff --git a/src/Libraries/Windows/Properties/Gadgets.js b/src/Libraries/Windows/Properties/Gadgets.js
deleted file mode 100644
index b5b25bf71..000000000
--- a/src/Libraries/Windows/Properties/Gadgets.js
+++ /dev/null
@@ -1,26 +0,0 @@
-if (System && System.Gadget) {
-    // Running in the context of a Sidebar gadget.
-
-    window.Gadget = System.Gadget;
-    window.Sidebar = System.Gadget.Sidebar;
-    window.SideShow = System.Gadget.SideShow;
-    window.EnvironmentService = System.Environment;
-    window.TimeService = System.Time;
-    window.SoundService = System.Sound;
-    window.ShellService = System.Shell;
-
-    ss.Debug.assert = function Gadgets$Debug$assert(condition, message) {
-        if (!condition) {
-            message = message + '\r\n\r\nBreak into debugger?';
-
-            var shell = new Shell();
-            if (shell.Popup(message, 0, 'Assert Failed', 20) == 6) {
-                ss.Debug._fail(message);
-            }
-        }
-    };
-
-    ss.Debug.writeLine = function Gadgets$Debug$writeLine(message) {
-        System.Debug.outputString(message + '\r\n');
-    }
-}
diff --git a/src/Libraries/Windows/Properties/Shell.js b/src/Libraries/Windows/Properties/Shell.js
deleted file mode 100644
index 1ecced599..000000000
--- a/src/Libraries/Windows/Properties/Shell.js
+++ /dev/null
@@ -1,8 +0,0 @@
-function Shell() {
-    try {
-        return new ActiveXObject('WScript.Shell');
-    }
-    catch (ex) {
-    }
-    return null;
-}
diff --git a/src/Libraries/Windows/Properties/Windows.jsa b/src/Libraries/Windows/Properties/Windows.jsa
deleted file mode 100644
index fe0873093..000000000
--- a/src/Libraries/Windows/Properties/Windows.jsa
+++ /dev/null
@@ -1,10 +0,0 @@
-//! Script# Windows Scripting APIs
-//!
-
-#include "Shell.js"
-
-#include "FileSystem.js"
-
-#include "Feeds.js"
-
-#include "Gadgets.js"
diff --git a/src/Libraries/Windows/Windows.csproj b/src/Libraries/Windows/Windows.csproj
deleted file mode 100644
index 5328c0639..000000000
--- a/src/Libraries/Windows/Windows.csproj
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A102330A-3018-4968-AF4C-6175DC48EAAB}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>System</RootNamespace>
-    <AssemblyName>Script.Windows</AssemblyName>
-    <NoStdLib>True</NoStdLib>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\Libraries.snk</AssemblyOriginatorKeyFile>
-    <DelaySign>false</DelaySign>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>false</DebugSymbols>
-    <DebugType>none</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\..\..\bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\..\bin\Debug\Script.Windows.xml</DocumentationFile>
-    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\..\..\bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\..\bin\Release\Script.Windows.xml</DocumentationFile>
-    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib">
-      <HintPath>..\..\..\bin\ref\mscorlib.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Windows\Feeds\BackgroundSyncAction.cs" />
-    <Compile Include="Windows\Feeds\BackgroundSyncStatus.cs" />
-    <Compile Include="Windows\Feeds\DownloadError.cs" />
-    <Compile Include="Windows\Feeds\DownloadStatus.cs" />
-    <Compile Include="Windows\Feeds\Feed.cs" />
-    <Compile Include="Windows\Feeds\FeedCollection.cs" />
-    <Compile Include="Windows\Feeds\FeedEnclosure.cs" />
-    <Compile Include="Windows\Feeds\FeedFilterFlags.cs" />
-    <Compile Include="Windows\Feeds\FeedFolder.cs" />
-    <Compile Include="Windows\Feeds\FeedFolderCollection.cs" />
-    <Compile Include="Windows\Feeds\FeedItem.cs" />
-    <Compile Include="Windows\Feeds\FeedItemCollection.cs" />
-    <Compile Include="Windows\Feeds\FeedsManager.cs" />
-    <Compile Include="Windows\Feeds\FeedSortOrder.cs" />
-    <Compile Include="Windows\Feeds\FeedSortProperty.cs" />
-    <Compile Include="Windows\Feeds\FeedSyncSetting.cs" />
-    <Compile Include="Windows\Feeds\FeedXmlIncludeFlags.cs" />
-    <Compile Include="Windows\FileSystem\Drive.cs" />
-    <Compile Include="Windows\FileSystem\DriveCollection.cs" />
-    <Compile Include="Windows\FileSystem\DriveType.cs" />
-    <Compile Include="Windows\FileSystem\File.cs" />
-    <Compile Include="Windows\FileSystem\FileAttributes.cs" />
-    <Compile Include="Windows\FileSystem\FileCollection.cs" />
-    <Compile Include="Windows\FileSystem\FileFormat.cs" />
-    <Compile Include="Windows\FileSystem\FileMode.cs" />
-    <Compile Include="Windows\FileSystem\FileSystemObject.cs" />
-    <Compile Include="Windows\FileSystem\Folder.cs" />
-    <Compile Include="Windows\FileSystem\FolderCollection.cs" />
-    <Compile Include="Windows\FileSystem\TextStream.cs" />
-    <Compile Include="Gadgets\EnvironmentService.cs" />
-    <Compile Include="Gadgets\Gadget.cs" />
-    <Compile Include="Gadgets\GadgetFlyout.cs" />
-    <Compile Include="Gadgets\GadgetSettings.cs" />
-    <Compile Include="Gadgets\GadgetSettingsCloseAction.cs" />
-    <Compile Include="Gadgets\GadgetSettingsDialogAction.cs" />
-    <Compile Include="Gadgets\GadgetSettingsDialogCallback.cs" />
-    <Compile Include="Gadgets\GadgetSettingsEvent.cs" />
-    <Compile Include="Gadgets\GadgetTransition.cs" />
-    <Compile Include="Gadgets\ShellService.cs" />
-    <Compile Include="Gadgets\Sidebar.cs" />
-    <Compile Include="Gadgets\SidebarBackgroundElement.cs" />
-    <Compile Include="Gadgets\SidebarDockSide.cs" />
-    <Compile Include="Gadgets\SidebarImageElement.cs" />
-    <Compile Include="Gadgets\SidebarTextAlignment.cs" />
-    <Compile Include="Gadgets\SidebarTextElement.cs" />
-    <Compile Include="Gadgets\SidebarTimeZone.cs" />
-    <Compile Include="Gadgets\SidebarTimeZoneCollection.cs" />
-    <Compile Include="Gadgets\SideShow.cs" />
-    <Compile Include="Gadgets\SoundService.cs" />
-    <Compile Include="Gadgets\TimeService.cs" />
-    <Compile Include="Html\Applications\ApplicationBorder.cs" />
-    <Compile Include="Html\Applications\ApplicationBorderStyle.cs" />
-    <Compile Include="Html\Applications\ApplicationFrame.cs" />
-    <Compile Include="Html\Applications\ApplicationWindowState.cs" />
-    <Compile Include="Html\Applications\YesNoState.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\Common\CommonAssemblyInfo.cs">
-      <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Web\Web.csproj">
-      <Project>{3681A9A8-FC40-4125-B842-7775713C8DCE}</Project>
-      <Name>Web</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Properties\Feeds.js" />
-    <Content Include="Properties\FileSystem.js" />
-    <Content Include="Properties\Gadgets.js" />
-    <Content Include="Properties\Shell.js" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Properties\Windows.jsa" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>
-      ..\ref\sspp.exe /nologo /debug /d:DEBUG /crlf /input:$(ProjectDir)Properties\Windows.jsa /output:Script.Windows.debug.js
-      ..\ref\sspp.exe /nologo /input:$(ProjectDir)Properties\Windows.jsa /output:Script.Windows.js
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/src/Libraries/Windows/Windows/Feeds/BackgroundSyncAction.cs b/src/Libraries/Windows/Windows/Feeds/BackgroundSyncAction.cs
deleted file mode 100644
index ac6db58de..000000000
--- a/src/Libraries/Windows/Windows/Feeds/BackgroundSyncAction.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// BackgroundSyncAction.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    [NumericValues]
-    public enum BackgroundSyncAction {
-
-        Disable = 0,
-
-        Enable = 1,
-
-        RunNow = 2
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/BackgroundSyncStatus.cs b/src/Libraries/Windows/Windows/Feeds/BackgroundSyncStatus.cs
deleted file mode 100644
index c61ec5857..000000000
--- a/src/Libraries/Windows/Windows/Feeds/BackgroundSyncStatus.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// BackgroundSyncStatus.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    [NumericValues]
-    public enum BackgroundSyncStatus {
-
-        Disabled = 0,
-
-        Enabled = 1
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/DownloadError.cs b/src/Libraries/Windows/Windows/Feeds/DownloadError.cs
deleted file mode 100644
index 595d6650b..000000000
--- a/src/Libraries/Windows/Windows/Feeds/DownloadError.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// DownloadError.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    [NumericValues]
-    public enum DownloadError {
-
-        None = 0,
-
-        Failed = 1,
-
-        InvalidFeedFormat = 2,
-
-        NormalizationFailed = 3,
-
-        PersistenceFailed = 4,
-
-        DownloadBlocked = 5,
-
-        Canceled = 6,
-
-        UnsupportedAuthentication = 7,
-
-        BackgroundDownloadDisabled = 8,
-
-        NotExist = 9,
-
-        UnsupportedMSXML = 10,
-
-        UnsupportedDTD = 11,
-
-        SizeLimitExceeded = 12
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/DownloadStatus.cs b/src/Libraries/Windows/Windows/Feeds/DownloadStatus.cs
deleted file mode 100644
index 16395ac04..000000000
--- a/src/Libraries/Windows/Windows/Feeds/DownloadStatus.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-// DownloadStatus.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    [NumericValues]
-    public enum DownloadStatus {
-
-        None = 0,
-
-        Pending = 1,
-
-        Downloading = 2,
-
-        Downloaded = 3,
-
-        Failed = 4
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/Feed.cs b/src/Libraries/Windows/Windows/Feeds/Feed.cs
deleted file mode 100644
index 04f99bb24..000000000
--- a/src/Libraries/Windows/Windows/Feeds/Feed.cs
+++ /dev/null
@@ -1,293 +0,0 @@
-// Feed.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class Feed {
-
-        private Feed() {
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Copyright {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Description {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public bool DownloadEnclosuresAutomatically {
-            get {
-                return false;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public DownloadStatus DownloadStatus {
-            get {
-                return DownloadStatus.None;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string DownloadUrl {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Image {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int Interval {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public bool IsList {
-            get {
-                return false;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int ItemCount {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public FeedItemCollection Items {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Language {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int LastBuildDate {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int LastDownloadError {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int LastDownloadTime {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int LastWriteTime {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Link {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string LocalEnclosurePath {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string LocalId {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int MaxItemCount {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Name {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public FeedFolder Parent {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Path {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int PubDate {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public FeedSyncSetting SyncSetting {
-            get {
-                return FeedSyncSetting.Default;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Title {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int Ttl {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int UnreadItemCount {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Url {
-            get {
-                return null;
-            }
-            set {
-            }
-        }
-
-        [PreserveCase]
-        public void AsyncDownload() {
-        }
-
-        [PreserveCase]
-        public void CancelAsyncDownload() {
-        }
-
-        [PreserveCase]
-        public void Delete() {
-        }
-
-        [PreserveCase]
-        public void Download() {
-        }
-
-        [PreserveCase]
-        public FeedItem GetItem(int localID) {
-            return null;
-        }
-
-        [PreserveCase]
-        public void MarkAllItemsRead() {
-        }
-
-        [PreserveCase]
-        public void Merge(string xml, string feedURL) {
-        }
-
-        [PreserveCase]
-        public void Move(string path) {
-        }
-
-        [PreserveCase]
-        public string Xml(int count, FeedSortProperty sortProperty, FeedSortOrder sortOrder, FeedFilterFlags filterFlags, FeedXmlIncludeFlags includeFlags) {
-            return null;
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/FeedCollection.cs b/src/Libraries/Windows/Windows/Feeds/FeedCollection.cs
deleted file mode 100644
index 7c8bc43bf..000000000
--- a/src/Libraries/Windows/Windows/Feeds/FeedCollection.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// FeedCollection.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class FeedCollection {
-
-        private FeedCollection() {
-        }
-
-        [IntrinsicProperty]
-        public int Count {
-            get {
-                return 0;
-            }
-        }
-
-        public Feed Item(int index) {
-            return null;
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/FeedEnclosure.cs b/src/Libraries/Windows/Windows/Feeds/FeedEnclosure.cs
deleted file mode 100644
index e51cba3ab..000000000
--- a/src/Libraries/Windows/Windows/Feeds/FeedEnclosure.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// FeedEnclosure.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class FeedEnclosure {
-
-        private FeedEnclosure() {
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string DownloadMimeType {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public DownloadStatus DownloadStatus {
-            get {
-                return DownloadStatus.None;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string DownloadUrl {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public DownloadError LastDownloadError {
-            get {
-                return DownloadError.None;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int Length {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string LocalPath {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public FeedItem Parent {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Type {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Url {
-            get {
-                return null;
-            }
-        }
-
-        [PreserveCase]
-        public void AsyncDownload() {
-        }
-
-        [PreserveCase]
-        public void CancelAsyncDownload() {
-        }
-
-        [PreserveCase]
-        public void RemoveFile() {
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/FeedFilterFlags.cs b/src/Libraries/Windows/Windows/Feeds/FeedFilterFlags.cs
deleted file mode 100644
index 612dfc3c0..000000000
--- a/src/Libraries/Windows/Windows/Feeds/FeedFilterFlags.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// FeedFilterFlags.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    [NumericValues]
-    public enum FeedFilterFlags {
-
-        All = 0,
-
-        Unread = 1,
-
-        Read = 2
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/FeedFolder.cs b/src/Libraries/Windows/Windows/Feeds/FeedFolder.cs
deleted file mode 100644
index dca9d6101..000000000
--- a/src/Libraries/Windows/Windows/Feeds/FeedFolder.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-// FeedFolder.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class FeedFolder {
-
-        private FeedFolder() {
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public FeedCollection Feeds {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public bool IsRoot {
-            get {
-                return false;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Name {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public FeedFolder Parent {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Path {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public FeedFolderCollection Subfolders {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int TotalItemCount {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int TotalUnreadItemCount {
-            get {
-                return 0;
-            }
-        }
-
-        [PreserveCase]
-        public Feed CreateFeed(string feedName, string feedUrl) {
-            return null;
-        }
-
-        [PreserveCase]
-        public FeedFolder CreateSubfolder(string name) {
-            return null;
-        }
-
-        [PreserveCase]
-        public void Delete() {
-        }
-
-        [PreserveCase]
-        public bool ExistsFeed(string name) {
-            return false;
-        }
-
-        [PreserveCase]
-        public bool ExistsSubfolder(string name) {
-            return false;
-        }
-
-        [PreserveCase]
-        public void Move(string newParentPath) {
-        }
-
-        [PreserveCase]
-        public void Rename(string name) {
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/FeedFolderCollection.cs b/src/Libraries/Windows/Windows/Feeds/FeedFolderCollection.cs
deleted file mode 100644
index b04f2d6d1..000000000
--- a/src/Libraries/Windows/Windows/Feeds/FeedFolderCollection.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// FeedFolderCollection.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class FeedFolderCollection {
-
-        private FeedFolderCollection() {
-        }
-
-        [IntrinsicProperty]
-        public int Count {
-            get {
-                return 0;
-            }
-        }
-
-        public FeedFolder Item(int index) {
-            return null;
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/FeedItem.cs b/src/Libraries/Windows/Windows/Feeds/FeedItem.cs
deleted file mode 100644
index cbdd824f5..000000000
--- a/src/Libraries/Windows/Windows/Feeds/FeedItem.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-// FeedItem.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class FeedItem {
-
-        private FeedItem() {
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Author {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Comments {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Description {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public FeedEnclosure Enclosure {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Guid {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public bool IsRead {
-            get {
-                return false;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int LastDownloadTime {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Link {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int LocalId {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int Modified {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public Feed Parent {
-            get {
-                return null;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int PubDate {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Title {
-            get {
-                return null;
-            }
-        }
-
-        [PreserveCase]
-        public void Delete() {
-        }
-
-        [PreserveCase]
-        public string Xml(FeedXmlIncludeFlags flags) {
-            return null;
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/FeedItemCollection.cs b/src/Libraries/Windows/Windows/Feeds/FeedItemCollection.cs
deleted file mode 100644
index 72849f25b..000000000
--- a/src/Libraries/Windows/Windows/Feeds/FeedItemCollection.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-// FeedItemCollection.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class FeedItemCollection {
-
-        private FeedItemCollection() {
-        }
-
-        [IntrinsicProperty]
-        public int Count {
-            get {
-                return 0;
-            }
-        }
-
-        public FeedItem Item(int index) {
-            return null;
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/FeedSortOrder.cs b/src/Libraries/Windows/Windows/Feeds/FeedSortOrder.cs
deleted file mode 100644
index 7e5fe53e5..000000000
--- a/src/Libraries/Windows/Windows/Feeds/FeedSortOrder.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// FeedSortOrder.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    [NumericValues]
-    public enum FeedSortOrder {
-
-        None = 0,
-
-        Ascending = 1,
-
-        Descending = 2
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/FeedSortProperty.cs b/src/Libraries/Windows/Windows/Feeds/FeedSortProperty.cs
deleted file mode 100644
index 9a4e48ba8..000000000
--- a/src/Libraries/Windows/Windows/Feeds/FeedSortProperty.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// FeedSortProperty.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    [NumericValues]
-    public enum FeedSortProperty {
-
-        None = 0,
-
-        PubDate = 1,
-
-        DownloadTime = 2
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/FeedSyncSetting.cs b/src/Libraries/Windows/Windows/Feeds/FeedSyncSetting.cs
deleted file mode 100644
index badb705fa..000000000
--- a/src/Libraries/Windows/Windows/Feeds/FeedSyncSetting.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-// FeedSyncSetting.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    [NumericValues]
-    public enum FeedSyncSetting {
-
-        Default = 0,
-
-        Interval = 1,
-
-        Manual = 2
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/FeedXmlIncludeFlags.cs b/src/Libraries/Windows/Windows/Feeds/FeedXmlIncludeFlags.cs
deleted file mode 100644
index 440f75858..000000000
--- a/src/Libraries/Windows/Windows/Feeds/FeedXmlIncludeFlags.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-// FeedXmlIncludeFlags.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    [NumericValues]
-    public enum FeedXmlIncludeFlags {
-
-        None = 0,
-
-        CFExtensions = 1
-    }
-}
diff --git a/src/Libraries/Windows/Windows/Feeds/FeedsManager.cs b/src/Libraries/Windows/Windows/Feeds/FeedsManager.cs
deleted file mode 100644
index dcb13748a..000000000
--- a/src/Libraries/Windows/Windows/Feeds/FeedsManager.cs
+++ /dev/null
@@ -1,103 +0,0 @@
-// FeedsManager.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.Feeds {
-
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class FeedsManager {
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public BackgroundSyncStatus BackgroundSyncStatus {
-            get {
-                return BackgroundSyncStatus.Enabled;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int DefaultInterval {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int ItemCountLimit {
-            get {
-                return 0;
-            }
-        }
-
-        [IntrinsicProperty]
-        [PreserveCase]
-        public FeedFolder RootFolder {
-            get {
-                return null;
-            }
-        }
-
-        [PreserveCase]
-        public void AsyncSyncAll() {
-        }
-
-        [PreserveCase]
-        public void BackgroundSync(BackgroundSyncAction action) {
-        }
-
-        [PreserveCase]
-        public void DeleteFeed(string feedPath) {
-        }
-
-        [PreserveCase]
-        public void DeleteFolder(string folderPath) {
-        }
-
-        [PreserveCase]
-        public bool ExistsFeed(string name) {
-            return false;
-        }
-
-        [PreserveCase]
-        public bool ExistsFolder(string name) {
-            return false;
-        }
-
-        [PreserveCase]
-        public Feed GetFeed(string feedPath) {
-            return null;
-        }
-
-        [PreserveCase]
-        public Feed GetFeedByUrl(string feedUrl) {
-            return null;
-        }
-
-        [PreserveCase]
-        public FeedFolder GetFolder(string folderPath) {
-            return null;
-        }
-
-        [PreserveCase]
-        public bool IsSubscribed(string feedUrl) {
-            return false;
-        }
-
-        [PreserveCase]
-        public string Normalize(string feedXml) {
-            return null;
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/FileSystem/Drive.cs b/src/Libraries/Windows/Windows/FileSystem/Drive.cs
deleted file mode 100644
index d8b03400f..000000000
--- a/src/Libraries/Windows/Windows/FileSystem/Drive.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// Drive.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.FileSystem {
-
-    /// <summary>
-    /// Provides access to properties of a drive or network share.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class Drive {
-
-        private Drive() {
-        }
-
-        /// <summary>
-        /// Gets the amount of space available to a user on the this drive.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int AvailableSpace {
-            get {
-                return 0;
-            }
-        }
-
-        /// <summary>
-        /// Gets the drive letter associated with this drive.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string DriveLetter {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets the drive type associated with this drive.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public DriveType DriveType {
-            get {
-                return DriveType.Unknown;
-            }
-        }
-
-        /// <summary>
-        /// Gets the file system type associated with this drive.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string FileSystem {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Whether or not the drive is ready to be accessed.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public bool IsReady {
-            get {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// Gets the path associated with the drive.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Path {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets the top-level folder associated with the drive.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public Folder RootFolder {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets the serial number associated with the drive.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string SerialNumber {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets the share name associated with the drive representing a network share.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string ShareName {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets the amount of space in bytes on this drive.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int TotalSize {
-            get {
-                return 0;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the volume label associated with the drive.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string VolumeName {
-            get {
-                return null;
-            }
-            set {
-            }
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/FileSystem/DriveCollection.cs b/src/Libraries/Windows/Windows/FileSystem/DriveCollection.cs
deleted file mode 100644
index ae1946265..000000000
--- a/src/Libraries/Windows/Windows/FileSystem/DriveCollection.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// DriveCollection.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.FileSystem {
-
-    /// <summary>
-    /// Represents a set of drives.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class DriveCollection {
-
-        private DriveCollection() {
-        }
-
-        /// <summary>
-        /// Gets the number of drives in the collection.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int Count {
-            get {
-                return 0;
-            }
-        }
-
-        /// <summary>
-        /// Gets the specified drive.
-        /// </summary>
-        [IntrinsicProperty]
-        public Drive this[int index] {
-            get {
-                return null;
-            }
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/FileSystem/DriveType.cs b/src/Libraries/Windows/Windows/FileSystem/DriveType.cs
deleted file mode 100644
index 7cc9cb045..000000000
--- a/src/Libraries/Windows/Windows/FileSystem/DriveType.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// DriveType.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.FileSystem {
-
-    // [NumericValues]
-    /// <summary>
-    /// Represents the mode in which a text file is opened.
-    /// </summary>
-    [Imported]
-    public enum DriveType {
-
-        /// <summary>
-        /// Unknown drive type
-        /// </summary>
-        Unknown = 0,
-
-        /// <summary>
-        /// Removable drive
-        /// </summary>
-        Removable = 1,
-
-        /// <summary>
-        /// Fixed drive
-        /// </summary>
-        Fixed = 2,
-
-        /// <summary>
-        /// Network share
-        /// </summary>
-        Network = 3,
-
-        /// <summary>
-        /// CD-ROM drive
-        /// </summary>
-        CDROM = 4,
-
-        /// <summary>
-        /// RAM disk
-        /// </summary>
-        RAMDisk = 5
-    }
-}
diff --git a/src/Libraries/Windows/Windows/FileSystem/File.cs b/src/Libraries/Windows/Windows/FileSystem/File.cs
deleted file mode 100644
index 931906c8e..000000000
--- a/src/Libraries/Windows/Windows/FileSystem/File.cs
+++ /dev/null
@@ -1,208 +0,0 @@
-// File.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.FileSystem {
-
-    /// <summary>
-    /// Provides access to properties and operations on a file.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class File {
-
-        private File() {
-        }
-
-        /// <summary>
-        /// Gets or sets the attributes associated with the file.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public FileAttributes Attributes {
-            get {
-                return FileAttributes.Normal;
-            }
-            set {
-            }
-        }
-
-        /// <summary>
-        /// Gets the date and time the file was created.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public DateTime DateCreated {
-            get {
-                return DateTime.Now;
-            }
-        }
-
-        /// <summary>
-        /// Gets the date and time the file was last accessed.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public DateTime DateLastAccessed {
-            get {
-                return DateTime.Now;
-            }
-        }
-
-        /// <summary>
-        /// Gets the date and time the file was last modified.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public DateTime DateLastModified {
-            get {
-                return DateTime.Now;
-            }
-        }
-
-        /// <summary>
-        /// The drive letter associated with this file.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Drive {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the name associated with this file.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Name {
-            get {
-                return null;
-            }
-            set {
-            }
-        }
-
-        /// <summary>
-        /// Gets the folder containing this file.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public Folder ParentFolder {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets the path of this file.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Path {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets the size of the file in bytes.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int Size {
-            get {
-                return 0;
-            }
-        }
-
-        /// <summary>
-        /// Gets the type of the file based on its extension.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Type {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Copies the file to the specified destination.
-        /// </summary>
-        /// <param name="destination">The destination path.</param>
-        [PreserveCase]
-        public void Copy(string destination) {
-        }
-
-        /// <summary>
-        /// Copies the file to the specified destination.
-        /// </summary>
-        /// <param name="destination">The destination path.</param>
-        /// <param name="overwrite">Whether any existing files should be overwritten or not.</param>
-        [PreserveCase]
-        public void Copy(string destination, bool overwrite) {
-        }
-
-        /// <summary>
-        /// Deletes the file.
-        /// </summary>
-        [PreserveCase]
-        public void Delete() {
-        }
-
-        /// <summary>
-        /// Deletes the file.
-        /// </summary>
-        /// <param name="force">True if the file should be deleted even if it is read-only.</param>
-        [PreserveCase]
-        public void Delete(bool force) {
-        }
-
-        /// <summary>
-        /// Moves the file to the specified destination.
-        /// </summary>
-        /// <param name="destination">The new location for the file.</param>
-        [PreserveCase]
-        public void Move(string destination) {
-        }
-
-        /// <summary>
-        /// Opens the file for reading and writing as ASCII text.
-        /// </summary>
-        /// <returns>A TextStream to read and write to the file.</returns>
-        [PreserveCase]
-        public TextStream OpenAsTextStream() {
-            return null;
-        }
-
-        /// <summary>
-        /// Opens the file for reading or writing as specified by the mode as ASCII text.
-        /// </summary>
-        /// <param name="mode">The mode to determine whether to open the file for reading or writing.</param>
-        /// <returns>A TextStream to read or write to the file.</returns>
-        [PreserveCase]
-        public TextStream OpenAsTextStream(FileMode mode) {
-            return null;
-        }
-
-        /// <summary>
-        /// Opens the file for reading or writing as specified by the mode as ASCII or Unicode text.
-        /// </summary>
-        /// <param name="mode">The mode to determine whether to open the file for reading or writing.</param>
-        /// <param name="format">The format of the file.</param>
-        /// <returns>A TextStream to read or write to the file.</returns>
-        [PreserveCase]
-        public TextStream OpenAsTextStream(FileMode mode, FileFormat format) {
-            return null;
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/FileSystem/FileAttributes.cs b/src/Libraries/Windows/Windows/FileSystem/FileAttributes.cs
deleted file mode 100644
index 97e5a1424..000000000
--- a/src/Libraries/Windows/Windows/FileSystem/FileAttributes.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// FileAttributes.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.FileSystem {
-
-    // [NumericValues]
-    /// <summary>
-    /// Attributes associated with a file or folder.
-    /// </summary>
-    [Flags]
-    [Imported]
-    public enum FileAttributes {
-
-        /// <summary>
-        /// No attributes are set.
-        /// </summary>
-        Normal = 0,
-
-        /// <summary>
-        /// Read-only file or folder.
-        /// </summary>
-        ReadOnly = 1,
-
-        /// <summary>
-        /// Hidden file or folder.
-        /// </summary>
-        Hidden = 2,
-
-        /// <summary>
-        /// System file or folder.
-        /// </summary>
-        System = 4,
-
-        /// <summary>
-        /// Volume label for disk (read-only)
-        /// </summary>
-        Volume = 8,
-
-        /// <summary>
-        /// Folder (read-only)
-        /// </summary>
-        Directory = 16,
-
-        /// <summary>
-        /// File changed since last backup
-        /// </summary>
-        Archive = 32,
-
-        /// <summary>
-        /// Link or shortcut (read-only)
-        /// </summary>
-        Alias = 1024,
-
-        /// <summary>
-        /// Compressed (read-only)
-        /// </summary>
-        Compressed = 2048
-    }
-}
diff --git a/src/Libraries/Windows/Windows/FileSystem/FileCollection.cs b/src/Libraries/Windows/Windows/FileSystem/FileCollection.cs
deleted file mode 100644
index a29a40d3b..000000000
--- a/src/Libraries/Windows/Windows/FileSystem/FileCollection.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// FileCollection.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.FileSystem {
-
-    /// <summary>
-    /// Represents a set of files.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class FileCollection {
-
-        private FileCollection() {
-        }
-
-        /// <summary>
-        /// Gets the number of files in the collection.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int Count {
-            get {
-                return 0;
-            }
-        }
-
-        /// <summary>
-        /// Gets the specified file.
-        /// </summary>
-        [IntrinsicProperty]
-        public File this[int index] {
-            get {
-                return null;
-            }
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/FileSystem/FileFormat.cs b/src/Libraries/Windows/Windows/FileSystem/FileFormat.cs
deleted file mode 100644
index 0a5e621ac..000000000
--- a/src/Libraries/Windows/Windows/FileSystem/FileFormat.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// FileFormat.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.FileSystem {
-
-    // [NumericValues]
-    /// <summary>
-    /// Represents the format of the file to be opened.
-    /// </summary>
-    [Imported]
-    public enum FileFormat {
-
-        /// <summary>
-        /// Opens the file as ASCII.
-        /// </summary>
-        ASCII = 0,
-
-        /// <summary>
-        /// Opens the file as Unicode.
-        /// </summary>
-        Unicode = -1,
-
-        /// <summary>
-        /// Opens the file using the system default.
-        /// </summary>
-        Default = -2
-    }
-}
diff --git a/src/Libraries/Windows/Windows/FileSystem/FileMode.cs b/src/Libraries/Windows/Windows/FileSystem/FileMode.cs
deleted file mode 100644
index 47341471d..000000000
--- a/src/Libraries/Windows/Windows/FileSystem/FileMode.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// FileMode.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.FileSystem {
-
-    // [NumericValues]
-    /// <summary>
-    /// Represents the mode in which a text file is opened.
-    /// </summary>
-    [Imported]
-    public enum FileMode {
-
-        /// <summary>
-        /// Open a file for reading only.
-        /// </summary>
-        ForReading = 1,
-
-        /// <summary>
-        /// Open a file for writing.
-        /// </summary>
-        ForWriting = 2,
-
-        /// <summary>
-        /// Open a file for writing at the end.
-        /// </summary>
-        ForAppending = 8
-    }
-}
diff --git a/src/Libraries/Windows/Windows/FileSystem/FileSystemObject.cs b/src/Libraries/Windows/Windows/FileSystem/FileSystemObject.cs
deleted file mode 100644
index 4bcde59c0..000000000
--- a/src/Libraries/Windows/Windows/FileSystem/FileSystemObject.cs
+++ /dev/null
@@ -1,356 +0,0 @@
-// FileSystemObject.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.FileSystem {
-
-    /// <summary>
-    /// Provides access to the local file system.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class FileSystemObject {
-
-        /// <summary>
-        /// Gets the drives on this machine.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public DriveCollection Drives {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Appends a name to an existing path to create a new path.
-        /// </summary>
-        /// <param name="path">A path to which name is appended. It can be absolute or relative.</param>
-        /// <param name="name">Name being appended to the existing path.</param>
-        /// <returns></returns>
-        [PreserveCase]
-        public string BuildPath(string path, string name) {
-            return null;
-        }
-
-        /// <summary>
-        /// Copies one or more files from one location to another. Any existing
-        /// files are overwritten.
-        /// </summary>
-        /// <param name="source">File to be copied (can include wildcards).</param>
-        /// <param name="destination">Where the file or files from source are to be copied.</param>
-        [PreserveCase]
-        public void CopyFile(string source, string destination) {
-        }
-
-        /// <summary>
-        /// Copies one or more files from one location to another.
-        /// </summary>
-        /// <param name="source">File to be copied (can include wildcards).</param>
-        /// <param name="destination">Where the file or files from source are to be copied.</param>
-        /// <param name="overwrite">Indicates if existing files are to be overwritten.</param>
-        [PreserveCase]
-        public void CopyFile(string source, string destination, bool overwrite) {
-        }
-
-        /// <summary>
-        /// Recursively copies a folder from one location to another. Any existing
-        /// folders and files are overwritten.
-        /// </summary>
-        /// <param name="source">Folder top be copied (can include wildcards).</param>
-        /// <param name="destination">Where the specified folders are to be copied.</param>
-        [PreserveCase]
-        public void CopyFolder(string source, string destination) {
-        }
-
-        /// <summary>
-        /// Recursively copies a folder from one location to another.
-        /// </summary>
-        /// <param name="source">Folder top be copied (can include wildcards).</param>
-        /// <param name="destination">Where the specified folders are to be copied.</param>
-        /// <param name="overwrite">Indicates if existing folders and files are to be overwritten.</param>
-        [PreserveCase]
-        public void CopyFolder(string source, string destination, bool overwrite) {
-        }
-
-        /// <summary>
-        /// Creates a new folder.
-        /// </summary>
-        /// <param name="name">The name of the folder to create.</param>
-        /// <returns>A folder object representing the new folder.</returns>
-        [PreserveCase]
-        public Folder CreateFolder(string name) {
-            return null;
-        }
-
-        /// <summary>
-        /// Creates the specified ASCII text file.
-        /// </summary>
-        /// <param name="name">The name of the file to create.</param>
-        /// <returns>A TextStream object representing the file.</returns>
-        [PreserveCase]
-        public TextStream CreateTextFile(string name) {
-            return null;
-        }
-
-        /// <summary>
-        /// Creates the specified ASCII text file.
-        /// </summary>
-        /// <param name="name">The name of the file to create.</param>
-        /// <param name="overwrite">Whether an existing file should be overwritten.</param>
-        /// <returns>A TextStream object representing the file.</returns>
-        [PreserveCase]
-        public TextStream CreateTextFile(string name, bool overwrite) {
-            return null;
-        }
-
-        /// <summary>
-        /// Creates the specified ASCII or Unicode text file.
-        /// </summary>
-        /// <param name="name">The name of the file to create.</param>
-        /// <param name="overwrite">Whether an existing file should be overwritten.</param>
-        /// <param name="unicode">Whether the file will be unicode or ASCII.</param>
-        /// <returns>A TextStream object representing the file.</returns>
-        [PreserveCase]
-        public TextStream CreateTextFile(string name, bool overwrite, bool unicode) {
-            return null;
-        }
-
-        /// <summary>
-        /// Deletes the specified file.
-        /// </summary>
-        /// <param name="name">The file to be deleted.</param>
-        [PreserveCase]
-        public void DeleteFile(string name) {
-        }
-
-        /// <summary>
-        /// Deletes the specified file.
-        /// </summary>
-        /// <param name="name">The file to be deleted.</param>
-        /// <param name="force">Whether to delete files even if they are marked as read-only.</param>
-        [PreserveCase]
-        public void DeleteFile(string name, bool force) {
-        }
-
-        /// <summary>
-        /// Deletes the specified folder and its contents.
-        /// </summary>
-        /// <param name="name">The folder to be deleted.</param>
-        [PreserveCase]
-        public void DeleteFolder(string name) {
-        }
-
-        /// <summary>
-        /// Deletes the specified folder and its contents.
-        /// </summary>
-        /// <param name="name">The folder to be deleted.</param>
-        /// <param name="force">Whether to delete the folder even if it contains files that are marked as read-only.</param>
-        [PreserveCase]
-        public void DeleteFolder(string name, bool force) {
-        }
-
-        /// <summary>
-        /// Checks if the specified drive exists.
-        /// </summary>
-        /// <param name="name">The name of the drive.</param>
-        /// <returns>True if the drive exists; false otherwise.</returns>
-        [PreserveCase]
-        public bool DriveExists(string name) {
-            return false;
-        }
-
-        /// <summary>
-        /// Checks if the specified file exists.
-        /// </summary>
-        /// <param name="name">The name of the file.</param>
-        /// <returns>True if the drive exists; false otherwise.</returns>
-        [PreserveCase]
-        public bool FileExists(string name) {
-            return false;
-        }
-
-        /// <summary>
-        /// Checks if the specified folder exists.
-        /// </summary>
-        /// <param name="name">The name of the folder.</param>
-        /// <returns>True if the drive exists; false otherwise.</returns>
-        [PreserveCase]
-        public bool FolderExists(string name) {
-            return false;
-        }
-
-        /// <summary>
-        /// Returns a complete and unambiguous path from a provided path name.
-        /// </summary>
-        /// <param name="name">The path name.</param>
-        /// <returns>The complete path name.</returns>
-        [PreserveCase]
-        public string GetAbsolutePathName(string name) {
-            return null;
-        }
-
-        /// <summary>
-        /// Returns the base path of the specified path by stripping off any extension information.
-        /// </summary>
-        /// <param name="name">The path name.</param>
-        /// <returns>The base path name.</returns>
-        [PreserveCase]
-        public string GetBaseName(string name) {
-            return null;
-        }
-
-        /// <summary>
-        /// Returns the drive associated with the specified path.
-        /// </summary>
-        /// <param name="name">The path name.</param>
-        /// <returns>The associated drive name.</returns>
-        [PreserveCase]
-        public string GetDrive(string name) {
-            return null;
-        }
-
-        /// <summary>
-        /// Returns the extension associated with the specified path.
-        /// </summary>
-        /// <param name="name">The path name.</param>
-        /// <returns>The associated extension name.</returns>
-        [PreserveCase]
-        public string GetExtensionName(string name) {
-            return null;
-        }
-
-        /// <summary>
-        /// Returns the file associated with the specified path.
-        /// </summary>
-        /// <param name="name">The path name.</param>
-        /// <returns>The associated file object.</returns>
-        [PreserveCase]
-        public object GetFile(string name) {
-            // TODO: Return type
-            return null;
-        }
-
-        /// <summary>
-        /// Returns the version associated with the specified file.
-        /// </summary>
-        /// <param name="name">The file name.</param>
-        /// <returns>The associated version number.</returns>
-        [PreserveCase]
-        public string GetFileVersion(string name) {
-            return null;
-        }
-
-        /// <summary>
-        /// Returns the name of the file associated with the specified path.
-        /// </summary>
-        /// <param name="name">The path name.</param>
-        /// <returns>The associated file name.</returns>
-        [PreserveCase]
-        public string GetFileName(string name) {
-            return null;
-        }
-
-        /// <summary>
-        /// Returns the folder associated with the specified path.
-        /// </summary>
-        /// <param name="name">The path name.</param>
-        /// <returns>The associated folder object.</returns>
-        [PreserveCase]
-        public object GetFolder(string name) {
-            // TODO: Return type
-            return null;
-        }
-
-        /// <summary>
-        /// Returns the name of the folder associated with the specified path.
-        /// </summary>
-        /// <param name="name">The path name.</param>
-        /// <returns>The associated folder name.</returns>
-        [PreserveCase]
-        public string GetParentFolderName(string name) {
-            return null;
-        }
-
-        /// <summary>
-        /// Returns the name of the folder associated with the specified path.
-        /// </summary>
-        /// <param name="name">The path name.</param>
-        /// <returns>The associated folder name.</returns>
-        [PreserveCase]
-        public string GetSpecialFolder(string name) {
-            return null;
-        }
-
-        /// <summary>
-        /// Moves one or more files from one location to another.
-        /// </summary>
-        /// <param name="source">File to be copied (can include wildcards).</param>
-        /// <param name="destination">Where the files are to be copied.</param>
-        [PreserveCase]
-        public void MoveFile(string source, string destination) {
-        }
-
-        /// <summary>
-        /// Moves one or more folder from one location to another.
-        /// </summary>
-        /// <param name="source">Folder to be copied (can include wildcards).</param>
-        /// <param name="destination">Where the folders are to be copied.</param>
-        [PreserveCase]
-        public void MoveFolder(string source, string destination) {
-        }
-
-        /// <summary>
-        /// Opens an existing file for reading/writing ASCII text.
-        /// </summary>
-        /// <param name="name">The name of the file to open.</param>
-        /// <returns>A TextStream object representing the file.</returns>
-        [PreserveCase]
-        public TextStream OpenTextFile(string name) {
-            return null;
-        }
-
-        /// <summary>
-        /// Opens an existing file as ASCII text for reading or writing as specified.
-        /// </summary>
-        /// <param name="name">The name of the file to open.</param>
-        /// <param name="mode">Whether the file should be opened for reading, writing or both.</param>
-        /// <returns>A TextStream object representing the file.</returns>
-        [PreserveCase]
-        public TextStream OpenTextFile(string name, int mode) {
-            return null;
-        }
-
-        /// <summary>
-        /// Opens a file as ASCII text for reading or writing as specified.
-        /// </summary>
-        /// <param name="name">The name of the file to open.</param>
-        /// <param name="mode">Whether the file should be opened for reading, writing or both.</param>
-        /// <param name="create">True if a file is to be created, and false otherwise.</param>
-        /// <returns>A TextStream object representing the file.</returns>
-        [PreserveCase]
-        public TextStream OpenTextFile(string name, int mode, bool create) {
-            return null;
-        }
-
-        /// <summary>
-        /// Opens a file for reading or writing as specified.
-        /// </summary>
-        /// <param name="name">The name of the file to open.</param>
-        /// <param name="mode">Whether the file should be opened for reading, writing or both.</param>
-        /// <param name="create">True if a file is to be created, and false otherwise.</param>
-        /// <param name="format">The format of the text in the file.</param>
-        /// <returns>A TextStream object representing the file.</returns>
-        [PreserveCase]
-        public TextStream OpenTextFile(string name, FileMode mode, bool create, FileFormat format) {
-            return null;
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/FileSystem/Folder.cs b/src/Libraries/Windows/Windows/FileSystem/Folder.cs
deleted file mode 100644
index 6d7b57dfc..000000000
--- a/src/Libraries/Windows/Windows/FileSystem/Folder.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-// Folder.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.FileSystem {
-
-    /// <summary>
-    /// Provides access to properties and operations on a folder.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class Folder {
-
-        private Folder() {
-        }
-
-        /// <summary>
-        /// Gets or sets the attributes associated with the folder.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public FileAttributes Attributes {
-            get {
-                return FileAttributes.Normal;
-            }
-            set {
-            }
-        }
-
-        /// <summary>
-        /// Gets the date and time the folder was created.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public DateTime DateCreated {
-            get {
-                return DateTime.Now;
-            }
-        }
-
-        /// <summary>
-        /// Gets the date and time the folder was last accessed.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public DateTime DateLastAccessed {
-            get {
-                return DateTime.Now;
-            }
-        }
-
-        /// <summary>
-        /// Gets the date and time the folder was last modified.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public DateTime DateLastModified {
-            get {
-                return DateTime.Now;
-            }
-        }
-
-        /// <summary>
-        /// The drive letter associated with this folder.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Drive {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Returns a collection of files within this folder.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public FileCollection Files {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the name associated with this folder.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Name {
-            get {
-                return null;
-            }
-            set {
-            }
-        }
-
-        /// <summary>
-        /// Gets the folder containing this folder.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public Folder ParentFolder {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets the path of this file.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public string Path {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Gets the size of the file in bytes.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int Size {
-            get {
-                return 0;
-            }
-        }
-
-        /// <summary>
-        /// Returns a collection of folders within this folder.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public FolderCollection SubFolders {
-            get {
-                return null;
-            }
-        }
-
-        /// <summary>
-        /// Copies the folder to the specified destination.
-        /// </summary>
-        /// <param name="destination">The destination path.</param>
-        [PreserveCase]
-        public void Copy(string destination) {
-        }
-
-        /// <summary>
-        /// Copies the folder to the specified destination.
-        /// </summary>
-        /// <param name="destination">The destination path.</param>
-        /// <param name="overwrite">Whether any existing folders and files should be overwritten or not.</param>
-        [PreserveCase]
-        public void Copy(string destination, bool overwrite) {
-        }
-
-        /// <summary>
-        /// Creates the specified ASCII text file.
-        /// </summary>
-        /// <param name="name">The name of the file to create.</param>
-        /// <returns>A TextStream object representing the file.</returns>
-        [PreserveCase]
-        public TextStream CreateTextFile(string name) {
-            return null;
-        }
-
-        /// <summary>
-        /// Creates the specified ASCII text file.
-        /// </summary>
-        /// <param name="name">The name of the file to create.</param>
-        /// <param name="overwrite">Whether an existing file should be overwritten.</param>
-        /// <returns>A TextStream object representing the file.</returns>
-        [PreserveCase]
-        public TextStream CreateTextFile(string name, bool overwrite) {
-            return null;
-        }
-
-        /// <summary>
-        /// Creates the specified ASCII or Unicode text file.
-        /// </summary>
-        /// <param name="name">The name of the file to create.</param>
-        /// <param name="overwrite">Whether an existing file should be overwritten.</param>
-        /// <param name="unicode">Whether the file will be unicode or ASCII.</param>
-        /// <returns>A TextStream object representing the file.</returns>
-        [PreserveCase]
-        public TextStream CreateTextFile(string name, bool overwrite, bool unicode) {
-            return null;
-        }
-
-        /// <summary>
-        /// Deletes the folder.
-        /// </summary>
-        [PreserveCase]
-        public void Delete() {
-        }
-
-        /// <summary>
-        /// Deletes the folder.
-        /// </summary>
-        /// <param name="force">True if the folder should be deleted even if it is read-only.</param>
-        [PreserveCase]
-        public void Delete(bool force) {
-        }
-
-        /// <summary>
-        /// Moves the folder to the specified destination.
-        /// </summary>
-        /// <param name="destination">The new location for the folder.</param>
-        [PreserveCase]
-        public void Move(string destination) {
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/FileSystem/FolderCollection.cs b/src/Libraries/Windows/Windows/FileSystem/FolderCollection.cs
deleted file mode 100644
index ec0b9ad5d..000000000
--- a/src/Libraries/Windows/Windows/FileSystem/FolderCollection.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// FolderCollection.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.FileSystem {
-
-    /// <summary>
-    /// Represents a set of folder.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class FolderCollection {
-
-        private FolderCollection() {
-        }
-
-        /// <summary>
-        /// Gets the number of folder in the collection.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int Count {
-            get {
-                return 0;
-            }
-        }
-
-        /// <summary>
-        /// Gets the specified folder.
-        /// </summary>
-        [IntrinsicProperty]
-        public Folder this[int index] {
-            get {
-                return null;
-            }
-        }
-    }
-}
diff --git a/src/Libraries/Windows/Windows/FileSystem/TextStream.cs b/src/Libraries/Windows/Windows/FileSystem/TextStream.cs
deleted file mode 100644
index 32f1cbf06..000000000
--- a/src/Libraries/Windows/Windows/FileSystem/TextStream.cs
+++ /dev/null
@@ -1,147 +0,0 @@
-// TextStream.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
-//
-
-using System;
-using System.Runtime.CompilerServices;
-
-namespace System.Windows.FileSystem {
-
-    /// <summary>
-    /// Provides the ability to sequentially read or write text to a file.
-    /// </summary>
-    [IgnoreNamespace]
-    [Imported]
-    public sealed class TextStream {
-
-        private TextStream() {
-        }
-
-        /// <summary>
-        /// True if the file pointer is positioned before the end-of-line marker in the file.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public bool AtEndOfLine {
-            get {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// True if the file pointer is positioned before the end-of-file marker in the file.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public bool AtEndOfStream {
-            get {
-                return false;
-            }
-        }
-
-        /// <summary>
-        /// The column number of the current character position.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int Column {
-            get {
-                return 0;
-            }
-        }
-
-        /// <summary>
-        /// The line number of the current character position.
-        /// </summary>
-        [IntrinsicProperty]
-        [PreserveCase]
-        public int Line {
-            get {
-                return 0;
-            }
-        }
-
-        /// <summary>
-        /// Closes an opened TextStream.
-        /// </summary>
-        [PreserveCase]
-        public void Close() {
-        }
-
-        /// <summary>
-        /// Reads the specified number of characters from an opened TextStream.
-        /// </summary>
-        /// <param name="characters">The number of characters to read.</param>
-        [PreserveCase]
-        public string Read(int characters) {
-            return null;
-        }
-
-        /// <summary>
-        /// Reads all the text from an opened TextStream.
-        /// </summary>
-        [PreserveCase]
-        public string ReadAll() {
-            return null;
-        }
-
-        /// <summary>
-        /// Reads all the text until a new line from an opened TextStream.
-        /// </summary>
-        [PreserveCase]
-        public string ReadLine() {
-            return null;
-        }
-
-        /// <summary>
-        /// Skips past the specified number of characters from an opened TextStream.
-        /// </summary>
-        /// <param name="characters">The number of characters to skip.</param>
-        [PreserveCase]
-        public void Skip(int characters) {
-        }
-
-        /// <summary>
-        /// Skips past text until a new line from an opened TextStream.
-        /// </summary>
-        [PreserveCase]
-        public string SkipLine() {
-            return null;
-        }
-
-        /// <summary>
-        /// Writes the specified text to an opened TextStream.
-        /// </summary>
-        /// <param name="text">The text to write.</param>
-        [PreserveCase]
-        public void Write(string text) {
-        }
-
-        /// <summary>
-        /// Writes the specified number of new lines to an opened TextStream.
-        /// </summary>
-        /// <param name="lines">The number of new lines to write.</param>
-        [PreserveCase]
-        public void WriteBlankLines(int lines) {
-        }
-
-        /// <summary>
-        /// Writes a new line to an opened TextStream.
-        /// </summary>
-        [PreserveCase]
-        public void WriteLine() {
-        }
-
-        /// <summary>
-        /// Writes the specified text followed by a new line to an opened TextStream.
-        /// </summary>
-        /// <param name="text">The text to write.</param>
-        [PreserveCase]
-        public void WriteLine(string text) {
-        }
-    }
-}
diff --git a/src/Libraries/jQuery/jQuery.Core/AjaxCallback.cs b/src/Libraries/jQuery/jQuery.Core/AjaxCallback.cs
index 6853cdbde..363ce9f6a 100644
--- a/src/Libraries/jQuery/jQuery.Core/AjaxCallback.cs
+++ b/src/Libraries/jQuery/jQuery.Core/AjaxCallback.cs
@@ -1,9 +1,6 @@
 // AjaxCallback.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -12,6 +9,14 @@
 
 namespace jQueryApi {
 
+    /// <summary>
+    /// A callback to be invoked for an Ajax request.
+    /// </summary>
+    /// <param name="data">The result of the request.</param>
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void AjaxCallback(object data);
+
     /// <summary>
     /// A callback to be invoked for an Ajax request.
     /// </summary>
@@ -28,7 +33,27 @@ namespace jQueryApi {
     /// <param name="request">The request that was invoked.</param>
     [IgnoreNamespace]
     [Imported]
-    public delegate void AjaxRequestCallback<TData>(TData data, string textStatus, jQueryXmlHttpRequest<TData> request);
+    public delegate void AjaxRequestCallback(object data, string textStatus, jQueryXmlHttpRequest request);
+
+    /// <summary>
+    /// A callback to be invoked for an Ajax request.
+    /// </summary>
+    /// <param name="data">The result of the request.</param>
+    /// <param name="textStatus">The status of the request.</param>
+    /// <param name="request">The request that was invoked.</param>
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void AjaxRequestCallback<TData>(TData data, string textStatus, jQueryDataHttpRequest<TData> request);
+
+    /// <summary>
+    /// A callback to be invoked for a failed Ajax request.
+    /// </summary>
+    /// <param name="request">The request that was invoked.</param>
+    /// <param name="textStatus">The status of the request.</param>
+    /// <param name="error">The error or exception if any.</param>
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void AjaxErrorCallback(jQueryXmlHttpRequest request, string textStatus, Exception error);
 
     /// <summary>
     /// A callback to be invoked for a failed Ajax request.
@@ -38,7 +63,7 @@ namespace jQueryApi {
     /// <param name="error">The error or exception if any.</param>
     [IgnoreNamespace]
     [Imported]
-    public delegate void AjaxErrorCallback<TData>(jQueryXmlHttpRequest<TData> request, string textStatus, Exception error);
+    public delegate void AjaxErrorCallback<TData>(jQueryDataHttpRequest<TData> request, string textStatus, Exception error);
 
     /// <summary>
     /// A callback to be invoked for a completed Ajax request.
@@ -47,7 +72,24 @@ namespace jQueryApi {
     /// <param name="textStatus">The status of the request.</param>
     [IgnoreNamespace]
     [Imported]
-    public delegate void AjaxCompletedCallback<TData>(jQueryXmlHttpRequest<TData> request, string textStatus);
+    public delegate void AjaxCompletedCallback(jQueryXmlHttpRequest request, string textStatus);
+
+    /// <summary>
+    /// A callback to be invoked for a completed Ajax request.
+    /// </summary>
+    /// <param name="request">The request that was invoked.</param>
+    /// <param name="textStatus">The status of the request.</param>
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void AjaxCompletedCallback<TData>(jQueryDataHttpRequest<TData> request, string textStatus);
+
+    /// <summary>
+    /// A callback to be invoked for an Ajax request being sent.
+    /// </summary>
+    /// <param name="request">The request that was invoked.</param>
+    [IgnoreNamespace]
+    [Imported]
+    public delegate void AjaxSendingCallback(jQueryXmlHttpRequest request);
 
     /// <summary>
     /// A callback to be invoked for an Ajax request being sent.
@@ -55,13 +97,13 @@ namespace jQueryApi {
     /// <param name="request">The request that was invoked.</param>
     [IgnoreNamespace]
     [Imported]
-    public delegate void AjaxSendingCallback<TData>(jQueryXmlHttpRequest<TData> request);
+    public delegate void AjaxSendingCallback<TData>(jQueryDataHttpRequest<TData> request);
 
     /// <summary>
     /// Creates a jQueryXmlHttpRequest object.
     /// </summary>
     /// <returns>A newly created request instance.</returns>
-    public delegate jQueryXmlHttpRequest<TData> XmlHttpRequestCreator<TData>();
+    public delegate jQueryXmlHttpRequest XmlHttpRequestCreator();
 
     /// <summary>
     /// Handles ajax events.
@@ -69,7 +111,24 @@ namespace jQueryApi {
     /// <param name="e">The event information.</param>
     /// <param name="request">The request instance.</param>
     /// <param name="options">The Ajax options associated with the request.</param>
-    public delegate void AjaxEventHandler<TData>(jQueryEvent e, jQueryXmlHttpRequest<TData> request, jQueryAjaxOptions options);
+    public delegate void AjaxEventHandler(jQueryEvent e, jQueryXmlHttpRequest request, jQueryAjaxOptions options);
+
+    /// <summary>
+    /// Handles ajax events.
+    /// </summary>
+    /// <param name="e">The event information.</param>
+    /// <param name="request">The request instance.</param>
+    /// <param name="options">The Ajax options associated with the request.</param>
+    public delegate void AjaxEventHandler<TData>(jQueryEvent e, jQueryDataHttpRequest<TData> request, jQueryAjaxOptions options);
+
+    /// <summary>
+    /// Handles ajax error events.
+    /// </summary>
+    /// <param name="e">The event information.</param>
+    /// <param name="request">The request instance.</param>
+    /// <param name="options">The Ajax options associated with the request.</param>
+    /// <param name="error">The error information.</param>
+    public delegate void AjaxErrorEventHandler(jQueryEvent e, jQueryXmlHttpRequest request, jQueryAjaxOptions options, Exception error);
 
     /// <summary>
     /// Handles ajax error events.
@@ -78,5 +137,5 @@ namespace jQueryApi {
     /// <param name="request">The request instance.</param>
     /// <param name="options">The Ajax options associated with the request.</param>
     /// <param name="error">The error information.</param>
-    public delegate void AjaxErrorEventHandler<TData>(jQueryEvent e, jQueryXmlHttpRequest<TData> request, jQueryAjaxOptions options, Exception error);
+    public delegate void AjaxErrorEventHandler<TData>(jQueryEvent e, jQueryDataHttpRequest<TData> request, jQueryAjaxOptions options, Exception error);
 }
diff --git a/src/Libraries/jQuery/jQuery.Core/ArrayFilterCallback.cs b/src/Libraries/jQuery/jQuery.Core/ArrayFilterCallback.cs
index fcb32c83c..a82c89266 100644
--- a/src/Libraries/jQuery/jQuery.Core/ArrayFilterCallback.cs
+++ b/src/Libraries/jQuery/jQuery.Core/ArrayFilterCallback.cs
@@ -1,9 +1,6 @@
 // ArrayFilterCallback.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/ArrayIterationCallback.cs b/src/Libraries/jQuery/jQuery.Core/ArrayIterationCallback.cs
index 26e668e9d..0da73207c 100644
--- a/src/Libraries/jQuery/jQuery.Core/ArrayIterationCallback.cs
+++ b/src/Libraries/jQuery/jQuery.Core/ArrayIterationCallback.cs
@@ -1,9 +1,6 @@
 // ArrayIterationCallback.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/ArrayMapCallback.cs b/src/Libraries/jQuery/jQuery.Core/ArrayMapCallback.cs
index 123b437b5..49c21eca1 100644
--- a/src/Libraries/jQuery/jQuery.Core/ArrayMapCallback.cs
+++ b/src/Libraries/jQuery/jQuery.Core/ArrayMapCallback.cs
@@ -1,9 +1,6 @@
 // ArrayMapCallback.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/BooleanFunction.cs b/src/Libraries/jQuery/jQuery.Core/BooleanFunction.cs
new file mode 100644
index 000000000..876ab0480
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Core/BooleanFunction.cs
@@ -0,0 +1,18 @@
+// BooleanFunction.cs
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi {
+
+    /// <summary>
+    /// A callback that returns a value for the element at the specified index.
+    /// </summary>
+    /// <param name="index">The index of the element in the set.</param>
+    [IgnoreNamespace]
+    [Imported]
+    public delegate bool BooleanFunction(int index);
+}
diff --git a/src/Libraries/jQuery/jQuery.Core/EffectDuration.cs b/src/Libraries/jQuery/jQuery.Core/EffectDuration.cs
index 8152105ad..51ed1fc6c 100644
--- a/src/Libraries/jQuery/jQuery.Core/EffectDuration.cs
+++ b/src/Libraries/jQuery/jQuery.Core/EffectDuration.cs
@@ -1,9 +1,6 @@
 // EffectDuration.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/EffectEasing.cs b/src/Libraries/jQuery/jQuery.Core/EffectEasing.cs
index 760902c03..c772056d8 100644
--- a/src/Libraries/jQuery/jQuery.Core/EffectEasing.cs
+++ b/src/Libraries/jQuery/jQuery.Core/EffectEasing.cs
@@ -1,9 +1,6 @@
 // EffectEasing.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/ElementFilterCallback.cs b/src/Libraries/jQuery/jQuery.Core/ElementFilterCallback.cs
index 6394e97ea..d346739ed 100644
--- a/src/Libraries/jQuery/jQuery.Core/ElementFilterCallback.cs
+++ b/src/Libraries/jQuery/jQuery.Core/ElementFilterCallback.cs
@@ -1,9 +1,6 @@
 // ElementFilterCallback.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/ElementIterationCallback.cs b/src/Libraries/jQuery/jQuery.Core/ElementIterationCallback.cs
index 2be3514e1..7731ab797 100644
--- a/src/Libraries/jQuery/jQuery.Core/ElementIterationCallback.cs
+++ b/src/Libraries/jQuery/jQuery.Core/ElementIterationCallback.cs
@@ -1,9 +1,6 @@
 // ElementIterationCallback.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/ElementMapCallback.cs b/src/Libraries/jQuery/jQuery.Core/ElementMapCallback.cs
index 215d184b8..2f0d28fb7 100644
--- a/src/Libraries/jQuery/jQuery.Core/ElementMapCallback.cs
+++ b/src/Libraries/jQuery/jQuery.Core/ElementMapCallback.cs
@@ -1,9 +1,6 @@
 // ElementMapCallback.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/IDeferred.cs b/src/Libraries/jQuery/jQuery.Core/IDeferred.cs
index f95f7f076..898c63f65 100644
--- a/src/Libraries/jQuery/jQuery.Core/IDeferred.cs
+++ b/src/Libraries/jQuery/jQuery.Core/IDeferred.cs
@@ -1,9 +1,6 @@
 // IDeferred.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -18,13 +15,37 @@ namespace jQueryApi {
     [IgnoreNamespace]
     public interface IDeferred {
 
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or
+        /// rejected.
+        /// </summary>
+        /// <param name="callbacks">The callbacsk to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred Always(params Action[] callbacks);
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or
+        /// rejected.
+        /// </summary>
+        /// <param name="callbacks">The callbacsk to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred Always(params Callback[] callbacks);
+
         /// <summary>
         /// Add handlers to be called when the deferred object is resolved. If the
         /// deferred object is already resolved, the handlers are still invoked.
         /// </summary>
         /// <param name="doneCallbacks">The callbacks to invoke (in order).</param>
         /// <returns>The current deferred object.</returns>
-        IDeferred Done(params Delegate[] doneCallbacks);
+        IDeferred Done(params Action[] doneCallbacks);
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved. If the
+        /// deferred object is already resolved, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred Done(params Callback[] doneCallbacks);
 
         /// <summary>
         /// Add handlers to be called when the deferred object is rejected. If the
@@ -32,7 +53,15 @@ public interface IDeferred {
         /// </summary>
         /// <param name="failCallbacks">The callbacks to invoke (in order).</param>
         /// <returns>The current deferred object.</returns>
-        IDeferred Fail(params Delegate[] failCallbacks);
+        IDeferred Fail(params Action[] failCallbacks);
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is rejected. If the
+        /// deferred object is already resolved, the handlers are still invoked.
+        /// </summary>
+        /// <param name="failCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred Fail(params Callback[] failCallbacks);
 
         /// <summary>
         /// Determines whether the deferred object has been rejected.
@@ -47,36 +76,145 @@ public interface IDeferred {
         bool IsResolved();
 
         /// <summary>
-        /// Rejects the deferred object and call any failure callbacks with the specified arguments.
+        /// Filters or chains deffered objects.
         /// </summary>
-        /// <param name="args">The arguments to pass to the callbacks.</param>
+        /// <param name="successFilter">The filter to invoke when the deferred object is resolved.</param>
         /// <returns>The current deferred object.</returns>
-        jQueryDeferred Reject(params object[] args);
+        IDeferred Pipe(jQueryDeferredFilter successFilter);
 
         /// <summary>
-        /// Rejects the deferred object and call any failure callbacks with the specified arguments
-        /// using the specified context as the this parameter.
+        /// Filters or chains deffered objects.
         /// </summary>
-        /// <param name="context">The context in which the callback is invoked.</param>
-        /// <param name="args">The arguments to pass to the callbacks.</param>
+        /// <param name="successFilter">The filter to invoke when the deferred object is resolved.</param>
+        /// <param name="failFilter">The filter to invoke when the deferred object is rejected.</param>
         /// <returns>The current deferred object.</returns>
-        IDeferred RejectWith(object context, params object[] args);
+        IDeferred Pipe(jQueryDeferredFilter successFilter, jQueryDeferredFilter failFilter);
 
         /// <summary>
-        /// Resolves the deferred object and call any done callbacks with the specified arguments.
+        /// Add handlers to be called when the deferred object is resolved or rejected.
+        /// If the object has already been resolved or rejected, the handlers are still invoked.
         /// </summary>
-        /// <param name="args">The arguments to pass to the callbacks.</param>
+        /// <param name="doneCallback">The callback to invoke when the object is resolved.</param>
+        /// <param name="failCallback">The callback to invoke when the object is rejected.</param>
         /// <returns>The current deferred object.</returns>
-        IDeferred Resolve(params object[] args);
+        IDeferred Then(Action doneCallback, Action failCallback);
 
         /// <summary>
-        /// Resolves the deferred object and call any failure callbacks with the specified arguments
-        /// using the specified context as the this parameter.
+        /// Add handlers to be called when the deferred object is resolved or rejected.
+        /// If the object has already been resolved or rejected, the handlers are still invoked.
         /// </summary>
-        /// <param name="context">The context in which the callback is invoked.</param>
-        /// <param name="args">The arguments to pass to the callbacks.</param>
+        /// <param name="doneCallback">The callback to invoke when the object is resolved.</param>
+        /// <param name="failCallback">The callback to invoke when the object is rejected.</param>
         /// <returns>The current deferred object.</returns>
-        IDeferred ResolveWith(object context, params object[] args);
+        IDeferred Then(Callback doneCallback, Callback failCallback);
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or rejected.
+        /// If the object has already been resolved or rejected, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke when the object is resolved.</param>
+        /// <param name="failCallbacks">The callbacks to invoke when the object is rejected.</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred Then(Action[] doneCallbacks, Action[] failCallbacks);
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or rejected.
+        /// If the object has already been resolved or rejected, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke when the object is resolved.</param>
+        /// <param name="failCallbacks">The callbacks to invoke when the object is rejected.</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred Then(Callback[] doneCallbacks, Callback[] failCallbacks);
+    }
+
+    /// <summary>
+    /// Represents a deferred value.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    public interface IDeferred<TData> {
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or
+        /// rejected.
+        /// </summary>
+        /// <param name="callbacks">The callbacsk to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred<TData> Always(params Action[] callbacks);
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or
+        /// rejected.
+        /// </summary>
+        /// <param name="callbacks">The callbacsk to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred<TData> Always(params Action<TData>[] callbacks);
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved. If the
+        /// deferred object is already resolved, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred<TData> Done(params Action[] doneCallbacks);
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved. If the
+        /// deferred object is already resolved, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred<TData> Done(params Action<TData>[] doneCallbacks);
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is rejected. If the
+        /// deferred object is already resolved, the handlers are still invoked.
+        /// </summary>
+        /// <param name="failCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred<TData> Fail(params Action[] failCallbacks);
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is rejected. If the
+        /// deferred object is already resolved, the handlers are still invoked.
+        /// </summary>
+        /// <param name="failCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred<TData> Fail(params Action<TData>[] failCallbacks);
+
+        /// <summary>
+        /// Determines whether the deferred object has been rejected.
+        /// </summary>
+        /// <returns>true if it has been rejected; false otherwise.</returns>
+        bool IsRejected();
+
+        /// <summary>
+        /// Determines whether the deferred object has been resolved.
+        /// </summary>
+        /// <returns>true if it has been resolved; false otherwise.</returns>
+        bool IsResolved();
+
+        /// <summary>
+        /// Filters deffered objects.
+        /// </summary>
+        /// <param name="successFilter">The filter to invoke when the deferred object is resolved.</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred<TTargetData> Pipe<TTargetData>(jQueryDeferredFilter<TTargetData, TData> successFilter);
+
+        /// <summary>
+        /// Filters deffered objects.
+        /// </summary>
+        /// <param name="successFilter">The filter to invoke when the deferred object is resolved.</param>
+        /// <param name="failFilter">The filter to invoke when the deferred object is rejected.</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred<TTargetData> Pipe<TTargetData>(jQueryDeferredFilter<TTargetData, TData> successFilter, jQueryDeferredFilter<TTargetData> failFilter);
+
+        /// <summary>
+        /// Chains deffered objects.
+        /// </summary>
+        /// <param name="successChain">The filter to invoke when the deferred object is resolved.</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred<TTargetData> Pipe<TTargetData>(Func<TData, IDeferred<TTargetData>> successChain);
 
         /// <summary>
         /// Add handlers to be called when the deferred object is resolved or rejected.
@@ -85,7 +223,25 @@ public interface IDeferred {
         /// <param name="doneCallback">The callback to invoke when the object is resolved.</param>
         /// <param name="failCallback">The callback to invoke when the object is rejected.</param>
         /// <returns>The current deferred object.</returns>
-        jQueryDeferred Then(Delegate doneCallback, Delegate failCallback);
+        IDeferred<TData> Then(Action doneCallback, Action failCallback);
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or rejected.
+        /// If the object has already been resolved or rejected, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallback">The callback to invoke when the object is resolved.</param>
+        /// <param name="failCallback">The callback to invoke when the object is rejected.</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred<TData> Then(Action<TData> doneCallback, Action<TData> failCallback);
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or rejected.
+        /// If the object has already been resolved or rejected, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke when the object is resolved.</param>
+        /// <param name="failCallbacks">The callbacks to invoke when the object is rejected.</param>
+        /// <returns>The current deferred object.</returns>
+        IDeferred<TData> Then(Action[] doneCallbacks, Action[] failCallbacks);
 
         /// <summary>
         /// Add handlers to be called when the deferred object is resolved or rejected.
@@ -94,6 +250,6 @@ public interface IDeferred {
         /// <param name="doneCallbacks">The callbacks to invoke when the object is resolved.</param>
         /// <param name="failCallbacks">The callbacks to invoke when the object is rejected.</param>
         /// <returns>The current deferred object.</returns>
-        IDeferred Then(Delegate[] doneCallbacks, Delegate[] failCallbacks);
+        IDeferred<TData> Then(Action<TData>[] doneCallbacks, Action<TData>[] failCallbacks);
     }
 }
diff --git a/src/Libraries/jQuery/jQuery.Core/ObjectIterationCallback.cs b/src/Libraries/jQuery/jQuery.Core/ObjectIterationCallback.cs
index 3e627726b..0420b1ece 100644
--- a/src/Libraries/jQuery/jQuery.Core/ObjectIterationCallback.cs
+++ b/src/Libraries/jQuery/jQuery.Core/ObjectIterationCallback.cs
@@ -1,9 +1,6 @@
 // ObjectIterationCallback.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/ObjectMapCallback.cs b/src/Libraries/jQuery/jQuery.Core/ObjectMapCallback.cs
new file mode 100644
index 000000000..60d085d26
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Core/ObjectMapCallback.cs
@@ -0,0 +1,20 @@
+// ObjectMapCallback.cs
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi {
+
+    /// <summary>
+    /// A callback to be invoked for each item in an object being mapped.
+    /// </summary>
+    /// <param name="item">The item within the object.</param>
+    /// <param name="key">The key of the item.</param>
+    /// <returns>The value that the item was mapped to.</returns>
+    [IgnoreNamespace]
+    [Imported]
+    public delegate object ObjectMapCallback(object item, string key);
+}
diff --git a/src/Libraries/jQuery/jQuery.Core/PositionFunction.cs b/src/Libraries/jQuery/jQuery.Core/PositionFunction.cs
index 9dcc9e3cd..0b1e17e45 100644
--- a/src/Libraries/jQuery/jQuery.Core/PositionFunction.cs
+++ b/src/Libraries/jQuery/jQuery.Core/PositionFunction.cs
@@ -1,9 +1,6 @@
 // PositionFunction.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/Properties/AssemblyInfo.cs b/src/Libraries/jQuery/jQuery.Core/Properties/AssemblyInfo.cs
index d01166ce7..4eaeaee8d 100644
--- a/src/Libraries/jQuery/jQuery.Core/Properties/AssemblyInfo.cs
+++ b/src/Libraries/jQuery/jQuery.Core/Properties/AssemblyInfo.cs
@@ -1,8 +1,6 @@
 // AssemblyInfo.cs
-// Script#/Runtime/jQuery
-// Copyright (c) Nikhil Kothari, 2006
-//
-// Assembly Metadata
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/Properties/ScriptInfo.txt b/src/Libraries/jQuery/jQuery.Core/Properties/ScriptInfo.txt
new file mode 100644
index 000000000..68843a22f
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Core/Properties/ScriptInfo.txt
@@ -0,0 +1,22 @@
+jQuery Core
+===============================================================================
+
+This assembly provides access to jQuery APIs. This is only meant for use at
+development time, so you can reference and compile your c# code against jQuery
+APIs. You must include the appropriate jQuery scripts in your page for
+runtime functionality.
+
+More information is on http://jquery.com.
+
+-------------------------------------------------------------------------------
+
+This matches the API in jQuery Core 1.6.1. The corresponding scripts are at:
+Google CDNs:
+http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js
+http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.js
+https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js
+https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.js
+
+Download Locations:
+http://code.jquery.com/jquery-1.6.1.min.js
+http://code.jquery.com/jquery-1.6.1.js
diff --git a/src/Libraries/jQuery/jQuery.Core/StringFunction.cs b/src/Libraries/jQuery/jQuery.Core/StringFunction.cs
index 29aa060d3..4626c4b57 100644
--- a/src/Libraries/jQuery/jQuery.Core/StringFunction.cs
+++ b/src/Libraries/jQuery/jQuery.Core/StringFunction.cs
@@ -1,9 +1,6 @@
 // StringFunction.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/jQuery.Core.csproj b/src/Libraries/jQuery/jQuery.Core/jQuery.Core.csproj
index 560c0ccd0..d455c870a 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQuery.Core.csproj
+++ b/src/Libraries/jQuery/jQuery.Core/jQuery.Core.csproj
@@ -11,9 +11,9 @@
     <RootNamespace>jQueryApi</RootNamespace>
     <AssemblyName>Script.jQuery</AssemblyName>
     <NoStdLib>True</NoStdLib>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\Libraries.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -40,11 +40,9 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="mscorlib">
-      <HintPath>..\..\..\..\bin\ref\mscorlib.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
+    <Compile Include="BooleanFunction.cs" />
+    <Compile Include="jQueryDataHttpRequest.cs" />
+    <Compile Include="jQueryDeferredFilter.cs" />
     <Compile Include="jQueryXmlHttpRequest.cs" />
     <Compile Include="IDeferred.cs" />
     <Compile Include="jQueryDeferredInitializer.cs" />
@@ -57,6 +55,7 @@
     <Compile Include="EffectEasing.cs" />
     <Compile Include="EffectDuration.cs" />
     <Compile Include="jQueryNameValuePair.cs" />
+    <Compile Include="ObjectMapCallback.cs" />
     <Compile Include="PositionFunction.cs" />
     <Compile Include="jQueryPosition.cs" />
     <Compile Include="jQueryEventHandler.cs" />
@@ -70,16 +69,26 @@
     <Compile Include="ObjectIterationCallback.cs" />
     <Compile Include="ArrayIterationCallback.cs" />
     <Compile Include="jQuery.cs" />
+  </ItemGroup>
+  <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
-      <Link>Properties\CommonAssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
     </Compile>
+    <ScriptInfo Include="Properties\ScriptInfo.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Core\CoreLib\CoreLib.csproj">
+      <Project>{36D4B098-A21C-4725-ACD3-400922885F38}</Project>
+      <Name>CoreLib</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Web\Web.csproj">
       <Project>{3681A9A8-FC40-4125-B842-7775713C8DCE}</Project>
       <Name>Web</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(ScriptInfo)" DestinationFiles="$(OutputPath)$(AssemblyName).txt" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Libraries/jQuery/jQuery.Core/jQuery.cs b/src/Libraries/jQuery/jQuery.Core/jQuery.cs
index 8dd72c3a2..672998cc1 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQuery.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQuery.cs
@@ -1,14 +1,12 @@
 // jQuery.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Html;
 using System.Net;
 using System.Runtime.CompilerServices;
@@ -109,18 +107,6 @@ public static jQuery Instance {
             }
         }
 
-        /// <summary>
-        /// Gets or sets the number of waits delaying the ready event.
-        /// </summary>
-        [IntrinsicProperty]
-        public static int ReadyWait {
-            get {
-                return 0;
-            }
-            set {
-            }
-        }
-
         /// <summary>
         /// Gets information about supported features and browser capabilities.
         /// </summary>
@@ -160,7 +146,7 @@ public static jQueryObject Window {
         /// </summary>
         /// <param name="url">The endpoint to which the request is issued.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> Ajax(string url) {
+        public static jQueryXmlHttpRequest Ajax(string url) {
             return null;
         }
 
@@ -170,7 +156,7 @@ public static jQueryXmlHttpRequest<object> Ajax(string url) {
         /// <param name="url">The endpoint to which the request is issued.</param>
         /// <param name="options">The options and settings for the request to invoke.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> Ajax(string url, jQueryAjaxOptions options) {
+        public static jQueryXmlHttpRequest Ajax(string url, jQueryAjaxOptions options) {
             return null;
         }
 
@@ -179,7 +165,7 @@ public static jQueryXmlHttpRequest<object> Ajax(string url, jQueryAjaxOptions op
         /// </summary>
         /// <param name="options">The options and settings for the request to invoke.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> Ajax(jQueryAjaxOptions options) {
+        public static jQueryXmlHttpRequest Ajax(jQueryAjaxOptions options) {
             return null;
         }
 
@@ -189,7 +175,7 @@ public static jQueryXmlHttpRequest<object> Ajax(jQueryAjaxOptions options) {
         /// <param name="url">The endpoint to which the request is issued.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("ajax")]
-        public static jQueryXmlHttpRequest<TData> AjaxRequest<TData>(string url) {
+        public static jQueryDataHttpRequest<TData> AjaxRequest<TData>(string url) {
             return null;
         }
 
@@ -200,7 +186,7 @@ public static jQueryXmlHttpRequest<TData> AjaxRequest<TData>(string url) {
         /// <param name="options">The options and settings for the request to invoke.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("ajax")]
-        public static jQueryXmlHttpRequest<TData> AjaxRequest<TData>(string url, jQueryAjaxOptions options) {
+        public static jQueryDataHttpRequest<TData> AjaxRequest<TData>(string url, jQueryAjaxOptions options) {
             return null;
         }
 
@@ -210,7 +196,7 @@ public static jQueryXmlHttpRequest<TData> AjaxRequest<TData>(string url, jQueryA
         /// <param name="options">The options and settings for the request to invoke.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("ajax")]
-        public static jQueryXmlHttpRequest<TData> AjaxRequest<TData>(jQueryAjaxOptions options) {
+        public static jQueryDataHttpRequest<TData> AjaxRequest<TData>(jQueryAjaxOptions options) {
             return null;
         }
 
@@ -221,6 +207,18 @@ public static jQueryXmlHttpRequest<TData> AjaxRequest<TData>(jQueryAjaxOptions o
         public static void AjaxSetup(jQueryAjaxOptions options) {
         }
 
+        /// <summary>
+        /// Creates an instance of a custom jQueryEvent object that contains custom
+        /// data members.
+        /// </summary>
+        /// <param name="eventName">The name of the event.</param>
+        /// <typeparam name="TEvent">The type of the event to create.</typeparam>
+        /// <returns>A new jQueryEvent object.</returns>
+        [ScriptName("event")]
+        public static TEvent CustomEvent<TEvent>(string eventName) where TEvent : jQueryEvent {
+            return null;
+        }
+
         /// <summary>
         /// Creates a new instance of a deferred object.
         /// </summary>
@@ -229,6 +227,15 @@ public static jQueryDeferred Deferred() {
             return null;
         }
 
+        /// <summary>
+        /// Creates a new instance of a deferred object.
+        /// </summary>
+        [PreserveCase]
+        [ScriptName("Deferred")]
+        public static jQueryDeferred<TData> DeferredData<TData>() {
+            return null;
+        }
+
         /// <summary>
         /// Creates a new instance of a deferred object.
         /// </summary>
@@ -238,6 +245,16 @@ public static jQueryDeferred Deferred(jQueryDeferredInitializer initializer) {
             return null;
         }
 
+        /// <summary>
+        /// Creates a new instance of a deferred object.
+        /// </summary>
+        /// <param name="initializer">An initializer callback to initialize the new deferred object.</param>
+        [PreserveCase]
+        [ScriptName("Deferred")]
+        public static jQueryDeferred<TData> DeferredData<TData>(jQueryDeferredInitializer<TData> initializer) {
+            return null;
+        }
+
         /// <summary>
         /// Iterates over items in the specified array and calls the callback
         /// for each item in the array.
@@ -447,13 +464,22 @@ public static jQueryObject FromObject(object o) {
             return null;
         }
 
+        /// <summary>
+        /// Load data from the server using a HTTP GET request.
+        /// </summary>
+        /// <param name="url">The URL to request.</param>
+        /// <returns>The jQueryXmlHttpRequest object.</returns>
+        public static jQueryXmlHttpRequest Get(string url) {
+            return null;
+        }
+
         /// <summary>
         /// Load data from the server using a HTTP GET request.
         /// </summary>
         /// <param name="url">The URL to request.</param>
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> Get(string url, AjaxCallback<object> callback) {
+        public static jQueryXmlHttpRequest Get(string url, AjaxCallback<object> callback) {
             return null;
         }
 
@@ -464,7 +490,7 @@ public static jQueryXmlHttpRequest<object> Get(string url, AjaxCallback<object>
         /// <param name="data">A string or dictionary containing the data sent with the request.</param>
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> Get(string url, object data, AjaxCallback<object> callback) {
+        public static jQueryXmlHttpRequest Get(string url, object data, AjaxCallback<object> callback) {
             return null;
         }
 
@@ -475,7 +501,7 @@ public static jQueryXmlHttpRequest<object> Get(string url, object data, AjaxCall
         /// <param name="data">A string or dictionary containing the data sent with the request.</param>
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> Get(string url, object data, AjaxRequestCallback<object> callback) {
+        public static jQueryXmlHttpRequest Get(string url, object data, AjaxRequestCallback<object> callback) {
             return null;
         }
 
@@ -487,7 +513,7 @@ public static jQueryXmlHttpRequest<object> Get(string url, object data, AjaxRequ
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <param name="dataType">The type of data expected in the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> Get(string url, object data, AjaxCallback<object> callback, string dataType) {
+        public static jQueryXmlHttpRequest Get(string url, object data, AjaxCallback<object> callback, string dataType) {
             return null;
         }
 
@@ -499,7 +525,17 @@ public static jQueryXmlHttpRequest<object> Get(string url, object data, AjaxCall
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <param name="dataType">The type of data expected in the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> Get(string url, object data, AjaxRequestCallback<object> callback, string dataType) {
+        public static jQueryXmlHttpRequest Get(string url, object data, AjaxRequestCallback<object> callback, string dataType) {
+            return null;
+        }
+
+        /// <summary>
+        /// Load data from the server using a HTTP GET request.
+        /// </summary>
+        /// <param name="url">The URL to request.</param>
+        /// <returns>The jQueryXmlHttpRequest object.</returns>
+        [ScriptName("get")]
+        public static jQueryDataHttpRequest<TData> GetData<TData>(string url) {
             return null;
         }
 
@@ -510,7 +546,7 @@ public static jQueryXmlHttpRequest<object> Get(string url, object data, AjaxRequ
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("get")]
-        public static jQueryXmlHttpRequest<TData> GetData<TData>(string url, AjaxCallback<TData> callback) {
+        public static jQueryDataHttpRequest<TData> GetData<TData>(string url, AjaxCallback<TData> callback) {
             return null;
         }
 
@@ -522,7 +558,7 @@ public static jQueryXmlHttpRequest<TData> GetData<TData>(string url, AjaxCallbac
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("get")]
-        public static jQueryXmlHttpRequest<TData> GetData<TData>(string url, object data, AjaxCallback<TData> callback) {
+        public static jQueryDataHttpRequest<TData> GetData<TData>(string url, object data, AjaxCallback<TData> callback) {
             return null;
         }
 
@@ -534,7 +570,7 @@ public static jQueryXmlHttpRequest<TData> GetData<TData>(string url, object data
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("get")]
-        public static jQueryXmlHttpRequest<TData> GetData<TData>(string url, object data, AjaxRequestCallback<TData> callback) {
+        public static jQueryDataHttpRequest<TData> GetData<TData>(string url, object data, AjaxRequestCallback<TData> callback) {
             return null;
         }
 
@@ -547,7 +583,7 @@ public static jQueryXmlHttpRequest<TData> GetData<TData>(string url, object data
         /// <param name="dataType">The type of data expected in the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("get")]
-        public static jQueryXmlHttpRequest<TData> GetData<TData>(string url, object data, AjaxCallback<TData> callback, string dataType) {
+        public static jQueryDataHttpRequest<TData> GetData<TData>(string url, object data, AjaxCallback<TData> callback, string dataType) {
             return null;
         }
 
@@ -560,7 +596,17 @@ public static jQueryXmlHttpRequest<TData> GetData<TData>(string url, object data
         /// <param name="dataType">The type of data expected in the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("get")]
-        public static jQueryXmlHttpRequest<TData> GetData<TData>(string url, object data, AjaxRequestCallback<TData> callback, string dataType) {
+        public static jQueryDataHttpRequest<TData> GetData<TData>(string url, object data, AjaxRequestCallback<TData> callback, string dataType) {
+            return null;
+        }
+
+        /// <summary>
+        /// Load JSON data from the server using a HTTP GET request.
+        /// </summary>
+        /// <param name="url">The URL to request.</param>
+        /// <returns>The jQueryXmlHttpRequest object.</returns>
+        [ScriptName("getJSON")]
+        public static jQueryXmlHttpRequest GetJson(string url) {
             return null;
         }
 
@@ -571,7 +617,7 @@ public static jQueryXmlHttpRequest<TData> GetData<TData>(string url, object data
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("getJSON")]
-        public static jQueryXmlHttpRequest<object> GetJson(string url, AjaxCallback<object> callback) {
+        public static jQueryXmlHttpRequest GetJson(string url, AjaxCallback<object> callback) {
             return null;
         }
 
@@ -583,7 +629,17 @@ public static jQueryXmlHttpRequest<object> GetJson(string url, AjaxCallback<obje
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("getJSON")]
-        public static jQueryXmlHttpRequest<object> GetJson(string url, object data, AjaxCallback<object> callback) {
+        public static jQueryXmlHttpRequest GetJson(string url, object data, AjaxCallback<object> callback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Load JSON data from the server using a HTTP GET request.
+        /// </summary>
+        /// <param name="url">The URL to request.</param>
+        /// <returns>The jQueryXmlHttpRequest object.</returns>
+        [ScriptName("getJSON")]
+        public static jQueryDataHttpRequest<TData> GetJsonData<TData>(string url) {
             return null;
         }
 
@@ -594,7 +650,7 @@ public static jQueryXmlHttpRequest<object> GetJson(string url, object data, Ajax
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("getJSON")]
-        public static jQueryXmlHttpRequest<TData> GetJsonData<TData>(string url, AjaxCallback<TData> callback) {
+        public static jQueryDataHttpRequest<TData> GetJsonData<TData>(string url, AjaxCallback<TData> callback) {
             return null;
         }
 
@@ -606,7 +662,7 @@ public static jQueryXmlHttpRequest<TData> GetJsonData<TData>(string url, AjaxCal
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("getJSON")]
-        public static jQueryXmlHttpRequest<TData> GetJsonData<TData>(string url, object data, AjaxCallback<TData> callback) {
+        public static jQueryDataHttpRequest<TData> GetJsonData<TData>(string url, object data, AjaxCallback<TData> callback) {
             return null;
         }
 
@@ -615,7 +671,7 @@ public static jQueryXmlHttpRequest<TData> GetJsonData<TData>(string url, object
         /// </summary>
         /// <param name="url">The URL to request.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> GetScript(string url) {
+        public static jQueryXmlHttpRequest GetScript(string url) {
             return null;
         }
 
@@ -625,7 +681,7 @@ public static jQueryXmlHttpRequest<object> GetScript(string url) {
         /// <param name="url">The URL to request.</param>
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> GetScript(string url, AjaxCallback<object> callback) {
+        public static jQueryXmlHttpRequest GetScript(string url, AjaxCallback<object> callback) {
             return null;
         }
 
@@ -654,6 +710,13 @@ public static Array Grep(Array a, ArrayFilterCallback callback, bool invert) {
 
         // TODO: Add generic version of Grep
 
+        /// <summary>
+        /// Holds or releases the execution of jQuery's ready event.
+        /// </summary>
+        /// <param name="hold">Indicates whether the ready hold is being requested or released.</param>
+        public static void HoldReady(bool hold) {
+        }
+
         /// <summary>
         /// Gets the index of the specified value within the specified array.
         /// </summary>
@@ -711,6 +774,17 @@ public static Array MakeArray(object o) {
             return null;
         }
 
+        /// <summary>
+        /// Returns a new object by mapping each item in the specified object
+        /// using the provided callback.
+        /// </summary>
+        /// <param name="o">The object to map.</param>
+        /// <param name="callback">The function that performs the mapping.</param>
+        /// <returns>The array of mapped values.</returns>
+        public static object Map(object o, ObjectMapCallback callback) {
+            return null;
+        }
+
         /// <summary>
         /// Returns a new array by mapping each item in the specified array
         /// using the provided callback.
@@ -777,12 +851,42 @@ public static string Param(object o) {
             return null;
         }
 
+        /// <summary>
+        /// Parses the specified well-formed json string into an object.
+        /// </summary>
+        /// <param name="json">The json string.</param>
+        /// <returns>The parsed document.</returns>
+        [ScriptName("parseJSON")]
+        public static object ParseJson(string json) {
+            return null;
+        }
+
+        /// <summary>
+        /// Parses the specified well-formed json string into an object.
+        /// </summary>
+        /// <param name="json">The json string.</param>
+        /// <returns>The parsed document.</returns>
+        [ScriptName("parseJSON")]
+        public static TData ParseJsonData<TData>(string json) {
+            return default(TData);
+        }
+
         /// <summary>
         /// Parses the specified well-formed xml data into an XML document.
         /// </summary>
         /// <param name="data">The xml markup.</param>
         /// <returns>The parsed document.</returns>
-        public XmlDocument ParseXml(string data) {
+        [ScriptName("parseXML")]
+        public static XmlDocument ParseXml(string data) {
+            return null;
+        }
+
+        /// <summary>
+        /// Post data to the server using a HTTP POST request.
+        /// </summary>
+        /// <param name="url">The URL to request.</param>
+        /// <returns>The jQueryXmlHttpRequest object.</returns>
+        public static jQueryXmlHttpRequest Post(string url) {
             return null;
         }
 
@@ -792,7 +896,17 @@ public XmlDocument ParseXml(string data) {
         /// <param name="url">The URL to request.</param>
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> Post(string url, AjaxCallback<object> callback) {
+        public static jQueryXmlHttpRequest Post(string url, AjaxCallback<object> callback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Post data to the server using a HTTP POST request.
+        /// </summary>
+        /// <param name="url">The URL to request.</param>
+        /// <param name="data">A string or dictionary containing the data sent with the request.</param>
+        /// <returns>The jQueryXmlHttpRequest object.</returns>
+        public static jQueryXmlHttpRequest Post(string url, object data) {
             return null;
         }
 
@@ -803,7 +917,7 @@ public static jQueryXmlHttpRequest<object> Post(string url, AjaxCallback<object>
         /// <param name="data">A string or dictionary containing the data sent with the request.</param>
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> Post(string url, object data, AjaxCallback<object> callback) {
+        public static jQueryXmlHttpRequest Post(string url, object data, AjaxCallback<object> callback) {
             return null;
         }
 
@@ -814,7 +928,7 @@ public static jQueryXmlHttpRequest<object> Post(string url, object data, AjaxCal
         /// <param name="data">A string or dictionary containing the data sent with the request.</param>
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> Post(string url, object data, AjaxRequestCallback<object> callback) {
+        public static jQueryXmlHttpRequest Post(string url, object data, AjaxRequestCallback<object> callback) {
             return null;
         }
 
@@ -826,7 +940,7 @@ public static jQueryXmlHttpRequest<object> Post(string url, object data, AjaxReq
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <param name="dataType">The type of data expected in the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> Post(string url, object data, AjaxCallback<object> callback, string dataType) {
+        public static jQueryXmlHttpRequest Post(string url, object data, AjaxCallback<object> callback, string dataType) {
             return null;
         }
 
@@ -838,7 +952,17 @@ public static jQueryXmlHttpRequest<object> Post(string url, object data, AjaxCal
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <param name="dataType">The type of data expected in the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
-        public static jQueryXmlHttpRequest<object> Post(string url, object data, AjaxRequestCallback<object> callback, string dataType) {
+        public static jQueryXmlHttpRequest Post(string url, object data, AjaxRequestCallback<object> callback, string dataType) {
+            return null;
+        }
+
+        /// <summary>
+        /// Post data to the server using a HTTP POST request.
+        /// </summary>
+        /// <param name="url">The URL to request.</param>
+        /// <returns>The jQueryXmlHttpRequest object.</returns>
+        [ScriptName("post")]
+        public static jQueryDataHttpRequest<TData> PostRequest<TData>(string url) {
             return null;
         }
 
@@ -849,7 +973,7 @@ public static jQueryXmlHttpRequest<object> Post(string url, object data, AjaxReq
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("post")]
-        public static jQueryXmlHttpRequest<TData> PostRequest<TData>(string url, AjaxCallback<TData> callback) {
+        public static jQueryDataHttpRequest<TData> PostRequest<TData>(string url, AjaxCallback<TData> callback) {
             return null;
         }
 
@@ -861,7 +985,7 @@ public static jQueryXmlHttpRequest<TData> PostRequest<TData>(string url, AjaxCal
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("post")]
-        public static jQueryXmlHttpRequest<TData> PostRequest<TData>(string url, object data, AjaxCallback<TData> callback) {
+        public static jQueryDataHttpRequest<TData> PostRequest<TData>(string url, object data, AjaxCallback<TData> callback) {
             return null;
         }
 
@@ -873,7 +997,7 @@ public static jQueryXmlHttpRequest<TData> PostRequest<TData>(string url, object
         /// <param name="callback">The callback to invoke with the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("post")]
-        public static jQueryXmlHttpRequest<TData> PostRequest<TData>(string url, object data, AjaxRequestCallback<TData> callback) {
+        public static jQueryDataHttpRequest<TData> PostRequest<TData>(string url, object data, AjaxRequestCallback<TData> callback) {
             return null;
         }
 
@@ -886,7 +1010,7 @@ public static jQueryXmlHttpRequest<TData> PostRequest<TData>(string url, object
         /// <param name="dataType">The type of data expected in the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("post")]
-        public static jQueryXmlHttpRequest<TData> PostRequest<TData>(string url, object data, AjaxCallback<TData> callback, string dataType) {
+        public static jQueryDataHttpRequest<TData> PostRequest<TData>(string url, object data, AjaxCallback<TData> callback, string dataType) {
             return null;
         }
 
@@ -899,7 +1023,7 @@ public static jQueryXmlHttpRequest<TData> PostRequest<TData>(string url, object
         /// <param name="dataType">The type of data expected in the response.</param>
         /// <returns>The jQueryXmlHttpRequest object.</returns>
         [ScriptName("post")]
-        public static jQueryXmlHttpRequest<TData> PostRequest<TData>(string url, object data, AjaxRequestCallback<TData> callback, string dataType) {
+        public static jQueryDataHttpRequest<TData> PostRequest<TData>(string url, object data, AjaxRequestCallback<TData> callback, string dataType) {
             return null;
         }
 
@@ -910,7 +1034,7 @@ public static jQueryXmlHttpRequest<TData> PostRequest<TData>(string url, object
         /// <param name="selector">The selector to match elements.</param>
         /// <returns>The resulting jQueryObject instance.</returns>
         [ScriptAlias("$")]
-        public static jQueryObject Select(string selector) {
+        public static jQueryObject Select([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -923,7 +1047,7 @@ public static jQueryObject Select(string selector) {
         /// <param name="document">The document to search within.</param>
         /// <returns>The resulting jQueryObject instance.</returns>
         [ScriptAlias("$")]
-        public static jQueryObject Select(string selector, DocumentInstance document) {
+        public static jQueryObject Select([SyntaxValidation("cssSelector")] string selector, DocumentInstance document) {
             return null;
         }
 
@@ -936,7 +1060,7 @@ public static jQueryObject Select(string selector, DocumentInstance document) {
         /// <param name="rootElement">The root element to begin the search at.</param>
         /// <returns>The resulting jQueryObject instance.</returns>
         [ScriptAlias("$")]
-        public static jQueryObject Select(string selector, Element rootElement) {
+        public static jQueryObject Select([SyntaxValidation("cssSelector")] string selector, Element rootElement) {
             return null;
         }
 
@@ -949,7 +1073,7 @@ public static jQueryObject Select(string selector, Element rootElement) {
         /// <param name="context">The context to scope the selection.</param>
         /// <returns>The resulting jQueryObject instance.</returns>
         [ScriptAlias("$")]
-        public static jQueryObject Select(string selector, jQueryObject context) {
+        public static jQueryObject Select([SyntaxValidation("cssSelector")] string selector, jQueryObject context) {
             return null;
         }
 
@@ -991,5 +1115,16 @@ public static IDeferred When(params IDeferred[] deferreds) {
         public static IDeferred When(params object[] deferreds) {
             return null;
         }
+
+        /// <summary>
+        /// Creates a deferred object representing the aggregate of the specified
+        /// deferred objects.
+        /// </summary>
+        /// <param name="deferreds">The set of deferred objects.</param>
+        /// <returns>A deferred object representing the individual deferred objects.</returns>
+        [ScriptName("when")]
+        public static IDeferred<TData> WhenData<TData>(params IDeferred<TData>[] deferreds) {
+            return null;
+        }
     }
 }
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryAjaxOptions.cs b/src/Libraries/jQuery/jQuery.Core/jQueryAjaxOptions.cs
index a940aa229..5f64eaa73 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQueryAjaxOptions.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryAjaxOptions.cs
@@ -1,13 +1,10 @@
 // jQueryAjaxOptions.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using System.Html;
 using System.Runtime.CompilerServices;
 
@@ -35,6 +32,18 @@ public jQueryAjaxOptions() {
         public jQueryAjaxOptions(params object[] nameValuePairs) {
         }
 
+        /// <summary>
+        /// Gets or sets the content type sent in the request header that tells the server what kind of response it will accept in return.
+        /// </summary>
+        [IntrinsicProperty]
+        public Dictionary<string, string> Accepts {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
         /// <summary>
         /// Gets or sets whether the request is async.
         /// </summary>
@@ -51,7 +60,7 @@ public bool Async {
         /// Gets or sets the callback to invoke before the request is sent.
         /// </summary>
         [IntrinsicProperty]
-        public AjaxSendingCallback<object> BeforeSend {
+        public AjaxSendingCallback BeforeSend {
             get {
                 return null;
             }
@@ -76,7 +85,19 @@ public bool Cache {
         /// and success or error callbacks have been invoked.
         /// </summary>
         [IntrinsicProperty]
-        public AjaxCompletedCallback<object> Complete {
+        public AjaxCompletedCallback Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a map of string/regular-expression pairs that determine how jQuery will parse the response, given its content type.
+        /// </summary>
+        [IntrinsicProperty]
+        public Dictionary<string, RegularExpression> Contents {
             get {
                 return null;
             }
@@ -97,10 +118,10 @@ public string ContentType {
         }
 
         /// <summary>
-        /// Gets or sets the element that will be the context for the request.
+        /// Gets or sets the object that will be the context for the request.
         /// </summary>
         [IntrinsicProperty]
-        public Element Context {
+        public object Context {
             get {
                 return null;
             }
@@ -108,6 +129,30 @@ public Element Context {
             }
         }
 
+        /// <summary>
+        /// Gets or sets a map of dataType-to-dataType converters.
+        /// </summary>
+        [IntrinsicProperty]
+        public Dictionary<string, Func<string, object>> Converters {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets if you wish to force a crossDomain request (such as JSONP) on the same domain, set the value of crossDomain to true
+        /// </summary>
+        [IntrinsicProperty]
+        public bool CrossDomain {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
         /// <summary>
         /// Gets or sets the data to be sent to the server.
         /// </summary>
@@ -136,7 +181,7 @@ public string DataType {
         /// Gets or sets the callback to be invoked if the request fails.
         /// </summary>
         [IntrinsicProperty]
-        public AjaxErrorCallback<object> Error {
+        public AjaxErrorCallback Error {
             get {
                 return null;
             }
@@ -156,6 +201,18 @@ public bool Global {
             }
         }
 
+        /// <summary>
+        /// Gets or sets if a map of additional header key/value pairs to send along with the request.
+        /// </summary>
+        [IntrinsicProperty]
+        public Dictionary<string, string> Headers {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
         /// <summary>
         /// Gets or sets whether the request is successful only if its been modified since
         /// the last request.
@@ -182,11 +239,22 @@ public bool IsLocal {
             }
         }
 
+        /// <summary>
+        /// Gets or sets the callback parameter name to use for JSONP requests.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Jsonp {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
         /// <summary>
         /// Gets or sets the callback name to use for JSONP requests.
         /// </summary>
         [IntrinsicProperty]
-        [ScriptName("jsonp")]
         public string JsonpCallback {
             get {
                 return null;
@@ -243,11 +311,23 @@ public string ScriptCharset {
             }
         }
 
+        /// <summary>
+        /// Gets or sets a map of numeric HTTP codes and functions to be called when the response has the corresponding code.
+        /// </summary>
+        [IntrinsicProperty]
+        public Dictionary<int, Action> StatusCode {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
         /// <summary>
         /// Gets or sets the function to invoke upon successful completion of the request.
         /// </summary>
         [IntrinsicProperty]
-        public AjaxRequestCallback<object> Success {
+        public AjaxRequestCallback Success {
             get {
                 return null;
             }
@@ -320,7 +400,7 @@ public string Username {
         /// </summary>
         [IntrinsicProperty]
         [ScriptName("xhr")]
-        public XmlHttpRequestCreator<object> XmlHttpRequestCreator {
+        public XmlHttpRequestCreator XmlHttpRequestCreator {
             get {
                 return null;
             }
@@ -333,7 +413,7 @@ public XmlHttpRequestCreator<object> XmlHttpRequestCreator {
         /// object.
         /// </summary>
         [IntrinsicProperty]
-        public Dictionary XhrFields {
+        public Dictionary<string, object> XhrFields {
             get {
                 return null;
             }
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryBrowser.cs b/src/Libraries/jQuery/jQuery.Core/jQueryBrowser.cs
index da3613cd9..211a9e622 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQueryBrowser.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryBrowser.cs
@@ -1,9 +1,6 @@
 // jQueryBrowser.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryDataHttpRequest.cs b/src/Libraries/jQuery/jQuery.Core/jQueryDataHttpRequest.cs
new file mode 100644
index 000000000..00b33a8c3
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryDataHttpRequest.cs
@@ -0,0 +1,337 @@
+// jQueryDataHttpRequest.cs
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Net;
+using System.Runtime.CompilerServices;
+using System.Xml;
+
+namespace jQueryApi {
+
+    /// <summary>
+    /// Represents an XMLHttpRequest object as a deferred object.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class jQueryDataHttpRequest<TData> : IDeferred<TData> {
+
+        private jQueryDataHttpRequest() {
+        }
+
+        /// <summary>
+        /// The ready state property of the XmlHttpRequest object.
+        /// </summary>
+        [IntrinsicProperty]
+        public ReadyState ReadyState {
+            get {
+                return ReadyState.Uninitialized;
+            }
+        }
+
+        /// <summary>
+        /// The XML document for an XML response.
+        /// </summary>
+        [IntrinsicProperty]
+        [ScriptName("responseXML")]
+        public XmlDocument ResponseXml {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// The text of the response.
+        /// </summary>
+        [IntrinsicProperty]
+        public string ResponseText {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// The status code associated with the response.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Status {
+            get {
+                return 0;
+            }
+        }
+
+        /// <summary>
+        /// The status text of the response.
+        /// </summary>
+        [IntrinsicProperty]
+        public string StatusText {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Aborts the request.
+        /// </summary>
+        public void Abort() {
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request completes or fails.
+        /// </summary>
+        /// <param name="callbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TData> Always(params Action[] callbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request completes or fails.
+        /// </summary>
+        /// <param name="callbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TData> Always(params Action<TData>[] callbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Adds a callback to handle completion of the request.
+        /// </summary>
+        /// <param name="callback">The callback to invoke.</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TData> Complete(AjaxCompletedCallback<TData> callback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request is successfully completed. If the
+        /// request is already completed, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TData> Done(params Action[] doneCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request is successfully completed. If the
+        /// request is already completed, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TData> Done(params Action<TData>[] doneCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Adds a callback to handle an error completing the request.
+        /// </summary>
+        /// <param name="callback">The callback to invoke.</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TData> Error(AjaxErrorCallback<TData> callback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request errors. If the
+        /// request is already completed, the handlers are still invoked.
+        /// </summary>
+        /// <param name="failCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TData> Fail(params Action[] failCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request errors. If the
+        /// request is already completed, the handlers are still invoked.
+        /// </summary>
+        /// <param name="failCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TData> Fail(params Action<TData>[] failCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the response headers associated with the request.
+        /// </summary>
+        /// <returns>The response headers.</returns>
+        public string GetAllResponseHeaders() {
+            return null;
+        }
+
+        /// <summary>
+        /// Gets a specific response header associated with the request.
+        /// </summary>
+        /// <param name="name">The name of the response header.</param>
+        /// <returns>The response header value.</returns>
+        public string GetResponseHeader(string name) {
+            return null;
+        }
+
+        /// <summary>
+        /// Sets the mime type on the request.
+        /// </summary>
+        /// <param name="type">The mime type to use.</param>
+        public void OverrideMimeType(string type) {
+        }
+
+        /// <summary>
+        /// Filters or chains the result of the request.
+        /// </summary>
+        /// <param name="successFilter">The filter to invoke when the request successfully completes.</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TTargetData> Pipe<TTargetData>(jQueryDeferredFilter<TTargetData, TData> successFilter) {
+            return null;
+        }
+
+        /// <summary>
+        /// Filters or chains the result of the request.
+        /// </summary>
+        /// <param name="successFilter">The filter to invoke when the request successfully completes.</param>
+        /// <param name="failFilter">The filter to invoke when the request fails.</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TTargetData> Pipe<TTargetData>(jQueryDeferredFilter<TTargetData, TData> successFilter, jQueryDeferredFilter<TTargetData> failFilter) {
+            return null;
+        }
+
+        public jQueryDataHttpRequest<TTargetData> Pipe<TTargetData>(Func<TData, jQueryDataHttpRequest<TTargetData>> successChain) {
+            return null;
+        }
+
+        /// <summary>
+        /// Sets a request header value.
+        /// </summary>
+        /// <param name="name">The name of the request header.</param>
+        /// <param name="value">The value of the request header.</param>
+        public void SetRequestHeader(string name, string value) {
+        }
+
+        /// <summary>
+        /// Adds a callback to handle a successful completion of the request.
+        /// </summary>
+        /// <param name="callback">The callback to invoke.</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TData> Success(AjaxCallback<TData> callback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Adds a callback to handle a successful completion of the request.
+        /// </summary>
+        /// <param name="callback">The callback to invoke.</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TData> Success(AjaxRequestCallback<TData> callback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request is completed. If the
+        /// request is already completed, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallback">The callback to invoke when the request completes successfully.</param>
+        /// <param name="failCallback">The callback to invoke when the request completes with an error.</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TData> Then(Action doneCallback, Action failCallback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request is completed. If the
+        /// request is already completed, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallback">The callback to invoke when the request completes successfully.</param>
+        /// <param name="failCallback">The callback to invoke when the request completes with an error.</param>
+        /// <returns>The current request object.</returns>
+        public jQueryDataHttpRequest<TData> Then(Action<TData> doneCallback, Action<TData> failCallback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request is completed. If the
+        /// request is already completed, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke when the request completes successfully.</param>
+        /// <param name="failCallbacks">The callbacks to invoke when the request completes with an error.</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDataHttpRequest<TData> Then(Action[] doneCallbacks, Action[] failCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request is completed. If the
+        /// request is already completed, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke when the request completes successfully.</param>
+        /// <param name="failCallbacks">The callbacks to invoke when the request completes with an error.</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDataHttpRequest<TData> Then(Action<TData>[] doneCallbacks, Action<TData>[] failCallbacks) {
+            return null;
+        }
+
+        #region Implementation of IDeferred
+
+        IDeferred<TData> IDeferred<TData>.Always(params Action[] callbacks) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Always(params Action<TData>[] callbacks) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Done(params Action[] doneCallbacks) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Done(params Action<TData>[] doneCallbacks) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Fail(params Action[] failCallbacks) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Fail(params Action<TData>[] failCallbacks) {
+            return null;
+        }
+
+        bool IDeferred<TData>.IsRejected() {
+            return false;
+        }
+
+        bool IDeferred<TData>.IsResolved() {
+            return false;
+        }
+
+        IDeferred<TTargetData> IDeferred<TData>.Pipe<TTargetData>(Func<TData, IDeferred<TTargetData>> successFilter) {
+            return null;
+        }
+
+        IDeferred<TTargetData> IDeferred<TData>.Pipe<TTargetData>(jQueryDeferredFilter<TTargetData, TData> successFilter) {
+            return null;
+        }
+
+        IDeferred<TTargetData> IDeferred<TData>.Pipe<TTargetData>(jQueryDeferredFilter<TTargetData, TData> successFilter, jQueryDeferredFilter<TTargetData> failFilter) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Then(Action doneCallback, Action failCallback) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Then(Action<TData> doneCallback, Action<TData> failCallback) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Then(Action[] doneCallbacks, Action[] failCallbacks) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Then(Action<TData>[] doneCallbacks, Action<TData>[] failCallbacks) {
+            return null;
+        }
+
+        #endregion
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryDeferred.cs b/src/Libraries/jQuery/jQuery.Core/jQueryDeferred.cs
index bdcc1f8ef..5611c91b1 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQueryDeferred.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryDeferred.cs
@@ -1,9 +1,6 @@
 // jQueryDeferred.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -21,13 +18,43 @@ public sealed class jQueryDeferred : IDeferred {
         private jQueryDeferred() {
         }
 
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or
+        /// rejected.
+        /// </summary>
+        /// <param name="callbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred Always(params Action[] callbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or
+        /// rejected.
+        /// </summary>
+        /// <param name="callbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred Always(params Callback[] callbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved. If the
+        /// deferred object is already resolved, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred Done(params Action[] doneCallbacks) {
+            return null;
+        }
+
         /// <summary>
         /// Add handlers to be called when the deferred object is resolved. If the
         /// deferred object is already resolved, the handlers are still invoked.
         /// </summary>
         /// <param name="doneCallbacks">The callbacks to invoke (in order).</param>
         /// <returns>The current deferred object.</returns>
-        public jQueryDeferred Done(params Delegate[] doneCallbacks) {
+        public jQueryDeferred Done(params Callback[] doneCallbacks) {
             return null;
         }
 
@@ -37,7 +64,17 @@ public jQueryDeferred Done(params Delegate[] doneCallbacks) {
         /// </summary>
         /// <param name="failCallbacks">The callbacks to invoke (in order).</param>
         /// <returns>The current deferred object.</returns>
-        public jQueryDeferred Fail(params Delegate[] failCallbacks) {
+        public jQueryDeferred Fail(params Action[] failCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is rejected. If the
+        /// deferred object is already resolved, the handlers are still invoked.
+        /// </summary>
+        /// <param name="failCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred Fail(params Callback[] failCallbacks) {
             return null;
         }
 
@@ -112,7 +149,18 @@ public jQueryDeferred ResolveWith(object context, params object[] args) {
         /// <param name="doneCallback">The callback to invoke when the object is resolved.</param>
         /// <param name="failCallback">The callback to invoke when the object is rejected.</param>
         /// <returns>The current deferred object.</returns>
-        public jQueryDeferred Then(Delegate doneCallback, Delegate failCallback) {
+        public jQueryDeferred Then(Action doneCallback, Action failCallback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or rejected.
+        /// If the object has already been resolved or rejected, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallback">The callback to invoke when the object is resolved.</param>
+        /// <param name="failCallback">The callback to invoke when the object is rejected.</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred Then(Callback doneCallback, Callback failCallback) {
             return null;
         }
 
@@ -123,17 +171,44 @@ public jQueryDeferred Then(Delegate doneCallback, Delegate failCallback) {
         /// <param name="doneCallbacks">The callbacks to invoke when the object is resolved.</param>
         /// <param name="failCallbacks">The callbacks to invoke when the object is rejected.</param>
         /// <returns>The current deferred object.</returns>
-        public jQueryDeferred Then(Delegate[] doneCallbacks, Delegate[] failCallbacks) {
+        public jQueryDeferred Then(Action[] doneCallbacks, Action[] failCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or rejected.
+        /// If the object has already been resolved or rejected, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke when the object is resolved.</param>
+        /// <param name="failCallbacks">The callbacks to invoke when the object is rejected.</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred Then(Callback[] doneCallbacks, Callback[] failCallbacks) {
             return null;
         }
 
         #region Implementation of IDeferred
 
-        IDeferred IDeferred.Done(params Delegate[] doneCallbacks) {
+        IDeferred IDeferred.Always(params Action[] callbacks) {
+            return null;
+        }
+
+        IDeferred IDeferred.Always(params Callback[] callbacks) {
+            return null;
+        }
+
+        IDeferred IDeferred.Done(params Action[] doneCallbacks) {
             return null;
         }
 
-        IDeferred IDeferred.Fail(params Delegate[] failCallbacks) {
+        IDeferred IDeferred.Done(params Callback[] doneCallbacks) {
+            return null;
+        }
+
+        IDeferred IDeferred.Fail(params Action[] failCallbacks) {
+            return null;
+        }
+
+        IDeferred IDeferred.Fail(params Callback[] failCallbacks) {
             return null;
         }
 
@@ -145,27 +220,272 @@ bool IDeferred.IsResolved() {
             return false;
         }
 
-        jQueryDeferred IDeferred.Reject(params object[] args) {
+        IDeferred IDeferred.Pipe(jQueryDeferredFilter successFilter) {
+            return null;
+        }
+
+        IDeferred IDeferred.Pipe(jQueryDeferredFilter successFilter, jQueryDeferredFilter failFilter) {
+            return null;
+        }
+
+        IDeferred IDeferred.Then(Action doneCallback, Action failCallback) {
+            return null;
+        }
+
+        IDeferred IDeferred.Then(Callback doneCallback, Callback failCallback) {
+            return null;
+        }
+
+        IDeferred IDeferred.Then(Action[] doneCallbacks, Action[] failCallbacks) {
+            return null;
+        }
+
+        IDeferred IDeferred.Then(Callback[] doneCallbacks, Callback[] failCallbacks) {
+            return null;
+        }
+
+        #endregion
+    }
+
+
+
+    /// <summary>
+    /// Represents a deferred value.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class jQueryDeferred<TData> : IDeferred<TData> {
+
+        private jQueryDeferred() {
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or
+        /// rejected.
+        /// </summary>
+        /// <param name="callbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> Always(params Action[] callbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or
+        /// rejected.
+        /// </summary>
+        /// <param name="callbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> Always(params Action<TData>[] callbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved. If the
+        /// deferred object is already resolved, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> Done(params Action[] doneCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved. If the
+        /// deferred object is already resolved, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> Done(params Action<TData>[] doneCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is rejected. If the
+        /// deferred object is already resolved, the handlers are still invoked.
+        /// </summary>
+        /// <param name="failCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> Fail(params Action[] failCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is rejected. If the
+        /// deferred object is already resolved, the handlers are still invoked.
+        /// </summary>
+        /// <param name="failCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> Fail(params Action<TData>[] failCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Determines whether the deferred object has been rejected.
+        /// </summary>
+        /// <returns>true if it has been rejected; false otherwise.</returns>
+        public bool IsRejected() {
+            return false;
+        }
+
+        /// <summary>
+        /// Determines whether the deferred object has been resolved.
+        /// </summary>
+        /// <returns>true if it has been resolved; false otherwise.</returns>
+        public bool IsResolved() {
+            return false;
+        }
+
+        /// <summary>
+        /// Returns a deferred object that can be further composed.
+        /// </summary>
+        /// <returns>A deferred object.</returns>
+        public IDeferred<TData> Promise() {
+            return null;
+        }
+
+        /// <summary>
+        /// Rejects the deferred object and call any failure callbacks with the specified arguments.
+        /// </summary>
+        /// <param name="args">The arguments to pass to the callbacks.</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> Reject(params TData[] args) {
+            return null;
+        }
+
+        /// <summary>
+        /// Rejects the deferred object and call any failure callbacks with the specified arguments
+        /// using the specified context as the this parameter.
+        /// </summary>
+        /// <param name="context">The context in which the callback is invoked.</param>
+        /// <param name="args">The arguments to pass to the callbacks.</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> RejectWith(object context, params TData[] args) {
+            return null;
+        }
+
+        /// <summary>
+        /// Resolves the deferred object and call any done callbacks with the specified arguments.
+        /// </summary>
+        /// <param name="args">The arguments to pass to the callbacks.</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> Resolve(params TData[] args) {
+            return null;
+        }
+
+        /// <summary>
+        /// Resolves the deferred object and call any failure callbacks with the specified arguments
+        /// using the specified context as the this parameter.
+        /// </summary>
+        /// <param name="context">The context in which the callback is invoked.</param>
+        /// <param name="args">The arguments to pass to the callbacks.</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> ResolveWith(object context, params TData[] args) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or rejected.
+        /// If the object has already been resolved or rejected, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallback">The callback to invoke when the object is resolved.</param>
+        /// <param name="failCallback">The callback to invoke when the object is rejected.</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> Then(Action doneCallback, Action failCallback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or rejected.
+        /// If the object has already been resolved or rejected, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallback">The callback to invoke when the object is resolved.</param>
+        /// <param name="failCallback">The callback to invoke when the object is rejected.</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> Then(Action<TData> doneCallback, Action<TData> failCallback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or rejected.
+        /// If the object has already been resolved or rejected, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke when the object is resolved.</param>
+        /// <param name="failCallbacks">The callbacks to invoke when the object is rejected.</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> Then(Action[] doneCallbacks, Action[] failCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the deferred object is resolved or rejected.
+        /// If the object has already been resolved or rejected, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke when the object is resolved.</param>
+        /// <param name="failCallbacks">The callbacks to invoke when the object is rejected.</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryDeferred<TData> Then(Action<TData>[] doneCallbacks, Action<TData>[] failCallbacks) {
+            return null;
+        }
+
+        #region Implementation of IDeferred
+
+        IDeferred<TData> IDeferred<TData>.Always(params Action[] callbacks) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Always(params Action<TData>[] callbacks) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Done(params Action[] doneCallbacks) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Done(params Action<TData>[] doneCallbacks) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Fail(params Action[] failCallbacks) {
+            return null;
+        }
+
+        IDeferred<TData> IDeferred<TData>.Fail(params Action<TData>[] failCallbacks) {
+            return null;
+        }
+
+        bool IDeferred<TData>.IsRejected() {
+            return false;
+        }
+
+        bool IDeferred<TData>.IsResolved() {
+            return false;
+        }
+
+        IDeferred<TTargetData> IDeferred<TData>.Pipe<TTargetData>(Func<TData, IDeferred<TTargetData>> successChain) {
+            return null;
+        }
+
+        IDeferred<TTargetData> IDeferred<TData>.Pipe<TTargetData>(jQueryDeferredFilter<TTargetData, TData> successFilter) {
             return null;
         }
 
-        IDeferred IDeferred.RejectWith(object context, params object[] args) {
+        IDeferred<TTargetData> IDeferred<TData>.Pipe<TTargetData>(jQueryDeferredFilter<TTargetData, TData> successFilter, jQueryDeferredFilter<TTargetData> failFilter) {
             return null;
         }
 
-        IDeferred IDeferred.Resolve(params object[] args) {
+        IDeferred<TData> IDeferred<TData>.Then(Action doneCallback, Action failCallback) {
             return null;
         }
 
-        IDeferred IDeferred.ResolveWith(object context, params object[] args) {
+        IDeferred<TData> IDeferred<TData>.Then(Action<TData> doneCallback, Action<TData> failCallback) {
             return null;
         }
 
-        jQueryDeferred IDeferred.Then(Delegate doneCallback, Delegate failCallback) {
+        IDeferred<TData> IDeferred<TData>.Then(Action[] doneCallbacks, Action[] failCallbacks) {
             return null;
         }
 
-        IDeferred IDeferred.Then(Delegate[] doneCallbacks, Delegate[] failCallbacks) {
+        IDeferred<TData> IDeferred<TData>.Then(Action<TData>[] doneCallbacks, Action<TData>[] failCallbacks) {
             return null;
         }
 
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryDeferredFilter.cs b/src/Libraries/jQuery/jQuery.Core/jQueryDeferredFilter.cs
new file mode 100644
index 000000000..929e353f6
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryDeferredFilter.cs
@@ -0,0 +1,30 @@
+// jQueryDeferredFilter.cs
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace jQueryApi {
+
+    /// <summary>
+    /// A callback that can filter a deferred object's resolved/rejected value.
+    /// </summary>
+    /// <param name="value">The value to be filtered.</param>
+    public delegate object jQueryDeferredFilter(object value);
+
+    /// <summary>
+    /// A callback that can filter a deferred object's resolved/rejected value.
+    /// </summary>
+    /// <param name="value">The value to be filtered.</param>
+    public delegate TTargetData jQueryDeferredFilter<TTargetData>(object value);
+
+    /// <summary>
+    /// A callback that can filter a deferred object's resolved/rejected value.
+    /// </summary>
+    /// <typeparam name="TTargetData">The type of target data.</typeparam>
+    /// <typeparam name="TSourceData">The type of source data.</typeparam>
+    /// <param name="value">The source value to be filtered.</param>
+    /// <returns>The target value.</returns>
+    public delegate TTargetData jQueryDeferredFilter<TTargetData, TSourceData>(TSourceData value);
+}
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryDeferredInitializer.cs b/src/Libraries/jQuery/jQuery.Core/jQueryDeferredInitializer.cs
index 13ad063c4..0915faa7c 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQueryDeferredInitializer.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryDeferredInitializer.cs
@@ -1,9 +1,6 @@
 // jQueryDeferredInitializer.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -15,4 +12,10 @@ namespace jQueryApi {
     /// </summary>
     /// <param name="deferred">The deferred object being created.</param>
     public delegate void jQueryDeferredInitializer(jQueryDeferred deferred);
+
+    /// <summary>
+    /// A callback that can initialize a deferred object during construction.
+    /// </summary>
+    /// <param name="deferred">The deferred object being created.</param>
+    public delegate void jQueryDeferredInitializer<TData>(jQueryDeferred<TData> deferred);
 }
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryEvent.cs b/src/Libraries/jQuery/jQuery.Core/jQueryEvent.cs
index a9c69ce49..dc3b823f1 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQueryEvent.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryEvent.cs
@@ -1,9 +1,6 @@
 // jQueryEvent.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -18,9 +15,58 @@ namespace jQueryApi {
     /// </summary>
     [Imported]
     [IgnoreNamespace]
-    public sealed class jQueryEvent {
+    public class jQueryEvent {
 
-        private jQueryEvent() {
+        protected jQueryEvent() {
+        }
+
+        [IntrinsicProperty]
+        public bool AltKey {
+            get {
+                return false;
+            }
+        }
+
+        [IntrinsicProperty]
+        public bool Bubbles {
+            get {
+                return false;
+            }
+        }
+
+        [IntrinsicProperty]
+        public int Button {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public bool Cancelable {
+            get {
+                return false;
+            }
+        }
+
+        [IntrinsicProperty]
+        public bool CtrlKey {
+            get {
+                return false;
+            }
+        }
+
+        [IntrinsicProperty]
+        public int ClientX {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public int ClientY {
+            get {
+                return 0;
+            }
         }
 
         /// <summary>
@@ -53,6 +99,27 @@ public string Namespace {
             }
         }
 
+        [IntrinsicProperty]
+        public int OffsetX {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public int OffsetY {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public Element OriginalTarget {
+            get {
+                return null;
+            }
+        }
+
         /// <summary>
         /// Gets the mouse position relative to left edge of the document.
         /// </summary>
@@ -73,6 +140,20 @@ public int PageY {
             }
         }
 
+        [IntrinsicProperty]
+        public int ScreenX {
+            get {
+                return 0;
+            }
+        }
+
+        [IntrinsicProperty]
+        public int ScreenY {
+            get {
+                return 0;
+            }
+        }
+
         /// <summary>
         /// Gets the other DOM element associated with the event if any.
         /// </summary>
@@ -93,6 +174,13 @@ public object Result {
             }
         }
 
+        [IntrinsicProperty]
+        public bool ShiftKey {
+            get {
+                return false;
+            }
+        }
+
         /// <summary>
         /// Gets the DOM element that initiated the event.
         /// </summary>
@@ -128,9 +216,9 @@ public string Type {
         /// Gets the key or button that was pressed.
         /// </summary>
         [IntrinsicProperty]
-        public string Which {
+        public int Which {
             get {
-                return null;
+                return 0;
             }
         }
 
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryEventHandler.cs b/src/Libraries/jQuery/jQuery.Core/jQueryEventHandler.cs
index cb7b42068..c29d61beb 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQueryEventHandler.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryEventHandler.cs
@@ -1,9 +1,6 @@
 // jQueryEventHandler.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryNameValuePair.cs b/src/Libraries/jQuery/jQuery.Core/jQueryNameValuePair.cs
index 426b22dab..10afe1abc 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQueryNameValuePair.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryNameValuePair.cs
@@ -1,9 +1,6 @@
 // jQueryNameValuePair.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryObject.cs b/src/Libraries/jQuery/jQuery.Core/jQueryObject.cs
index 948e3ea65..a80714367 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQueryObject.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryObject.cs
@@ -1,13 +1,11 @@
 // jQueryObject.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
 using System.Collections;
+using System.Diagnostics.CodeAnalysis;
 using System.Html;
 using System.Runtime.CompilerServices;
 
@@ -87,12 +85,21 @@ public jQueryObject Add(params Element[] elements) {
             return null;
         }
 
+        /// <summary>
+        /// Adds elements to the set of matched elements.
+        /// </summary>
+        /// <param name="elements">The jQuery object representing the elements to add.</param>
+        /// <returns>The new jQueryObject with added elements.</returns>
+        public jQueryObject Add(jQueryObject elements) {
+            return null;
+        }
+
         /// <summary>
         /// Adds elements to the set of matched elements.
         /// </summary>
         /// <param name="selector">The set of elements to select and add.</param>
         /// <returns>The new jQueryObject with added elements.</returns>
-        public jQueryObject Add(string selector) {
+        public jQueryObject Add([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -102,7 +109,7 @@ public jQueryObject Add(string selector) {
         /// <param name="selector">The set of elements to select and add.</param>
         /// <param name="context">The document to select elements from.</param>
         /// <returns>The new jQueryObject with added elements.</returns>
-        public jQueryObject Add(string selector, DocumentInstance context) {
+        public jQueryObject Add([SyntaxValidation("cssSelector")] string selector, DocumentInstance context) {
             return null;
         }
 
@@ -112,7 +119,7 @@ public jQueryObject Add(string selector, DocumentInstance context) {
         /// <param name="selector">The set of elements to select and add.</param>
         /// <param name="context">The root element to select elements from.</param>
         /// <returns>The new jQueryObject with added elements.</returns>
-        public jQueryObject Add(string selector, Element context) {
+        public jQueryObject Add([SyntaxValidation("cssSelector")] string selector, Element context) {
             return null;
         }
 
@@ -343,6 +350,15 @@ public jQueryObject Append(string content) {
             return null;
         }
 
+        /// <summary>
+        /// Insert content to the end of each element of the matching elements.
+        /// </summary>
+        /// <param name="content">The DOM element to append.</param>
+        /// <returns>The current jQueryObject</returns>
+        public jQueryObject Append(Element content) {
+            return null;
+        }
+
         /// <summary>
         /// Insert content to the end of each element of the matching elements.
         /// </summary>
@@ -387,7 +403,7 @@ public jQueryObject AppendTo(Element element) {
         /// </summary>
         /// <param name="selector">The elements to append to.</param>
         /// <returns>The resulting jQuery object</returns>
-        public jQueryObject AppendTo(string selector) {
+        public jQueryObject AppendTo([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -451,6 +467,15 @@ public jQueryObject Before(string content) {
             return null;
         }
 
+        /// <summary>
+        /// Insert content before each element of the matching elements.
+        /// </summary>
+        /// <param name="content">The DOM element to insert.</param>
+        /// <returns>The current jQueryObject</returns>
+        public jQueryObject Before(Element content) {
+            return null;
+        }
+
         /// <summary>
         /// Insert content before each element of the matching elements.
         /// </summary>
@@ -569,7 +594,7 @@ public jQueryObject Children() {
         /// </summary>
         /// <param name="selector">The selector to match children against.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject Children(string selector) {
+        public jQueryObject Children([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -630,13 +655,33 @@ public jQueryObject Clone(bool withDataAndEvents, bool deepWithDataAndEvents) {
             return null;
         }
 
+        /// <summary>
+        /// Returns a new jQueryObject with the closest ancestor matching
+        /// the specified element.
+        /// </summary>
+        /// <param name="element">The element to match against.</param>
+        /// <returns>The new jQueryObject.</returns>
+        public jQueryObject Closest(Element element) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a new jQueryObject with the closest ancestor matching
+        /// the specified set of elements.
+        /// </summary>
+        /// <param name="elements">The matched set of elements to lookup.</param>
+        /// <returns>The new jQueryObject.</returns>
+        public jQueryObject Closest(jQueryObject elements) {
+            return null;
+        }
+
         /// <summary>
         /// Returns a new jQueryObject with the closest ancestor matching
         /// the specified selector.
         /// </summary>
         /// <param name="selector">The selector used to match elements.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject Closest(string selector) {
+        public jQueryObject Closest([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -647,7 +692,7 @@ public jQueryObject Closest(string selector) {
         /// <param name="selector">The selector used to match elements.</param>
         /// <param name="context">The element within which to search.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject Closest(string selector, Element context) {
+        public jQueryObject Closest([SyntaxValidation("cssSelector")] string selector, Element context) {
             return null;
         }
 
@@ -734,7 +779,7 @@ public jQueryObject Data(Dictionary data) {
         /// <param name="eventName">The name of the event.</param>
         /// <param name="eventHandler">The event handler to be invoked.</param>
         /// <returns></returns>
-        public jQueryObject Delegate(string selector, string eventName, jQueryEventHandler eventHandler) {
+        public jQueryObject Delegate([SyntaxValidation("cssSelector")] string selector, string eventName, jQueryEventHandler eventHandler) {
             return null;
         }
 
@@ -747,7 +792,7 @@ public jQueryObject Delegate(string selector, string eventName, jQueryEventHandl
         /// <param name="eventData">Any data that needs to be passed to the event handler.</param>
         /// <param name="eventHandler">The event handler to be invoked.</param>
         /// <returns></returns>
-        public jQueryObject Delegate(string selector, string eventName, Dictionary eventData, jQueryEventHandler eventHandler) {
+        public jQueryObject Delegate([SyntaxValidation("cssSelector")] string selector, string eventName, Dictionary eventData, jQueryEventHandler eventHandler) {
             return null;
         }
 
@@ -766,7 +811,7 @@ public jQueryObject Detach() {
         /// </summary>
         /// <param name="selector">The selector to use to filter the elements to remove.</param>
         /// <returns>The current jQueryObject.</returns>
-        public jQueryObject Detach(string selector) {
+        public jQueryObject Detach([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -1178,7 +1223,7 @@ public jQueryObject FadeToggle(EffectDuration duration, Action callback) {
         /// </summary>
         /// <param name="selector">The selector used to match elements.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject Filter(string selector) {
+        public jQueryObject Filter([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -1192,13 +1237,35 @@ public jQueryObject Filter(ElementFilterCallback filterFunction) {
             return null;
         }
 
+        /// <summary>
+        /// Returns a new jQueryObject with descendents of each matched element filtered
+        /// by the specified element.
+        /// This traverses down multiple levels of the tree.
+        /// </summary>
+        /// <param name="element">The element to match against.</param>
+        /// <returns>The new jQueryObject.</returns>
+        public jQueryObject Find(Element element) {
+            return null;
+        }
+
+        /// <summary>
+        /// Returns a new jQueryObject with descendents of each matched element filtered
+        /// by the specified matched set of elements.
+        /// This traverses down multiple levels of the tree.
+        /// </summary>
+        /// <param name="elements">The matched set of elements to lookup.</param>
+        /// <returns>The new jQueryObject.</returns>
+        public jQueryObject Find(jQueryObject elements) {
+            return null;
+        }
+
         /// <summary>
         /// Returns a new jQueryObject with descendents of each matched element filtered
         /// by the specified selector. This traverses down multiple levels of the tree.
         /// </summary>
         /// <param name="selector">The selector used to match elements.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject Find(string selector) {
+        public jQueryObject Find([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -1439,6 +1506,28 @@ public int GetOuterWidth(bool includeMargins) {
             return 0;
         }
 
+        /// <summary>
+        /// Gets the value of the specified property from the first of the matched
+        /// set of elements.
+        /// </summary>
+        /// <param name="propertyName">The name of the property.</param>
+        /// <returns>The value of the specified property.</returns>
+        [ScriptName("prop")]
+        public string GetProperty(string propertyName) {
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the value of the specified property from the first of the matched
+        /// set of elements.
+        /// </summary>
+        /// <param name="propertyName">The name of the property.</param>
+        /// <returns>The value of the specified property.</returns>
+        [ScriptName("prop")]
+        public TValue GetProperty<TValue>(string propertyName) {
+            return default(TValue);
+        }
+
         /// <summary>
         /// Gets the current horizontal scrollbar position of the first matched element.
         /// </summary>
@@ -1490,7 +1579,7 @@ public int GetWidth() {
         /// </summary>
         /// <param name="selector">The selector used to match elements.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject Has(string selector) {
+        public jQueryObject Has([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -1663,7 +1752,7 @@ public int Index(Element element) {
         /// </summary>
         /// <param name="selector">The selector used to match elements.</param>
         /// <returns>The index of the first matching element.</returns>
-        public int Index(string selector) {
+        public int Index([SyntaxValidation("cssSelector")] string selector) {
             return 0;
         }
 
@@ -1682,7 +1771,7 @@ public jQueryObject InsertAfter(Element element) {
         /// </summary>
         /// <param name="selector">The elements to insert after.</param>
         /// <returns>The resulting jQuery object</returns>
-        public jQueryObject InsertAfter(string selector) {
+        public jQueryObject InsertAfter([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -1710,7 +1799,7 @@ public jQueryObject InsertBefore(Element element) {
         /// </summary>
         /// <param name="selector">The elements to insert before.</param>
         /// <returns>The resulting jQuery object</returns>
-        public jQueryObject InsertBefore(string selector) {
+        public jQueryObject InsertBefore([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -1723,13 +1812,43 @@ public jQueryObject InsertBefore(jQueryObject jQueryObject) {
             return null;
         }
 
+        /// <summary>
+        /// Gets whether the at least one of the matched set of elements matches the specified
+        /// filter function.
+        /// </summary>
+        /// <param name="filter">The filter function to invoke for each element.</param>
+        /// <returns>True if there is a matching element; false otherwise.</returns>
+        public bool Is(BooleanFunction filter) {
+            return false;
+        }
+
+        /// <summary>
+        /// Gets whether the at least one of the matched set of elements matches the specified
+        /// element.
+        /// </summary>
+        /// <param name="element">The element to compare against.</param>
+        /// <returns>True if there is a matching element; false otherwise.</returns>
+        public bool Is(Element element) {
+            return false;
+        }
+
+        /// <summary>
+        /// Gets whether the at least one of the matched set of elements matches the specified
+        /// matched set of elements.
+        /// </summary>
+        /// <param name="elements">The matched set of elements to compare against.</param>
+        /// <returns>True if there is a matching element; false otherwise.</returns>
+        public bool Is(jQueryObject elements) {
+            return false;
+        }
+
         /// <summary>
         /// Gets whether the at least one of the matched set of elements matches the specified
         /// selector.
         /// </summary>
         /// <param name="selector">The selector to check for.</param>
         /// <returns>True if there is a matching element; false otherwise.</returns>
-        public bool Is(string selector) {
+        public bool Is([SyntaxValidation("cssSelector")] string selector) {
             return false;
         }
 
@@ -2080,7 +2199,7 @@ public jQueryObject Next() {
         /// </summary>
         /// <param name="selector">The selector to match children against.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject Next(string selector) {
+        public jQueryObject Next([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -2099,7 +2218,7 @@ public jQueryObject NextAll() {
         /// </summary>
         /// <param name="selector">The selector to match children against.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject NextAll(string selector) {
+        public jQueryObject NextAll([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -2109,7 +2228,7 @@ public jQueryObject NextAll(string selector) {
         /// </summary>
         /// <param name="selector">The selector to match children against.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject NextUntil(string selector) {
+        public jQueryObject NextUntil([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -2139,7 +2258,7 @@ public jQueryObject Not(params Element[] elements) {
         /// </summary>
         /// <param name="selector">The selector used to match elements to remove.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject Not(string selector) {
+        public jQueryObject Not([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -2153,6 +2272,55 @@ public jQueryObject Not(ElementFilterCallback filterFunction) {
             return null;
         }
 
+        /// <summary>
+        /// Removes an event handler which has been created by called On()
+        /// </summary>
+        /// <param name="eventsMap">A dictionary in which the string keys represent the event names, and the values represent the handler which was previously attached to that event</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject Off(Dictionary eventsMap) {
+            return null;
+        }
+
+        /// <summary>
+        /// Removes an event handler which has been created by called On()
+        /// </summary>
+        /// <param name="eventsMap">A dictionary in which the string keys represent the event names, and the values represent the handler which was previously attached to that event</param>
+        /// <param name="selector">A selector which should match the one originally passed to On()</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject Off(Dictionary eventsMap, string selector) {
+            return null;
+        }
+
+        /// <summary>
+        /// Removes an event handler which has been created by called On()
+        /// </summary>
+        /// <param name="events">One or more space-separated event types and optional namespaces</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject Off(string events) {
+            return null;
+        }
+
+        /// <summary>
+        /// Removes an event handler which has been created by called On()
+        /// </summary>
+        /// <param name="events">One or more space-separated event types and optional namespaces</param>
+        /// <param name="selector">A selector which should match the one originally passed to On()</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject Off(string events, string selector) {
+            return null;
+        }
+
+        /// <summary>
+        /// Removes an event handler which has been created by called On()
+        /// </summary>
+        /// <param name="events">One or more space-separated event types and optional namespaces</param>
+        /// <param name="selector">A selector which should match the one originally passed to On()</param>
+        /// <param name="eventHandler">A handler function previously attached for the event(s)</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject Off(string events, string selector, jQueryEventHandler eventHandler) {
+            return null;
+        }
+
         /// <summary>
         /// Sets the position of the matched elements relative to the document.
         /// </summary>
@@ -2190,6 +2358,69 @@ public jQueryObject OffsetParent() {
             return null;
         }
 
+        /// <summary>
+        /// Attaches an event handler function for one or more events to the selected elements.
+        /// </summary>
+        /// <param name="eventName">The name of the event</param>
+        /// <param name="eventHandler">The event handler to be invoked</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject On(string eventName, jQueryEventHandler eventHandler) {
+            return null;
+        }
+
+        /// <summary>
+        /// Attaches an event handler function for one or more events to the selected elements.
+        /// </summary>
+        /// <param name="eventName">The name of the event</param>
+        /// <param name="selector">A selector string to filter the descendants of the selected elements that trigger the event.</param>
+        /// <param name="eventHandler">The event handler to be invoked</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject On(string eventName, string selector, jQueryEventHandler eventHandler) {
+            return null;
+        }
+
+        /// <summary>
+        /// Attaches an event handler function for one or more events to the selected elements.
+        /// </summary>
+        /// <param name="eventName">The name of the event</param>
+        /// <param name="selector">A selector string to filter the descendants of the selected elements that trigger the event.</param>
+        /// <param name="data">A custom data structure to be passed to the handler</param>
+        /// <param name="eventHandler">The event handler to be invoked</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject On(string eventName, string selector, object data, jQueryEventHandler eventHandler) {
+            return null;
+        }
+
+        /// <summary>
+        /// Attaches an event handler function for one or more events to the selected elements.
+        /// </summary>
+        /// <param name="eventsMap">A dictionary in which the string keys represent the event names, and the values represent the handler for that event.</param>
+        /// <returns>The current jQueryObject</returns>
+        public jQueryObject On(Dictionary eventsMap) {
+            return null;
+        }
+
+        /// <summary>
+        /// Attaches an event handler function for one or more events to the selected elements.
+        /// </summary>
+        /// <param name="eventsMap">A dictionary in which the string keys represent the event names, and the values represent the handler for that event.</param>
+        /// <param name="selector">A selector string to filter the descendants of the selected elements that trigger the event.</param>
+        /// <returns>The current jQueryObject</returns>
+        public jQueryObject On(Dictionary eventsMap, string selector) {
+            return null;
+        }
+
+        /// <summary>
+        /// Attaches an event handler function for one or more events to the selected elements.
+        /// </summary>
+        /// <param name="eventsMap">A dictionary in which the string keys represent the event names, and the values represent the handler for that event.</param>
+        /// <param name="selector">A selector string to filter the descendants of the selected elements that trigger the event.</param>
+        /// <param name="data">A custom data structure to be passed to the handler</param>
+        /// <returns>The current jQueryObject</returns>
+        public jQueryObject On(Dictionary eventsMap, string selector, object data) {
+            return null;
+        }
+
         /// <summary>
         /// Attaches a handler for the handling the specified event once on the matched
         /// set of elements.
@@ -2226,7 +2457,7 @@ public jQueryObject Parent() {
         /// </summary>
         /// <param name="selector">The selector to match elements.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject Parent(string selector) {
+        public jQueryObject Parent([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -2244,7 +2475,7 @@ public jQueryObject Parents() {
         /// </summary>
         /// <param name="selector">The selector to match elements.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject Parents(string selector) {
+        public jQueryObject Parents([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -2254,7 +2485,7 @@ public jQueryObject Parents(string selector) {
         /// </summary>
         /// <param name="selector">The selector to match elements.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject ParentsUntil(string selector) {
+        public jQueryObject ParentsUntil([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -2286,6 +2517,24 @@ public jQueryObject Prepend(string content) {
             return null;
         }
 
+        /// <summary>
+        /// Prepend content to the beginning of each element of the matching elements.
+        /// </summary>
+        /// <param name="content">The DOM element to prepend.</param>
+        /// <returns>The current jQueryObject</returns>
+        public jQueryObject Prepend(Element content) {
+            return null;
+        }
+
+        /// <summary>
+        /// Prepend content to the beginning of each element of the matching elements.
+        /// </summary>
+        /// <param name="content">The DOM elements to prepend.</param>
+        /// <returns>The current jQueryObject</returns>
+        public jQueryObject Prepend(Element[] content) {
+            return null;
+        }
+
         /// <summary>
         /// Prepend content to the beginning of each element of the matching elements.
         /// </summary>
@@ -2315,6 +2564,33 @@ public jQueryObject Prepend(StringReplaceFunction contentFunction) {
             return null;
         }
 
+        /// <summary>
+        /// Prepends every element of the matching set to the beginning of each element of the matching elements.
+        /// </summary>
+        /// <param name="target">The target to prepend to.</param>
+        /// <returns>The current jQueryObject</returns>
+        public jQueryObject PrependTo(string target) {
+            return null;
+        }
+
+        /// <summary>
+        /// Prepends every element of the matching set to the beginning of each element of the matching elements.
+        /// </summary>
+        /// <param name="target">The DOM element to prepend to.</param>
+        /// <returns>The current jQueryObject</returns>
+        public jQueryObject PrependTo(Element target) {
+            return null;
+        }
+
+        /// <summary>
+        /// Prepends every element of the matching set to the beginning of each element of the matching elements.
+        /// </summary>
+        /// <param name="target">The jQueryObject to prepend to.</param>
+        /// <returns>The current jQueryObject</returns>
+        public jQueryObject PrependTo(jQueryObject target) {
+            return null;
+        }
+
         /// <summary>
         /// Gets a jQueryObject representing the immediate preceeding sibling
         /// element of the matched set of elements.
@@ -2330,7 +2606,7 @@ public jQueryObject Prev() {
         /// </summary>
         /// <param name="selector">The selector to match children against.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject Prev(string selector) {
+        public jQueryObject Prev([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -2349,7 +2625,7 @@ public jQueryObject PrevAll() {
         /// </summary>
         /// <param name="selector">The selector to match children against.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject PrevAll(string selector) {
+        public jQueryObject PrevAll([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -2359,7 +2635,49 @@ public jQueryObject PrevAll(string selector) {
         /// </summary>
         /// <param name="selector">The selector to match children against.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject PrevUntil(string selector) {
+        public jQueryObject PrevUntil([SyntaxValidation("cssSelector")] string selector) {
+            return null;
+        }
+
+        /// <summary>
+        /// Creates a deferred object to observe when all animations are completed.
+        /// </summary>
+        /// <returns>A deferred object.</returns>
+        public jQueryDeferred Promise() {
+            return null;
+        }
+
+        /// <summary>
+        /// Creates a deferred object to observe when all actions of the specified
+        /// type are completed.
+        /// </summary>
+        /// <param name="type">The type of actions to observe.</param>
+        /// <returns>A deferred object.</returns>
+        public jQueryDeferred Promise(string type) {
+            return null;
+        }
+
+        /// <summary>
+        /// Creates a deferred object to observe when all actions of the specified
+        /// type are completed. The specified target object is modified to contain
+        /// the deferred methods.
+        /// </summary>
+        /// <param name="type">The type of actions to observe.</param>
+        /// <param name="target">The target object to modify.</param>
+        /// <returns>The target object.</returns>
+        public jQueryDeferred Promise(string type, object target) {
+            return null;
+        }
+
+        /// <summary>
+        /// Sets the value of the specified property to the specified value on
+        /// the matched set of elements.
+        /// </summary>
+        /// <param name="propertyName">The name of the property.</param>
+        /// <param name="value">The value to set the property to.</param>
+        /// <returns>The value of the specified property.</returns>
+        [ScriptName("prop")]
+        public string Property(string propertyName, object value) {
             return null;
         }
 
@@ -2376,7 +2694,7 @@ public jQueryObject Remove() {
         /// </summary>
         /// <param name="selector">The selector to use to filter the elements to remove.</param>
         /// <returns>The current jQueryObject.</returns>
-        public jQueryObject Remove(string selector) {
+        public jQueryObject Remove([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -2441,12 +2759,22 @@ public jQueryObject RemoveData(string key) {
             return null;
         }
 
+        /// <summary>
+        /// Removes the specified property from the matching set of elements.
+        /// </summary>
+        /// <param name="propertyName">The name of the property to remove.</param>
+        /// <returns>The current jQueryObject.</returns>
+        [ScriptName("removeProp")]
+        public jQueryObject RemoveProperty(string propertyName) {
+            return null;
+        }
+
         /// <summary>
         /// Replace each element matching the specified selector with the set of matched elements.
         /// </summary>
         /// <param name="selector">The selector to match elements to be replaced.</param>
         /// <returns>The current jQueryObject.</returns>
-        public jQueryObject ReplaceAll(string selector) {
+        public jQueryObject ReplaceAll([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -2459,6 +2787,26 @@ public jQueryObject ReplaceWith(string content) {
             return null;
         }
 
+        /// <summary>
+        /// Replace each element in the set of matched elements with the new content provided
+        /// by the specified element.
+        /// </summary>
+        /// <param name="content">The element containing the HTML to use.</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject ReplaceWith(Element content) {
+            return null;
+        }
+
+        /// <summary>
+        /// Replace each element in the set of matched elements with the new content provided
+        /// by the specified set of matched elements.
+        /// </summary>
+        /// <param name="content">The object containing the HTML to use.</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject ReplaceWith(jQueryObject content) {
+            return null;
+        }
+
         /// <summary>
         /// Replace each element in the set of matched elements with the content returned from
         /// the specified function.
@@ -2651,7 +2999,7 @@ public jQueryObject Siblings() {
         /// </summary>
         /// <param name="selector">The selector to match elements.</param>
         /// <returns>The new jQueryObject.</returns>
-        public jQueryObject Siblings(string selector) {
+        public jQueryObject Siblings([SyntaxValidation("cssSelector")] string selector) {
             return null;
         }
 
@@ -3084,6 +3432,27 @@ public jQueryObject Toggle(EffectDuration duration, EffectEasing easing, Action
             return null;
         }
 
+        /// <summary>
+        /// Bind two or more handlers to the matched elements, to be executed on alternate clicks.
+        /// </summary>
+        /// <param name="evenEventHandler">A function to execute every even time the element is clicked.</param>
+        /// <param name="oddEventHandler">A function to execute every odd time the element is clicked.</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject Toggle(jQueryEventHandler evenEventHandler, jQueryEventHandler oddEventHandler) {
+            return null;
+        }
+
+        /// <summary>
+        /// Bind two or more handlers to the matched elements, to be executed on alternate clicks.
+        /// </summary>
+        /// <param name="evenEventHandler">A function to execute every even time the element is clicked.</param>
+        /// <param name="oddEventHandler">A function to execute every odd time the element is clicked.</param>
+        /// <param name="eventHandlers">Additional handlers to cycle through after clicks.</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject Toggle(jQueryEventHandler evenEventHandler, jQueryEventHandler oddEventHandler, params jQueryEventHandler[] eventHandlers) {
+            return null;
+        }
+
         /// <summary>
         /// Toggles the specified class from each of the set of matched elements.
         /// </summary>
@@ -3153,6 +3522,14 @@ public object TriggerHandler(string eventName, object[] eventParameters) {
             return null;
         }
 
+        /// <summary>
+        /// Removes all event handlers attached to the matched set of elements
+        /// </summary>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject Unbind() {
+            return null;
+        }
+
         /// <summary>
         /// Detaches a handler for the specified event on the matched set of elements.
         /// </summary>
@@ -3191,6 +3568,16 @@ public jQueryObject Unbind(string eventName, bool result) {
             return null;
         }
 
+        /// <summary>
+        /// Detaches all handlers from matching the specified namespace
+        /// from the matched set of elements.
+        /// </summary>
+        /// <param name="namespaceName">The namespace of the handler.</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject Undelegate(string namespaceName) {
+            return null;
+        }
+
         /// <summary>
         /// Detaches all handlers from handling the specified event on elements matching the
         /// specified selector within the matched set of elements.
@@ -3198,7 +3585,7 @@ public jQueryObject Unbind(string eventName, bool result) {
         /// <param name="selector">The selector to match elements.</param>
         /// <param name="eventName">The name of the event.</param>
         /// <returns>The current jQueryObject.</returns>
-        public jQueryObject Undelegate(string selector, string eventName) {
+        public jQueryObject Undelegate([SyntaxValidation("cssSelector")] string selector, string eventName) {
             return null;
         }
 
@@ -3210,7 +3597,7 @@ public jQueryObject Undelegate(string selector, string eventName) {
         /// <param name="eventName">The name of the event.</param>
         /// <param name="eventHandler">The event handler to be invoked.</param>
         /// <returns>The current jQueryObject.</returns>
-        public jQueryObject Undelegate(string selector, string eventName, jQueryEventHandler eventHandler) {
+        public jQueryObject Undelegate([SyntaxValidation("cssSelector")] string selector, string eventName, jQueryEventHandler eventHandler) {
             return null;
         }
 
@@ -3301,6 +3688,24 @@ public jQueryObject Wrap(string htmlSnippet) {
             return null;
         }
 
+        /// <summary>
+        /// Wraps a DOM element around each of the matched set of elements.
+        /// </summary>
+        /// <param name="element">A DOM element specifying the structure.</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject Wrap(Element element) {
+            return null;
+        }
+
+        /// <summary>
+        /// Wraps a jQueryObject around each of the matched set of elements.
+        /// </summary>
+        /// <param name="element">A jQueryObject specifying the structure.</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject Wrap(jQueryObject element) {
+            return null;
+        }
+
         /// <summary>
         /// Wraps an HTML structure around each of the matched set of elements as
         /// returned from the specified wrapping function.
@@ -3311,6 +3716,33 @@ public jQueryObject Wrap(StringFunction wrappingFunction) {
             return null;
         }
 
+        /// <summary>
+        /// Wraps an HTML structure around all elements in the set of matched elements.
+        /// </summary>
+        /// <param name="htmlSnippet">The HTML to wrap with.</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject WrapAll(string htmlSnippet) {
+            return null;
+        }
+
+        /// <summary>
+        /// Wraps an HTML structure around all elements in the set of matched elements.
+        /// </summary>
+        /// <param name="element">A DOM element specifying the structure.</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject WrapAll(Element element) {
+            return null;
+        }
+
+        /// <summary>
+        /// Wraps an HTML structure around all elements in the set of matched elements.
+        /// </summary>
+        /// <param name="element">A jQueryObject specifying the structure.</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject WrapAll(jQueryObject element) {
+            return null;
+        }
+
         /// <summary>
         /// Wraps an HTML structure around the content of each of the matched set of elements.
         /// </summary>
@@ -3320,6 +3752,24 @@ public jQueryObject WrapInner(string htmlSnippet) {
             return null;
         }
 
+        /// <summary>
+        /// Wraps a DOM element around the content of each of the matched set of elements.
+        /// </summary>
+        /// <param name="element">A DOM element specifying the structure.</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject WrapInner(Element element) {
+            return null;
+        }
+
+        /// <summary>
+        /// Wraps a jQueryObject around the content of each of the matched set of elements.
+        /// </summary>
+        /// <param name="element">A jQueryObject specifying the structure.</param>
+        /// <returns>The current jQueryObject.</returns>
+        public jQueryObject WrapInner(jQueryObject element) {
+            return null;
+        }
+
         /// <summary>
         /// Wraps an HTML structure around the content of each of the matched set of elements as
         /// returned from the specified wrapping function.
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryPosition.cs b/src/Libraries/jQuery/jQuery.Core/jQueryPosition.cs
index 9e81af3c0..ccd50ecae 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQueryPosition.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryPosition.cs
@@ -1,9 +1,6 @@
 // jQueryPosition.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/jQuerySupport.cs b/src/Libraries/jQuery/jQuery.Core/jQuerySupport.cs
index 7714c8c60..7463c1bb4 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQuerySupport.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQuerySupport.cs
@@ -1,9 +1,6 @@
 // jQueryObject.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Core/jQueryXmlHttpRequest.cs b/src/Libraries/jQuery/jQuery.Core/jQueryXmlHttpRequest.cs
index f6e11617b..fb0501d22 100644
--- a/src/Libraries/jQuery/jQuery.Core/jQueryXmlHttpRequest.cs
+++ b/src/Libraries/jQuery/jQuery.Core/jQueryXmlHttpRequest.cs
@@ -1,9 +1,6 @@
 // jQueryXmlHttpRequest.cs
-// Script#/Libraries/jQuery/jQueryCore
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Core
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -18,7 +15,7 @@ namespace jQueryApi {
     /// </summary>
     [Imported]
     [IgnoreNamespace]
-    public sealed class jQueryXmlHttpRequest<TData> : IDeferred {
+    public sealed class jQueryXmlHttpRequest : IDeferred {
 
         private jQueryXmlHttpRequest() {
         }
@@ -80,12 +77,30 @@ public string StatusText {
         public void Abort() {
         }
 
+        /// <summary>
+        /// Add handlers to be called when the request completes or fails.
+        /// </summary>
+        /// <param name="callbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current request object.</returns>
+        public jQueryXmlHttpRequest Always(params Action[] callbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request completes or fails.
+        /// </summary>
+        /// <param name="callbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current request object.</returns>
+        public jQueryXmlHttpRequest Always(params Callback[] callbacks) {
+            return null;
+        }
+
         /// <summary>
         /// Adds a callback to handle completion of the request.
         /// </summary>
         /// <param name="callback">The callback to invoke.</param>
         /// <returns>The current request object.</returns>
-        public jQueryXmlHttpRequest<TData> Complete(AjaxCompletedCallback<TData> callback) {
+        public jQueryXmlHttpRequest Complete(AjaxCompletedCallback callback) {
             return null;
         }
 
@@ -95,7 +110,17 @@ public jQueryXmlHttpRequest<TData> Complete(AjaxCompletedCallback<TData> callbac
         /// </summary>
         /// <param name="doneCallbacks">The callbacks to invoke (in order).</param>
         /// <returns>The current request object.</returns>
-        public jQueryXmlHttpRequest<TData> Done(params Delegate[] doneCallbacks) {
+        public jQueryXmlHttpRequest Done(params Action[] doneCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request is successfully completed. If the
+        /// request is already completed, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current request object.</returns>
+        public jQueryXmlHttpRequest Done(params Callback[] doneCallbacks) {
             return null;
         }
 
@@ -104,7 +129,17 @@ public jQueryXmlHttpRequest<TData> Done(params Delegate[] doneCallbacks) {
         /// </summary>
         /// <param name="callback">The callback to invoke.</param>
         /// <returns>The current request object.</returns>
-        public jQueryXmlHttpRequest<TData> Error(AjaxErrorCallback<TData> callback) {
+        public jQueryXmlHttpRequest Error(AjaxErrorCallback callback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request errors. If the
+        /// request is already completed, the handlers are still invoked.
+        /// </summary>
+        /// <param name="failCallbacks">The callbacks to invoke (in order).</param>
+        /// <returns>The current request object.</returns>
+        public jQueryXmlHttpRequest Fail(params Action[] failCallbacks) {
             return null;
         }
 
@@ -114,7 +149,7 @@ public jQueryXmlHttpRequest<TData> Error(AjaxErrorCallback<TData> callback) {
         /// </summary>
         /// <param name="failCallbacks">The callbacks to invoke (in order).</param>
         /// <returns>The current request object.</returns>
-        public jQueryXmlHttpRequest<TData> Fail(params Delegate[] failCallbacks) {
+        public jQueryXmlHttpRequest Fail(params Callback[] failCallbacks) {
             return null;
         }
 
@@ -142,6 +177,25 @@ public string GetResponseHeader(string name) {
         public void OverrideMimeType(string type) {
         }
 
+        /// <summary>
+        /// Filters or chains the result of the request.
+        /// </summary>
+        /// <param name="successFilter">The filter to invoke when the request successfully completes.</param>
+        /// <returns>The current request object.</returns>
+        public jQueryXmlHttpRequest Pipe(jQueryDeferredFilter successFilter) {
+            return null;
+        }
+
+        /// <summary>
+        /// Filters or chains the result of the request.
+        /// </summary>
+        /// <param name="successFilter">The filter to invoke when the request successfully completes.</param>
+        /// <param name="failFilter">The filter to invoke when the request fails.</param>
+        /// <returns>The current request object.</returns>
+        public jQueryXmlHttpRequest Pipe(jQueryDeferredFilter successFilter, jQueryDeferredFilter failFilter) {
+            return null;
+        }
+
         /// <summary>
         /// Sets a request header value.
         /// </summary>
@@ -155,7 +209,7 @@ public void SetRequestHeader(string name, string value) {
         /// </summary>
         /// <param name="callback">The callback to invoke.</param>
         /// <returns>The current request object.</returns>
-        public jQueryXmlHttpRequest<TData> Success(AjaxCallback<TData> callback) {
+        public jQueryXmlHttpRequest Success(AjaxCallback callback) {
             return null;
         }
 
@@ -164,7 +218,7 @@ public jQueryXmlHttpRequest<TData> Success(AjaxCallback<TData> callback) {
         /// </summary>
         /// <param name="callback">The callback to invoke.</param>
         /// <returns>The current request object.</returns>
-        public jQueryXmlHttpRequest<TData> Success(AjaxRequestCallback<TData> callback) {
+        public jQueryXmlHttpRequest Success(AjaxRequestCallback callback) {
             return null;
         }
 
@@ -175,7 +229,18 @@ public jQueryXmlHttpRequest<TData> Success(AjaxRequestCallback<TData> callback)
         /// <param name="doneCallback">The callback to invoke when the request completes successfully.</param>
         /// <param name="failCallback">The callback to invoke when the request completes with an error.</param>
         /// <returns>The current request object.</returns>
-        public jQueryXmlHttpRequest<TData> Then(Delegate doneCallback, Delegate failCallback) {
+        public jQueryXmlHttpRequest Then(Action doneCallback, Action failCallback) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request is completed. If the
+        /// request is already completed, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallback">The callback to invoke when the request completes successfully.</param>
+        /// <param name="failCallback">The callback to invoke when the request completes with an error.</param>
+        /// <returns>The current request object.</returns>
+        public jQueryXmlHttpRequest Then(Callback doneCallback, Callback failCallback) {
             return null;
         }
 
@@ -186,17 +251,44 @@ public jQueryXmlHttpRequest<TData> Then(Delegate doneCallback, Delegate failCall
         /// <param name="doneCallbacks">The callbacks to invoke when the request completes successfully.</param>
         /// <param name="failCallbacks">The callbacks to invoke when the request completes with an error.</param>
         /// <returns>The current deferred object.</returns>
-        public jQueryXmlHttpRequest<TData> Then(Delegate[] doneCallbacks, Delegate[] failCallbacks) {
+        public jQueryXmlHttpRequest Then(Action[] doneCallbacks, Action[] failCallbacks) {
+            return null;
+        }
+
+        /// <summary>
+        /// Add handlers to be called when the request is completed. If the
+        /// request is already completed, the handlers are still invoked.
+        /// </summary>
+        /// <param name="doneCallbacks">The callbacks to invoke when the request completes successfully.</param>
+        /// <param name="failCallbacks">The callbacks to invoke when the request completes with an error.</param>
+        /// <returns>The current deferred object.</returns>
+        public jQueryXmlHttpRequest Then(Callback[] doneCallbacks, Callback[] failCallbacks) {
             return null;
         }
 
         #region Implementation of IDeferred
 
-        IDeferred IDeferred.Done(params Delegate[] doneCallbacks) {
+        IDeferred IDeferred.Always(params Action[] callbacks) {
+            return null;
+        }
+
+        IDeferred IDeferred.Always(params Callback[] callbacks) {
+            return null;
+        }
+
+        IDeferred IDeferred.Done(params Action[] doneCallbacks) {
+            return null;
+        }
+
+        IDeferred IDeferred.Done(params Callback[] doneCallbacks) {
+            return null;
+        }
+
+        IDeferred IDeferred.Fail(params Action[] failCallbacks) {
             return null;
         }
 
-        IDeferred IDeferred.Fail(params Delegate[] failCallbacks) {
+        IDeferred IDeferred.Fail(params Callback[] failCallbacks) {
             return null;
         }
 
@@ -208,27 +300,27 @@ bool IDeferred.IsResolved() {
             return false;
         }
 
-        jQueryDeferred IDeferred.Reject(params object[] args) {
+        IDeferred IDeferred.Pipe(jQueryDeferredFilter successFilter) {
             return null;
         }
 
-        IDeferred IDeferred.RejectWith(object context, params object[] args) {
+        IDeferred IDeferred.Pipe(jQueryDeferredFilter successFilter, jQueryDeferredFilter failFilter) {
             return null;
         }
 
-        IDeferred IDeferred.Resolve(params object[] args) {
+        IDeferred IDeferred.Then(Action doneCallback, Action failCallback) {
             return null;
         }
 
-        IDeferred IDeferred.ResolveWith(object context, params object[] args) {
+        IDeferred IDeferred.Then(Callback doneCallback, Callback failCallback) {
             return null;
         }
 
-        jQueryDeferred IDeferred.Then(Delegate doneCallback, Delegate failCallback) {
+        IDeferred IDeferred.Then(Action[] doneCallbacks, Action[] failCallbacks) {
             return null;
         }
 
-        IDeferred IDeferred.Then(Delegate[] doneCallbacks, Delegate[] failCallbacks) {
+        IDeferred IDeferred.Then(Callback[] doneCallbacks, Callback[] failCallbacks) {
             return null;
         }
 
diff --git a/src/Libraries/jQuery/jQuery.History/Properties/AssemblyInfo.cs b/src/Libraries/jQuery/jQuery.History/Properties/AssemblyInfo.cs
index 4c232aede..7b02d552c 100644
--- a/src/Libraries/jQuery/jQuery.History/Properties/AssemblyInfo.cs
+++ b/src/Libraries/jQuery/jQuery.History/Properties/AssemblyInfo.cs
@@ -1,8 +1,6 @@
 // AssemblyInfo.cs
-// Script#/Runtime/jQuery
-// Copyright (c) Nikhil Kothari, 2006
-//
-// Assembly Metadata
+// Script#/Libraries/jQuery/History
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.History/Properties/ScriptInfo.txt b/src/Libraries/jQuery/jQuery.History/Properties/ScriptInfo.txt
new file mode 100644
index 000000000..ca376dfab
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.History/Properties/ScriptInfo.txt
@@ -0,0 +1,15 @@
+jQuery BBQ Plugin
+===============================================================================
+
+This assembly provides access to jQuery BBQ plugin APIs. This is only meant for
+use at development time, so you can reference and compile your c# code against
+the plugin APIs. You must include the appropriate plugin scripts in your page for
+runtime functionality.
+
+More information is on http://benalman.com/projects/jquery-bbq-plugin/.
+
+-------------------------------------------------------------------------------
+
+The assembly corresponds to version 1.2.1 and more information as well as
+associated scripts can be found at
+http://benalman.com/projects/jquery-bbq-plugin/
diff --git a/src/Libraries/jQuery/jQuery.History/StateMergeMode.cs b/src/Libraries/jQuery/jQuery.History/StateMergeMode.cs
index 2ac9d1543..358ae016c 100644
--- a/src/Libraries/jQuery/jQuery.History/StateMergeMode.cs
+++ b/src/Libraries/jQuery/jQuery.History/StateMergeMode.cs
@@ -1,9 +1,6 @@
 // StateMergeMode.cs
-// Script#/Libraries/jQuery/jQueryHistory
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/History
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.History/jQuery.History.csproj b/src/Libraries/jQuery/jQuery.History/jQuery.History.csproj
index 643b5b367..08c6d3658 100644
--- a/src/Libraries/jQuery/jQuery.History/jQuery.History.csproj
+++ b/src/Libraries/jQuery/jQuery.History/jQuery.History.csproj
@@ -11,9 +11,9 @@
     <RootNamespace>jQueryApi.History</RootNamespace>
     <AssemblyName>Script.jQuery.History</AssemblyName>
     <NoStdLib>True</NoStdLib>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\Libraries.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -39,26 +39,33 @@
     <NoWarn>1591, 0661, 0660, 1684</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib">
-      <HintPath>..\..\..\..\bin\ref\mscorlib.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="jQueryHistory.cs" />
     <Compile Include="StateMergeMode.cs" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
-      <Link>Properties\CommonAssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
     </Compile>
+    <ScriptInfo Include="Properties\ScriptInfo.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Core\CoreLib\CoreLib.csproj">
+      <Project>{36D4B098-A21C-4725-ACD3-400922885F38}</Project>
+      <Name>CoreLib</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Web\Web.csproj">
       <Project>{3681A9A8-FC40-4125-B842-7775713C8DCE}</Project>
       <Name>Web</Name>
     </ProjectReference>
+    <ProjectReference Include="..\jQuery.Core\jQuery.Core.csproj">
+      <Project>{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}</Project>
+      <Name>jQuery.Core</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(ScriptInfo)" DestinationFiles="$(OutputPath)$(AssemblyName).txt" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Libraries/jQuery/jQuery.History/jQueryHistory.cs b/src/Libraries/jQuery/jQuery.History/jQueryHistory.cs
index 1e5e3dc1e..5a0620838 100644
--- a/src/Libraries/jQuery/jQuery.History/jQueryHistory.cs
+++ b/src/Libraries/jQuery/jQuery.History/jQueryHistory.cs
@@ -1,9 +1,6 @@
 // jQueryHistory.cs
-// Script#/Libraries/jQuery/jQueryHistory
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/History
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Templating/Properties/AssemblyInfo.cs b/src/Libraries/jQuery/jQuery.Templating/Properties/AssemblyInfo.cs
index 09aee696d..b7b55b0d7 100644
--- a/src/Libraries/jQuery/jQuery.Templating/Properties/AssemblyInfo.cs
+++ b/src/Libraries/jQuery/jQuery.Templating/Properties/AssemblyInfo.cs
@@ -1,8 +1,6 @@
 // AssemblyInfo.cs
-// Script#/Runtime/jQuery
-// Copyright (c) Nikhil Kothari, 2006
-//
-// Assembly Metadata
+// Script#/Libraries/jQuery/Templating
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Templating/Properties/ScriptInfo.txt b/src/Libraries/jQuery/jQuery.Templating/Properties/ScriptInfo.txt
new file mode 100644
index 000000000..606cac5db
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Templating/Properties/ScriptInfo.txt
@@ -0,0 +1,9 @@
+jQuery Templating Plugin
+===============================================================================
+
+This assembly provides access to jQuery Templating plugin APIs. This is only meant
+for use at development time, so you can reference and compile your c# code against
+the plugin APIs. You must include the appropriate plugin scripts in your page for
+runtime functionality.
+
+More information is on http://api.jquery.com/category/plugins/templates/.
diff --git a/src/Libraries/jQuery/jQuery.Templating/jQuery.Templating.csproj b/src/Libraries/jQuery/jQuery.Templating/jQuery.Templating.csproj
index 7be1f09a2..828daf6e9 100644
--- a/src/Libraries/jQuery/jQuery.Templating/jQuery.Templating.csproj
+++ b/src/Libraries/jQuery/jQuery.Templating/jQuery.Templating.csproj
@@ -11,9 +11,9 @@
     <RootNamespace>jQueryApi.Templating</RootNamespace>
     <AssemblyName>Script.jQuery.Templating</AssemblyName>
     <NoStdLib>True</NoStdLib>
-    <SignAssembly>false</SignAssembly>
-    <AssemblyOriginatorKeyFile>..\..\Libraries.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -39,22 +39,24 @@
     <NoWarn>1591, 0661, 0660, 1684</NoWarn>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="mscorlib">
-      <HintPath>..\..\..\..\bin\ref\mscorlib.dll</HintPath>
-    </Reference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="jQueryTemplateInstance.cs" />
     <Compile Include="jQueryTemplate.cs" />
     <Compile Include="jQueryTemplateObject.cs" />
     <Compile Include="jQueryTemplating.cs" />
+  </ItemGroup>
+  <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="..\..\..\Common\CommonAssemblyInfo.cs">
-      <Link>Properties\CommonAssemblyInfo.cs</Link>
+    <Compile Include="..\..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
     </Compile>
+    <ScriptInfo Include="Properties\ScriptInfo.txt" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Core\CoreLib\CoreLib.csproj">
+      <Project>{36D4B098-A21C-4725-ACD3-400922885F38}</Project>
+      <Name>CoreLib</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Web\Web.csproj">
       <Project>{3681A9A8-FC40-4125-B842-7775713C8DCE}</Project>
       <Name>Web</Name>
@@ -65,4 +67,7 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(ScriptInfo)" DestinationFiles="$(OutputPath)$(AssemblyName).txt" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/Libraries/jQuery/jQuery.Templating/jQueryTemplate.cs b/src/Libraries/jQuery/jQuery.Templating/jQueryTemplate.cs
index 99ffe484c..aea785be5 100644
--- a/src/Libraries/jQuery/jQuery.Templating/jQueryTemplate.cs
+++ b/src/Libraries/jQuery/jQuery.Templating/jQueryTemplate.cs
@@ -1,9 +1,6 @@
 // jQueryTemplate.cs
-// Script#/Libraries/jQuery/jQueryTemplating
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Templating
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Templating/jQueryTemplateInstance.cs b/src/Libraries/jQuery/jQuery.Templating/jQueryTemplateInstance.cs
index 4157e3a39..d0c3e4946 100644
--- a/src/Libraries/jQuery/jQuery.Templating/jQueryTemplateInstance.cs
+++ b/src/Libraries/jQuery/jQuery.Templating/jQueryTemplateInstance.cs
@@ -1,9 +1,6 @@
 // jQueryTemplateInstance.cs
-// Script#/Libraries/jQuery/jQueryTemplating
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Templating
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Templating/jQueryTemplateObject.cs b/src/Libraries/jQuery/jQuery.Templating/jQueryTemplateObject.cs
index 29c99db37..f123404c5 100644
--- a/src/Libraries/jQuery/jQuery.Templating/jQueryTemplateObject.cs
+++ b/src/Libraries/jQuery/jQuery.Templating/jQueryTemplateObject.cs
@@ -1,9 +1,6 @@
 // jQueryTemplateObject.cs
-// Script#/Libraries/jQuery/jQueryTemplating
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Templating
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.Templating/jQueryTemplating.cs b/src/Libraries/jQuery/jQuery.Templating/jQueryTemplating.cs
index b577d12c1..fc63d6c10 100644
--- a/src/Libraries/jQuery/jQuery.Templating/jQueryTemplating.cs
+++ b/src/Libraries/jQuery/jQuery.Templating/jQueryTemplating.cs
@@ -1,9 +1,6 @@
 // jQueryTemplating.cs
-// Script#/Libraries/jQuery/jQueryTemplating
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// Script#/Libraries/jQuery/Templating
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Blind/BlindObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Blind/BlindObject.cs
new file mode 100644
index 000000000..78839cd5a
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Blind/BlindObject.cs
@@ -0,0 +1,34 @@
+// BlindObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// The blind effect hides or shows an element by wrapping the element in a container, and "pulling the blinds"
+    /// </summary>
+    /// <remarks>
+    /// The container has <code>overflow:hidden</code> applied, so height changes affect what's visible.
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class BlindObject : EffectObject {
+
+        private BlindObject() {
+        }
+
+        [ScriptName("blind")]
+        public BlindObject Blind() {
+            return null;
+        }
+
+        [ScriptName("blind")]
+        public BlindObject Blind(BlindOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Blind/BlindOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Blind/BlindOption.cs
new file mode 100644
index 000000000..639b5d758
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Blind/BlindOption.cs
@@ -0,0 +1,44 @@
+// BlindOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Blind.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum BlindOption {
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// <para>The direction the blind will be pulled to "hide" the element., or the direction from which the element will be revealed.</para><para>Possible Values</para><dl><dt>up</dt><dt>down</dt><dt>left</dt><dt>right</dt><dt>vertical</dt><dt>horizontal</dt></dl>
+        /// </summary>
+        Direction,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element by pulling a blind in the direction</dd><dt>show</dt><dd>Shows the element by pulling a blind from the direction. This seems inverted from the hide.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        Mode
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Blind/BlindOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Blind/BlindOptions.cs
new file mode 100644
index 000000000..5c7dd652c
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Blind/BlindOptions.cs
@@ -0,0 +1,85 @@
+// BlindOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Blind.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class BlindOptions {
+
+        public BlindOptions() {
+        }
+
+        public BlindOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>The direction the blind will be pulled to "hide" the element., or the direction from which the element will be revealed.</para><para>Possible Values</para><dl><dt>up</dt><dt>down</dt><dt>left</dt><dt>right</dt><dt>vertical</dt><dt>horizontal</dt></dl>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Direction {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element by pulling a blind in the direction</dd><dt>show</dt><dd>Shows the element by pulling a blind from the direction. This seems inverted from the hide.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Mode {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Bounce/BounceObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Bounce/BounceObject.cs
new file mode 100644
index 000000000..e0ab2a788
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Bounce/BounceObject.cs
@@ -0,0 +1,34 @@
+// BounceObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// The bounce effect bounces an element.  When used with hide or show, the last or first bounce will also fade in/out.
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class BounceObject : EffectObject {
+
+        private BounceObject() {
+        }
+
+        [ScriptName("bounce")]
+        public BounceObject Bounce() {
+            return null;
+        }
+
+        [ScriptName("bounce")]
+        public BounceObject Bounce(BounceOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Bounce/BounceOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Bounce/BounceOption.cs
new file mode 100644
index 000000000..a8871b4c0
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Bounce/BounceOption.cs
@@ -0,0 +1,54 @@
+// BounceOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Bounce.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum BounceOption {
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// <para>The direction the blind will be pulled to "hide" the element., or the direction from which the element will be revealed.</para><para>Possible Values</para><dl><dt>up</dt><dt>down</dt><dt>left</dt><dt>right</dt></dl>
+        /// </summary>
+        Direction,
+
+        /// <summary>
+        /// The distance of the largest "bounce" in pixels
+        /// </summary>
+        Distance,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element by pulling a bouncing out the direction and fading out on the last half bounce</dd><dt>show</dt><dd>Shows the element by pulling a bouncing in from the direction fading in on the the first half bounce.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd><dt>effect</dt><dd>Just bounces the element, doesn't hide or show.</dd></dl>
+        /// </summary>
+        Mode,
+
+        /// <summary>
+        /// The number of times the element will bounce.  When used with hide or show, there is an extra "half" bounce for the fade in/out
+        /// </summary>
+        Times
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Bounce/BounceOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Bounce/BounceOptions.cs
new file mode 100644
index 000000000..0617fd83e
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Bounce/BounceOptions.cs
@@ -0,0 +1,109 @@
+// BounceOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Bounce.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class BounceOptions {
+
+        public BounceOptions() {
+        }
+
+        public BounceOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>The direction the blind will be pulled to "hide" the element., or the direction from which the element will be revealed.</para><para>Possible Values</para><dl><dt>up</dt><dt>down</dt><dt>left</dt><dt>right</dt></dl>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Direction {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The distance of the largest "bounce" in pixels
+        /// </summary>
+        [IntrinsicProperty]
+        public int Distance {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element by pulling a bouncing out the direction and fading out on the last half bounce</dd><dt>show</dt><dd>Shows the element by pulling a bouncing in from the direction fading in on the the first half bounce.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd><dt>effect</dt><dd>Just bounces the element, doesn't hide or show.</dd></dl>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Mode {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of times the element will bounce.  When used with hide or show, there is an extra "half" bounce for the fade in/out
+        /// </summary>
+        [IntrinsicProperty]
+        public int Times {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Clip/ClipObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Clip/ClipObject.cs
new file mode 100644
index 000000000..3499bdd4f
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Clip/ClipObject.cs
@@ -0,0 +1,34 @@
+// ClipObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// The clip effect will hide or show an element by clipping the element vertically or horizontally
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class ClipObject : EffectObject {
+
+        private ClipObject() {
+        }
+
+        [ScriptName("clip")]
+        public ClipObject Clip() {
+            return null;
+        }
+
+        [ScriptName("clip")]
+        public ClipObject Clip(ClipOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Clip/ClipOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Clip/ClipOption.cs
new file mode 100644
index 000000000..de60f2d3b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Clip/ClipOption.cs
@@ -0,0 +1,44 @@
+// ClipOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Clip.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ClipOption {
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// <para>The plane in which the clip effect will hide or show its element</para><para>Possible Values</para><dl><dt>vertical</dt><dd>Uses top &amp; bottom edges</dd><dt>horizontal</dt><dd>Uses left &amp; right edges</dd></dl>
+        /// </summary>
+        Direction,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element</dd><dt>show</dt><dd>Shows the element.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        Mode
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Clip/ClipOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Clip/ClipOptions.cs
new file mode 100644
index 000000000..1c6e306aa
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Clip/ClipOptions.cs
@@ -0,0 +1,85 @@
+// ClipOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Clip.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class ClipOptions {
+
+        public ClipOptions() {
+        }
+
+        public ClipOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>The plane in which the clip effect will hide or show its element</para><para>Possible Values</para><dl><dt>vertical</dt><dd>Uses top &amp; bottom edges</dd><dt>horizontal</dt><dd>Uses left &amp; right edges</dd></dl>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Direction {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element</dd><dt>show</dt><dd>Shows the element.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Mode {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Drop/DropObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Drop/DropObject.cs
new file mode 100644
index 000000000..bd0fb7aa5
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Drop/DropObject.cs
@@ -0,0 +1,34 @@
+// DropObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// The drop effect hides or shows an element fading in/out and sliding in a direction.
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class DropObject : EffectObject {
+
+        private DropObject() {
+        }
+
+        [ScriptName("drop")]
+        public DropObject Drop() {
+            return null;
+        }
+
+        [ScriptName("drop")]
+        public DropObject Drop(DropOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Drop/DropOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Drop/DropOption.cs
new file mode 100644
index 000000000..ca7d76ea4
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Drop/DropOption.cs
@@ -0,0 +1,44 @@
+// DropOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Drop.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum DropOption {
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// <para>The direction the element will fall to "hide" the element, or the direction from which the element will be revealed.</para><para>Possible Values</para><dl><dt>up</dt><dt>down</dt><dt>left</dt><dt>right</dt></dl>
+        /// </summary>
+        Direction,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element by dropping in the direction</dd><dt>show</dt><dd>Shows the element by undropping from the direction. This seems inverted from the hide.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        Mode
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Drop/DropOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Drop/DropOptions.cs
new file mode 100644
index 000000000..4aba9006e
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Drop/DropOptions.cs
@@ -0,0 +1,85 @@
+// DropOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Drop.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DropOptions {
+
+        public DropOptions() {
+        }
+
+        public DropOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>The direction the element will fall to "hide" the element, or the direction from which the element will be revealed.</para><para>Possible Values</para><dl><dt>up</dt><dt>down</dt><dt>left</dt><dt>right</dt></dl>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Direction {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element by dropping in the direction</dd><dt>show</dt><dd>Shows the element by undropping from the direction. This seems inverted from the hide.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Mode {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Effect/EffectMethod.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Effect/EffectMethod.cs
new file mode 100644
index 000000000..ad2cb0ad6
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Effect/EffectMethod.cs
@@ -0,0 +1,61 @@
+// EffectMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Operations supported by Effect.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum EffectMethod {
+
+        AddClass,
+
+        CreateWrapper,
+
+        CssUnit,
+
+        DisableSelection,
+
+        Effect,
+
+        EnableSelection,
+
+        Focus,
+
+        GetBaseline,
+
+        RemoveClass,
+
+        RemoveUniqueId,
+
+        RemoveWrapper,
+
+        Restore,
+
+        Save,
+
+        ScrollParent,
+
+        SetMode,
+
+        SetTransition,
+
+        SwitchClass,
+
+        Toggle,
+
+        ToggleClass,
+
+        UniqueId,
+
+        ZIndex
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Effect/EffectObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Effect/EffectObject.cs
new file mode 100644
index 000000000..a319ee9a0
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Effect/EffectObject.cs
@@ -0,0 +1,132 @@
+// EffectObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public abstract class EffectObject : jQueryUIObject {
+
+        protected EffectObject() {
+        }
+
+        [ScriptName("effect")]
+        public EffectObject Effect() {
+            return null;
+        }
+
+        [ScriptName("effect")]
+        public object Effect(EffectMethod method, params object[] options) {
+            return null;
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void AddClass(string classNames, object speed, object easing, Action callback) {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void CreateWrapper(object element) {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void CssUnit(string key) {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void Effect(string effect, object options, object speed, Action callback) {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void GetBaseline(object origin, object original) {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void RemoveClass(string classNames, object speed, object easing, Action callback) {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void RemoveWrapper(object element) {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void Restore(object element, object set) {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void Save(object element, object set) {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SetMode(object el, object mode) {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SetTransition(object element, object list, object factor, object value) {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void SwitchClass(string remove, string add, object speed, object easing, Action callback) {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void Toggle(object speed) {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public void ToggleClass(string classNames, bool force, object speed, object easing, Action callback) {
+        }
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Explode/ExplodeObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Explode/ExplodeObject.cs
new file mode 100644
index 000000000..241db7396
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Explode/ExplodeObject.cs
@@ -0,0 +1,34 @@
+// ExplodeObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// The explode effect hides or shows an element by splitting it into pieces.
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class ExplodeObject : EffectObject {
+
+        private ExplodeObject() {
+        }
+
+        [ScriptName("explode")]
+        public ExplodeObject Explode() {
+            return null;
+        }
+
+        [ScriptName("explode")]
+        public ExplodeObject Explode(ExplodeOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Explode/ExplodeOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Explode/ExplodeOption.cs
new file mode 100644
index 000000000..5f52d7aa0
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Explode/ExplodeOption.cs
@@ -0,0 +1,44 @@
+// ExplodeOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Explode.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ExplodeOption {
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element.</dd><dt>show</dt><dd>Shows the element.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        Mode,
+
+        /// <summary>
+        /// The number of pieces to explode, should be a perfect square, any other values are rounded to the nearest square.
+        /// </summary>
+        Pieces
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Explode/ExplodeOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Explode/ExplodeOptions.cs
new file mode 100644
index 000000000..257369641
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Explode/ExplodeOptions.cs
@@ -0,0 +1,85 @@
+// ExplodeOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Explode.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class ExplodeOptions {
+
+        public ExplodeOptions() {
+        }
+
+        public ExplodeOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element.</dd><dt>show</dt><dd>Shows the element.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Mode {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of pieces to explode, should be a perfect square, any other values are rounded to the nearest square.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Pieces {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Fade/FadeObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Fade/FadeObject.cs
new file mode 100644
index 000000000..4269ef78a
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Fade/FadeObject.cs
@@ -0,0 +1,34 @@
+// FadeObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// The fade effect hides or shows an element by fading it.
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class FadeObject : EffectObject {
+
+        private FadeObject() {
+        }
+
+        [ScriptName("fade")]
+        public FadeObject Fade() {
+            return null;
+        }
+
+        [ScriptName("fade")]
+        public FadeObject Fade(FadeOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Fade/FadeOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Fade/FadeOption.cs
new file mode 100644
index 000000000..74f51a56d
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Fade/FadeOption.cs
@@ -0,0 +1,39 @@
+// FadeOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Fade.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum FadeOption {
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element.</dd><dt>show</dt><dd>Shows the element.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        Mode
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Fade/FadeOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Fade/FadeOptions.cs
new file mode 100644
index 000000000..4f42ad875
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Fade/FadeOptions.cs
@@ -0,0 +1,73 @@
+// FadeOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Fade.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class FadeOptions {
+
+        public FadeOptions() {
+        }
+
+        public FadeOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element.</dd><dt>show</dt><dd>Shows the element.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Mode {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Fold/FoldObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Fold/FoldObject.cs
new file mode 100644
index 000000000..8a5d6639e
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Fold/FoldObject.cs
@@ -0,0 +1,34 @@
+// FoldObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// The fold effect hides or shows an element by folding it.
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class FoldObject : EffectObject {
+
+        private FoldObject() {
+        }
+
+        [ScriptName("fold")]
+        public FoldObject Fold() {
+            return null;
+        }
+
+        [ScriptName("fold")]
+        public FoldObject Fold(FoldOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Fold/FoldOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Fold/FoldOption.cs
new file mode 100644
index 000000000..915cddeee
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Fold/FoldOption.cs
@@ -0,0 +1,49 @@
+// FoldOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Fold.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum FoldOption {
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// If the horizontal direction happens first when hiding. Remember, showing inverts hiding.
+        /// </summary>
+        HorizFirst,
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element.</dd><dt>show</dt><dd>Shows the element.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        Mode,
+
+        /// <summary>
+        /// The size of the "folded" element, can be a number representing px, or a string containing a percentage I.E. "50%"
+        /// </summary>
+        Size
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Fold/FoldOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Fold/FoldOptions.cs
new file mode 100644
index 000000000..ba5178431
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Fold/FoldOptions.cs
@@ -0,0 +1,97 @@
+// FoldOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Fold.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class FoldOptions {
+
+        public FoldOptions() {
+        }
+
+        public FoldOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If the horizontal direction happens first when hiding. Remember, showing inverts hiding.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool HorizFirst {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element.</dd><dt>show</dt><dd>Shows the element.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Mode {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The size of the "folded" element, can be a number representing px, or a string containing a percentage I.E. "50%"
+        /// </summary>
+        [IntrinsicProperty]
+        public object Size {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Highlight/HighlightObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Highlight/HighlightObject.cs
new file mode 100644
index 000000000..6a9c0a865
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Highlight/HighlightObject.cs
@@ -0,0 +1,34 @@
+// HighlightObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// The highlight effect hides or shows an element by animating its background color first.
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class HighlightObject : EffectObject {
+
+        private HighlightObject() {
+        }
+
+        [ScriptName("highlight")]
+        public HighlightObject Highlight() {
+            return null;
+        }
+
+        [ScriptName("highlight")]
+        public HighlightObject Highlight(HighlightOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Highlight/HighlightOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Highlight/HighlightOption.cs
new file mode 100644
index 000000000..d098342d5
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Highlight/HighlightOption.cs
@@ -0,0 +1,44 @@
+// HighlightOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Highlight.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum HighlightOption {
+
+        /// <summary>
+        /// The background color used during the animation
+        /// </summary>
+        Color,
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element.</dd><dt>show</dt><dd>Shows the element.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        Mode
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Highlight/HighlightOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Highlight/HighlightOptions.cs
new file mode 100644
index 000000000..e2db79fab
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Highlight/HighlightOptions.cs
@@ -0,0 +1,85 @@
+// HighlightOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Highlight.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class HighlightOptions {
+
+        public HighlightOptions() {
+        }
+
+        public HighlightOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// The background color used during the animation
+        /// </summary>
+        [IntrinsicProperty]
+        public string Color {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element.</dd><dt>show</dt><dd>Shows the element.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd></dl>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Mode {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Puff/PuffObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Puff/PuffObject.cs
new file mode 100644
index 000000000..820e90a77
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Puff/PuffObject.cs
@@ -0,0 +1,34 @@
+// PuffObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Creates a puff effect by scaling the element up and hiding it at the same time.
+    /// </summary>
+    /// <remarks>
+    /// This is the only effect without a separate file, it shares a file with the scale effect.
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class PuffObject : EffectObject {
+
+        private PuffObject() {
+        }
+
+        [ScriptName("puff")]
+        public PuffObject Puff() {
+            return null;
+        }
+
+        [ScriptName("puff")]
+        public PuffObject Puff(PuffOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Puff/PuffOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Puff/PuffOption.cs
new file mode 100644
index 000000000..94266e087
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Puff/PuffOption.cs
@@ -0,0 +1,44 @@
+// PuffOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Puff.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum PuffOption {
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// The mode of the effect. Can be "show" or "hide"
+        /// </summary>
+        Mode,
+
+        /// <summary>
+        /// The percentage to scale to.
+        /// </summary>
+        Percent
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Puff/PuffOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Puff/PuffOptions.cs
new file mode 100644
index 000000000..06dc13dd9
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Puff/PuffOptions.cs
@@ -0,0 +1,85 @@
+// PuffOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Puff.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class PuffOptions {
+
+        public PuffOptions() {
+        }
+
+        public PuffOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The mode of the effect. Can be "show" or "hide"
+        /// </summary>
+        [IntrinsicProperty]
+        public string Mode {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The percentage to scale to.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Percent {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Pulsate/PulsateObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Pulsate/PulsateObject.cs
new file mode 100644
index 000000000..c9fe25fde
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Pulsate/PulsateObject.cs
@@ -0,0 +1,34 @@
+// PulsateObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// The pulsate effect hides or shows an element by pulsing it in or out.
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class PulsateObject : EffectObject {
+
+        private PulsateObject() {
+        }
+
+        [ScriptName("pulsate")]
+        public PulsateObject Pulsate() {
+            return null;
+        }
+
+        [ScriptName("pulsate")]
+        public PulsateObject Pulsate(PulsateOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Pulsate/PulsateOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Pulsate/PulsateOption.cs
new file mode 100644
index 000000000..9a3669a93
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Pulsate/PulsateOption.cs
@@ -0,0 +1,44 @@
+// PulsateOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Pulsate.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum PulsateOption {
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element.</dd><dt>show</dt><dd>Shows the element.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd><dt>effect</dt><dd>Just pulsates.</dd></dl>
+        /// </summary>
+        Mode,
+
+        /// <summary>
+        /// The number of times the element should pulse.  An extra half pulse is added for hide/show
+        /// </summary>
+        Times
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Pulsate/PulsateOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Pulsate/PulsateOptions.cs
new file mode 100644
index 000000000..78e30ad36
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Pulsate/PulsateOptions.cs
@@ -0,0 +1,85 @@
+// PulsateOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Pulsate.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class PulsateOptions {
+
+        public PulsateOptions() {
+        }
+
+        public PulsateOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>UI Effect Mode</para><para>Possible Values: </para><dl><dt>hide</dt><dd>Hides the element.</dd><dt>show</dt><dd>Shows the element.</dd><dt>toggle</dt><dd>Will use <code>hide</code> or <code>show</code> depending on the current visibility of the element</dd><dt>effect</dt><dd>Just pulsates.</dd></dl>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Mode {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of times the element should pulse.  An extra half pulse is added for hide/show
+        /// </summary>
+        [IntrinsicProperty]
+        public int Times {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Scale/ScaleObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Scale/ScaleObject.cs
new file mode 100644
index 000000000..9d5dc203b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Scale/ScaleObject.cs
@@ -0,0 +1,34 @@
+// ScaleObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Shrink or grow an element by a percentage factor.
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class ScaleObject : EffectObject {
+
+        private ScaleObject() {
+        }
+
+        [ScriptName("scale")]
+        public ScaleObject Scale() {
+            return null;
+        }
+
+        [ScriptName("scale")]
+        public ScaleObject Scale(ScaleOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Scale/ScaleOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Scale/ScaleOption.cs
new file mode 100644
index 000000000..f9ce3614f
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Scale/ScaleOption.cs
@@ -0,0 +1,54 @@
+// ScaleOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Scale.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ScaleOption {
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// The direction of the effect. Can be "both", "vertical" or "horizontal".
+        /// </summary>
+        Direction,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// The vanishing point, default for show/hide.
+        /// </summary>
+        Origin,
+
+        /// <summary>
+        /// The percentage to scale to.
+        /// </summary>
+        Percent,
+
+        /// <summary>
+        /// Which areas of the element will be resized: 'both', 'box', 'content' Box resizes the border and padding of the element Content resizes any content inside of the element
+        /// </summary>
+        Scale
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Scale/ScaleOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Scale/ScaleOptions.cs
new file mode 100644
index 000000000..939f2af49
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Scale/ScaleOptions.cs
@@ -0,0 +1,109 @@
+// ScaleOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Scale.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class ScaleOptions {
+
+        public ScaleOptions() {
+        }
+
+        public ScaleOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The direction of the effect. Can be "both", "vertical" or "horizontal".
+        /// </summary>
+        [IntrinsicProperty]
+        public string Direction {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The vanishing point, default for show/hide.
+        /// </summary>
+        [IntrinsicProperty]
+        public Array Origin {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The percentage to scale to.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Percent {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Which areas of the element will be resized: 'both', 'box', 'content' Box resizes the border and padding of the element Content resizes any content inside of the element
+        /// </summary>
+        [IntrinsicProperty]
+        public string Scale {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Shake/ShakeObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Shake/ShakeObject.cs
new file mode 100644
index 000000000..c1854e56b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Shake/ShakeObject.cs
@@ -0,0 +1,34 @@
+// ShakeObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Shakes the element multiple times, vertically or horizontally.
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class ShakeObject : EffectObject {
+
+        private ShakeObject() {
+        }
+
+        [ScriptName("shake")]
+        public ShakeObject Shake() {
+            return null;
+        }
+
+        [ScriptName("shake")]
+        public ShakeObject Shake(ShakeOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Shake/ShakeOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Shake/ShakeOption.cs
new file mode 100644
index 000000000..6f86aca36
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Shake/ShakeOption.cs
@@ -0,0 +1,49 @@
+// ShakeOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Shake.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ShakeOption {
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// The direction of the effect. Can be "left", "right", "up", "down".
+        /// </summary>
+        Direction,
+
+        /// <summary>
+        /// Distance to shake.
+        /// </summary>
+        Distance,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// Times to shake.
+        /// </summary>
+        Times
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Shake/ShakeOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Shake/ShakeOptions.cs
new file mode 100644
index 000000000..55fdba022
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Shake/ShakeOptions.cs
@@ -0,0 +1,97 @@
+// ShakeOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Shake.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class ShakeOptions {
+
+        public ShakeOptions() {
+        }
+
+        public ShakeOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The direction of the effect. Can be "left", "right", "up", "down".
+        /// </summary>
+        [IntrinsicProperty]
+        public string Direction {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Distance to shake.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Distance {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Times to shake.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Times {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Size/SizeObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Size/SizeObject.cs
new file mode 100644
index 000000000..3e7b37138
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Size/SizeObject.cs
@@ -0,0 +1,34 @@
+// SizeObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Resize an element to a specified width and height.
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class SizeObject : EffectObject {
+
+        private SizeObject() {
+        }
+
+        [ScriptName("size")]
+        public new SizeObject Size() {
+            return null;
+        }
+
+        [ScriptName("size")]
+        public SizeObject Size(SizeOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Size/SizeOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Size/SizeOption.cs
new file mode 100644
index 000000000..f4d96f2af
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Size/SizeOption.cs
@@ -0,0 +1,49 @@
+// SizeOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Size.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum SizeOption {
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// The vanishing point, default for show/hide.
+        /// </summary>
+        Origin,
+
+        /// <summary>
+        /// Which areas of the element will be resized: 'both', 'box', 'content' Box resizes the border and padding of the element Content resizes any content inside of the element.
+        /// </summary>
+        Scale,
+
+        /// <summary>
+        /// Height and width to resize to.{ height: .., width: .. }
+        /// </summary>
+        To
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Size/SizeOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Size/SizeOptions.cs
new file mode 100644
index 000000000..646783012
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Size/SizeOptions.cs
@@ -0,0 +1,97 @@
+// SizeOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Size.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SizeOptions {
+
+        public SizeOptions() {
+        }
+
+        public SizeOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The vanishing point, default for show/hide.
+        /// </summary>
+        [IntrinsicProperty]
+        public Array Origin {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Which areas of the element will be resized: 'both', 'box', 'content' Box resizes the border and padding of the element Content resizes any content inside of the element.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Scale {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Height and width to resize to.{ height: .., width: .. }
+        /// </summary>
+        [IntrinsicProperty]
+        public object To {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Slide/SlideObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Slide/SlideObject.cs
new file mode 100644
index 000000000..51682d7bb
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Slide/SlideObject.cs
@@ -0,0 +1,34 @@
+// SlideObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Slides the element out of the viewport.
+    /// </summary>
+    /// <remarks>
+    /// 
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class SlideObject : EffectObject {
+
+        private SlideObject() {
+        }
+
+        [ScriptName("slide")]
+        public SlideObject Slide() {
+            return null;
+        }
+
+        [ScriptName("slide")]
+        public SlideObject Slide(SlideOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Slide/SlideOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Slide/SlideOption.cs
new file mode 100644
index 000000000..730e719b9
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Slide/SlideOption.cs
@@ -0,0 +1,49 @@
+// SlideOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Slide.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum SlideOption {
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// The direction of the effect. Can be "left", "right", "up", "down".
+        /// </summary>
+        Direction,
+
+        /// <summary>
+        /// The distance of the effect. Is set to either the height or width of the elemenet depending on the direction option. Can be set to any integer less than the width/height of the element.
+        /// </summary>
+        Distance,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// The mode of the effect. Can be "show" or "hide"
+        /// </summary>
+        Mode
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Slide/SlideOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Slide/SlideOptions.cs
new file mode 100644
index 000000000..1fd5f5c1b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Slide/SlideOptions.cs
@@ -0,0 +1,97 @@
+// SlideOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Slide.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SlideOptions {
+
+        public SlideOptions() {
+        }
+
+        public SlideOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The direction of the effect. Can be "left", "right", "up", "down".
+        /// </summary>
+        [IntrinsicProperty]
+        public string Direction {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The distance of the effect. Is set to either the height or width of the elemenet depending on the direction option. Can be set to any integer less than the width/height of the element.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Distance {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The mode of the effect. Can be "show" or "hide"
+        /// </summary>
+        [IntrinsicProperty]
+        public string Mode {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Transfer/TransferObject.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Transfer/TransferObject.cs
new file mode 100644
index 000000000..4158bb95a
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Transfer/TransferObject.cs
@@ -0,0 +1,34 @@
+// TransferObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Transfers the outline of an element to another element
+    /// </summary>
+    /// <remarks>
+    /// Very useful when trying to visualize interaction between two elements.<para>The transfer element iself has the class name "ui-effects-transfer", and needs to be styled by you, for example by adding a background or border.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class TransferObject : EffectObject {
+
+        private TransferObject() {
+        }
+
+        [ScriptName("transfer")]
+        public TransferObject Transfer() {
+            return null;
+        }
+
+        [ScriptName("transfer")]
+        public TransferObject Transfer(TransferOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Transfer/TransferOption.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Transfer/TransferOption.cs
new file mode 100644
index 000000000..042058478
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Transfer/TransferOption.cs
@@ -0,0 +1,44 @@
+// TransferOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options for use with Transfer.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum TransferOption {
+
+        /// <summary>
+        /// Optional class name the transfer element will receive.
+        /// </summary>
+        ClassName,
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        Easing,
+
+        /// <summary>
+        /// jQuery selector, the element to transfer to.
+        /// </summary>
+        To
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Effects/Transfer/TransferOptions.cs b/src/Libraries/jQuery/jQuery.UI/Effects/Transfer/TransferOptions.cs
new file mode 100644
index 000000000..0950da3ed
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Effects/Transfer/TransferOptions.cs
@@ -0,0 +1,85 @@
+// TransferOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Effects {
+
+    /// <summary>
+    /// Options used to initialize or customize Transfer.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class TransferOptions {
+
+        public TransferOptions() {
+        }
+
+        public TransferOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// Optional class name the transfer element will receive.
+        /// </summary>
+        [IntrinsicProperty]
+        public string ClassName {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// A callback function, executed when the effect completes
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Complete {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The number of ms the animation will run for
+        /// </summary>
+        [IntrinsicProperty]
+        public int Duration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The easing function to use
+        /// </summary>
+        [IntrinsicProperty]
+        public string Easing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// jQuery selector, the element to transfer to.
+        /// </summary>
+        [IntrinsicProperty]
+        public string To {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DragEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DragEvent.cs
new file mode 100644
index 000000000..44c63c29d
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DragEvent.cs
@@ -0,0 +1,43 @@
+// DragEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DragEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DragStartEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DragStartEvent.cs
new file mode 100644
index 000000000..8eb1ab877
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DragStartEvent.cs
@@ -0,0 +1,43 @@
+// DragStartEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DragStartEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DragStopEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DragStopEvent.cs
new file mode 100644
index 000000000..3b8a65fdf
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DragStopEvent.cs
@@ -0,0 +1,43 @@
+// DragStopEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DragStopEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DraggableEvents.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DraggableEvents.cs
new file mode 100644
index 000000000..30a6aac27
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DraggableEvents.cs
@@ -0,0 +1,39 @@
+// DraggableEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Events raised by Draggable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum DraggableEvents {
+
+        /// <summary>
+        /// This event is triggered when the draggable is created.
+        /// </summary>
+        Create,
+
+        /// <summary>
+        /// This event is triggered when the mouse is moved during the dragging.
+        /// </summary>
+        Drag,
+
+        /// <summary>
+        /// This event is triggered when dragging starts.
+        /// </summary>
+        Start,
+
+        /// <summary>
+        /// This event is triggered when dragging stops.
+        /// </summary>
+        Stop
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DraggableObject.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DraggableObject.cs
new file mode 100644
index 000000000..b44aee253
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DraggableObject.cs
@@ -0,0 +1,34 @@
+// DraggableObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Allow mouse interactions with elements, moving them around
+    /// </summary>
+    /// <remarks>
+    /// <para>The jQuery UI Draggable plugin makes selected elements draggable by mouse.</para><para>Draggable elements gets a class of <code>ui-draggable</code>. During drag the element also gets a class of <code>ui-draggable-dragging</code>. If you want not just drag, but drag-and-drop, see the jQuery UI Droppable plugin, which provides a drop target for draggables.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class DraggableObject : WidgetObject {
+
+        private DraggableObject() {
+        }
+
+        [ScriptName("draggable")]
+        public DraggableObject Draggable() {
+            return null;
+        }
+
+        [ScriptName("draggable")]
+        public DraggableObject Draggable(DraggableOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DraggableOption.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DraggableOption.cs
new file mode 100644
index 000000000..9b0eab69b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DraggableOption.cs
@@ -0,0 +1,159 @@
+// DraggableOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Options for use with Draggable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum DraggableOption {
+
+        /// <summary>
+        /// If set to false, will prevent the <code>ui-draggable</code> class from being added. This may be desired as a performance optimization when calling <code>.draggable()</code> init on many hundreds of elements.
+        /// </summary>
+        AddClasses,
+
+        /// <summary>
+        /// The element passed to or selected by the <code>appendTo</code> option will be used as the draggable helper's container during dragging. By default, the helper is appended to the same container as the draggable.
+        /// </summary>
+        AppendTo,
+
+        /// <summary>
+        /// Constrains dragging to either the horizontal (x) or vertical (y) axis. Possible values: 'x', 'y'.
+        /// </summary>
+        Axis,
+
+        /// <summary>
+        /// Prevents dragging from starting on specified elements.
+        /// </summary>
+        Cancel,
+
+        /// <summary>
+        /// Allows the draggable to be dropped onto the specified sortables. If this option is used (<code>helper</code> must be set to 'clone' in order to work flawlessly), a draggable can be dropped onto a sortable list and then becomes part of it.
+        /// </summary>
+        ConnectToSortable,
+
+        /// <summary>
+        /// Constrains dragging to within the bounds of the specified element or region. Possible string values: 'parent', 'document', 'window', [x1, y1, x2, y2].
+        /// </summary>
+        Containment,
+
+        /// <summary>
+        /// The css cursor during the drag operation.
+        /// </summary>
+        Cursor,
+
+        /// <summary>
+        /// Sets the offset of the dragging helper relative to the mouse cursor. Coordinates can be given as a hash using a combination of one or two keys: <code>{ top, left, right, bottom }</code>.
+        /// </summary>
+        CursorAt,
+
+        /// <summary>
+        /// Time in milliseconds after mousedown until dragging should start. This option can be used to prevent unwanted drags when clicking on an element.
+        /// </summary>
+        Delay,
+
+        /// <summary>
+        /// Disables the draggable if set to true.
+        /// </summary>
+        Disabled,
+
+        /// <summary>
+        /// Distance in pixels after mousedown the mouse must move before dragging should start. This option can be used to prevent unwanted drags when clicking on an element.
+        /// </summary>
+        Distance,
+
+        /// <summary>
+        /// Snaps the dragging helper to a grid, every x and y pixels. Array values: [x, y]
+        /// </summary>
+        Grid,
+
+        /// <summary>
+        /// If specified, restricts drag start click to the specified element(s).
+        /// </summary>
+        Handle,
+
+        /// <summary>
+        /// Allows for a helper element to be used for dragging display. Possible values: 'original', 'clone', Function. If a function is specified, it must return a DOMElement.
+        /// </summary>
+        Helper,
+
+        /// <summary>
+        /// Prevent iframes from capturing the mousemove events during a drag. Useful in combination with cursorAt, or in any case, if the mouse cursor is not over the helper. If set to true, transparent overlays will be placed over all iframes on the page. If a selector is supplied, the matched iframes will have an overlay placed over them.
+        /// </summary>
+        IframeFix,
+
+        /// <summary>
+        /// Opacity for the helper while being dragged.
+        /// </summary>
+        Opacity,
+
+        /// <summary>
+        /// If set to true, all droppable positions are calculated on every mousemove. Caution: This solves issues on highly dynamic pages, but dramatically decreases performance.
+        /// </summary>
+        RefreshPositions,
+
+        /// <summary>
+        /// If set to true, the element will return to its start position when dragging stops. Possible string values: 'valid', 'invalid'. If set to invalid, revert will only occur if the draggable has not been dropped on a droppable. For valid, it's the other way around.
+        /// </summary>
+        Revert,
+
+        /// <summary>
+        /// The duration of the revert animation, in milliseconds. Ignored if revert is false.
+        /// </summary>
+        RevertDuration,
+
+        /// <summary>
+        /// Used to group sets of draggable and droppable items, in addition to droppable's accept option. A draggable with the same scope value as a droppable will be accepted by the droppable.
+        /// </summary>
+        Scope,
+
+        /// <summary>
+        /// If set to true, container auto-scrolls while dragging.
+        /// </summary>
+        Scroll,
+
+        /// <summary>
+        /// Distance in pixels from the edge of the viewport after which the viewport should scroll. Distance is relative to pointer, not the draggable.
+        /// </summary>
+        ScrollSensitivity,
+
+        /// <summary>
+        /// The speed at which the window should scroll once the mouse pointer gets within the <code>scrollSensitivity</code> distance.
+        /// </summary>
+        ScrollSpeed,
+
+        /// <summary>
+        /// If set to a selector or to true (equivalent to '.ui-draggable'), the draggable will snap to the edges of the selected elements when near an edge of the element.
+        /// </summary>
+        Snap,
+
+        /// <summary>
+        /// Determines which edges of snap elements the draggable will snap to. Ignored if snap is false. Possible values: 'inner', 'outer', 'both'
+        /// </summary>
+        SnapMode,
+
+        /// <summary>
+        /// The distance in pixels from the snap element edges at which snapping should occur. Ignored if snap is false.
+        /// </summary>
+        SnapTolerance,
+
+        /// <summary>
+        /// Controls the z-Index of the set of elements that match the selector, always brings to front the dragged item. Very useful in things like window managers.
+        /// </summary>
+        Stack,
+
+        /// <summary>
+        /// z-index for the helper while being dragged.
+        /// </summary>
+        ZIndex
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DraggableOptions.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DraggableOptions.cs
new file mode 100644
index 000000000..9bbb3001b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Draggable/DraggableOptions.cs
@@ -0,0 +1,409 @@
+// DraggableOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Options used to initialize or customize Draggable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DraggableOptions {
+
+        public DraggableOptions() {
+        }
+
+        public DraggableOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// This event is triggered when the draggable is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the mouse is moved during the dragging.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<DragEvent> Drag {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when dragging starts.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<DragStartEvent> Start {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when dragging stops.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<DragStopEvent> Stop {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// If set to false, will prevent the <code>ui-draggable</code> class from being added. This may be desired as a performance optimization when calling <code>.draggable()</code> init on many hundreds of elements.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool AddClasses {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The element passed to or selected by the <code>appendTo</code> option will be used as the draggable helper's container during dragging. By default, the helper is appended to the same container as the draggable.
+        /// </summary>
+        [IntrinsicProperty]
+        public object AppendTo {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Constrains dragging to either the horizontal (x) or vertical (y) axis. Possible values: 'x', 'y'.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Axis {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Prevents dragging from starting on specified elements.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Cancel {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Allows the draggable to be dropped onto the specified sortables. If this option is used (<code>helper</code> must be set to 'clone' in order to work flawlessly), a draggable can be dropped onto a sortable list and then becomes part of it.
+        /// </summary>
+        [IntrinsicProperty]
+        public string ConnectToSortable {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Constrains dragging to within the bounds of the specified element or region. Possible string values: 'parent', 'document', 'window', [x1, y1, x2, y2].
+        /// </summary>
+        [IntrinsicProperty]
+        public object Containment {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The css cursor during the drag operation.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Cursor {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Sets the offset of the dragging helper relative to the mouse cursor. Coordinates can be given as a hash using a combination of one or two keys: <code>{ top, left, right, bottom }</code>.
+        /// </summary>
+        [IntrinsicProperty]
+        public object CursorAt {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Time in milliseconds after mousedown until dragging should start. This option can be used to prevent unwanted drags when clicking on an element.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Delay {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Disables the draggable if set to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Disabled {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Distance in pixels after mousedown the mouse must move before dragging should start. This option can be used to prevent unwanted drags when clicking on an element.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Distance {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Snaps the dragging helper to a grid, every x and y pixels. Array values: [x, y]
+        /// </summary>
+        [IntrinsicProperty]
+        public Array Grid {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If specified, restricts drag start click to the specified element(s).
+        /// </summary>
+        [IntrinsicProperty]
+        public object Handle {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Allows for a helper element to be used for dragging display. Possible values: 'original', 'clone', Function. If a function is specified, it must return a DOMElement.
+        /// </summary>
+        [IntrinsicProperty]
+        public object Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Prevent iframes from capturing the mousemove events during a drag. Useful in combination with cursorAt, or in any case, if the mouse cursor is not over the helper. If set to true, transparent overlays will be placed over all iframes on the page. If a selector is supplied, the matched iframes will have an overlay placed over them.
+        /// </summary>
+        [IntrinsicProperty]
+        public object IframeFix {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Opacity for the helper while being dragged.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Opacity {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to true, all droppable positions are calculated on every mousemove. Caution: This solves issues on highly dynamic pages, but dramatically decreases performance.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool RefreshPositions {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to true, the element will return to its start position when dragging stops. Possible string values: 'valid', 'invalid'. If set to invalid, revert will only occur if the draggable has not been dropped on a droppable. For valid, it's the other way around.
+        /// </summary>
+        [IntrinsicProperty]
+        public object Revert {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The duration of the revert animation, in milliseconds. Ignored if revert is false.
+        /// </summary>
+        [IntrinsicProperty]
+        public int RevertDuration {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Used to group sets of draggable and droppable items, in addition to droppable's accept option. A draggable with the same scope value as a droppable will be accepted by the droppable.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Scope {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to true, container auto-scrolls while dragging.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Scroll {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Distance in pixels from the edge of the viewport after which the viewport should scroll. Distance is relative to pointer, not the draggable.
+        /// </summary>
+        [IntrinsicProperty]
+        public int ScrollSensitivity {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The speed at which the window should scroll once the mouse pointer gets within the <code>scrollSensitivity</code> distance.
+        /// </summary>
+        [IntrinsicProperty]
+        public int ScrollSpeed {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to a selector or to true (equivalent to '.ui-draggable'), the draggable will snap to the edges of the selected elements when near an edge of the element.
+        /// </summary>
+        [IntrinsicProperty]
+        public object Snap {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Determines which edges of snap elements the draggable will snap to. Ignored if snap is false. Possible values: 'inner', 'outer', 'both'
+        /// </summary>
+        [IntrinsicProperty]
+        public string SnapMode {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The distance in pixels from the snap element edges at which snapping should occur. Ignored if snap is false.
+        /// </summary>
+        [IntrinsicProperty]
+        public int SnapTolerance {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Controls the z-Index of the set of elements that match the selector, always brings to front the dragged item. Very useful in things like window managers.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Stack {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// z-index for the helper while being dragged.
+        /// </summary>
+        [IntrinsicProperty]
+        public int ZIndex {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DropActivateEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DropActivateEvent.cs
new file mode 100644
index 000000000..925134ef8
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DropActivateEvent.cs
@@ -0,0 +1,52 @@
+// DropActivateEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DropActivateEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Draggable {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DropDeactivateEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DropDeactivateEvent.cs
new file mode 100644
index 000000000..b74c7e65b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DropDeactivateEvent.cs
@@ -0,0 +1,52 @@
+// DropDeactivateEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DropDeactivateEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Draggable {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DropEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DropEvent.cs
new file mode 100644
index 000000000..e917ccbbc
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DropEvent.cs
@@ -0,0 +1,52 @@
+// DropEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DropEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Draggable {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DropOverEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DropOverEvent.cs
new file mode 100644
index 000000000..18712f864
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DropOverEvent.cs
@@ -0,0 +1,52 @@
+// DropOverEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DropOverEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Draggable {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DroppableEvents.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DroppableEvents.cs
new file mode 100644
index 000000000..c68b817bc
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DroppableEvents.cs
@@ -0,0 +1,49 @@
+// DroppableEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Events raised by Droppable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum DroppableEvents {
+
+        /// <summary>
+        /// This event is triggered any time an accepted draggable starts dragging. This can be useful if you want to make the droppable 'light up' when it can be dropped on.
+        /// </summary>
+        Activate,
+
+        /// <summary>
+        /// This event is triggered when the droppable is created.
+        /// </summary>
+        Create,
+
+        /// <summary>
+        /// This event is triggered any time an accepted draggable stops dragging.
+        /// </summary>
+        Deactivate,
+
+        /// <summary>
+        /// This event is triggered when an accepted draggable is dropped 'over' (within the tolerance of) this droppable. In the callback, $(this) represents the droppable the draggable is dropped on.ui.draggable represents the draggable.
+        /// </summary>
+        Drop,
+
+        /// <summary>
+        /// This event is triggered when an accepted draggable is dragged out (within the tolerance of) this droppable.
+        /// </summary>
+        Out,
+
+        /// <summary>
+        /// This event is triggered as an accepted draggable is dragged 'over' (within the tolerance of) this droppable.
+        /// </summary>
+        Over
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DroppableObject.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DroppableObject.cs
new file mode 100644
index 000000000..7ca4a36de
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DroppableObject.cs
@@ -0,0 +1,34 @@
+// DroppableObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Create targets for draggable elements
+    /// </summary>
+    /// <remarks>
+    /// <para>The jQuery UI Droppable plugin makes selected elements droppable (meaning they accept being dropped on by draggables). You can specify which (individually) or which kind of draggables each will accept.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class DroppableObject : WidgetObject {
+
+        private DroppableObject() {
+        }
+
+        [ScriptName("droppable")]
+        public DroppableObject Droppable() {
+            return null;
+        }
+
+        [ScriptName("droppable")]
+        public DroppableObject Droppable(DroppableOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DroppableOption.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DroppableOption.cs
new file mode 100644
index 000000000..9de79afa6
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DroppableOption.cs
@@ -0,0 +1,59 @@
+// DroppableOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Options for use with Droppable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum DroppableOption {
+
+        /// <summary>
+        /// All draggables that match the selector will be accepted. If a function is specified, the function will be called for each draggable on the page (passed as the first argument to the function), to provide a custom filter. The function should return true if the draggable should be accepted.
+        /// </summary>
+        Accept,
+
+        /// <summary>
+        /// If specified, the class will be added to the droppable while an acceptable draggable is being dragged.
+        /// </summary>
+        ActiveClass,
+
+        /// <summary>
+        /// If set to false, will prevent the ui-droppable class from being added. This may be desired as a performance optimization when calling .droppable() init on many hundreds of elements.
+        /// </summary>
+        AddClasses,
+
+        /// <summary>
+        /// Disables the droppable if set to true.
+        /// </summary>
+        Disabled,
+
+        /// <summary>
+        /// If true, will prevent event propagation on nested droppables.
+        /// </summary>
+        Greedy,
+
+        /// <summary>
+        /// If specified, the class will be added to the droppable while an acceptable draggable is being hovered.
+        /// </summary>
+        HoverClass,
+
+        /// <summary>
+        /// Used to group sets of draggable and droppable items, in addition to droppable's accept option. A draggable with the same scope value as a droppable will be accepted.
+        /// </summary>
+        Scope,
+
+        /// <summary>
+        /// Specifies which mode to use for testing whether a draggable is 'over' a droppable. Possible values: 'fit', 'intersect', 'pointer', 'touch'.<ul><li>'''fit''': draggable overlaps the droppable entirely</li><li>'''intersect''': draggable overlaps the droppable at least 50%</li><li>'''pointer''': mouse pointer overlaps the droppable</li><li>'''touch''': draggable overlaps the droppable any amount</li></ul>
+        /// </summary>
+        Tolerance
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DroppableOptions.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DroppableOptions.cs
new file mode 100644
index 000000000..fdb441fac
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Droppable/DroppableOptions.cs
@@ -0,0 +1,193 @@
+// DroppableOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Options used to initialize or customize Droppable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DroppableOptions {
+
+        public DroppableOptions() {
+        }
+
+        public DroppableOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// This event is triggered any time an accepted draggable starts dragging. This can be useful if you want to make the droppable 'light up' when it can be dropped on.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<DropActivateEvent> Activate {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the droppable is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered any time an accepted draggable stops dragging.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<DropDeactivateEvent> Deactivate {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when an accepted draggable is dropped 'over' (within the tolerance of) this droppable. In the callback, $(this) represents the droppable the draggable is dropped on.ui.draggable represents the draggable.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<DropEvent> Drop {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when an accepted draggable is dragged out (within the tolerance of) this droppable.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<jQueryObject> Out {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered as an accepted draggable is dragged 'over' (within the tolerance of) this droppable.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<DropOverEvent> Over {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// All draggables that match the selector will be accepted. If a function is specified, the function will be called for each draggable on the page (passed as the first argument to the function), to provide a custom filter. The function should return true if the draggable should be accepted.
+        /// </summary>
+        [IntrinsicProperty]
+        public object Accept {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If specified, the class will be added to the droppable while an acceptable draggable is being dragged.
+        /// </summary>
+        [IntrinsicProperty]
+        public string ActiveClass {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to false, will prevent the ui-droppable class from being added. This may be desired as a performance optimization when calling .droppable() init on many hundreds of elements.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool AddClasses {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Disables the droppable if set to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Disabled {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If true, will prevent event propagation on nested droppables.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Greedy {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If specified, the class will be added to the droppable while an acceptable draggable is being hovered.
+        /// </summary>
+        [IntrinsicProperty]
+        public string HoverClass {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Used to group sets of draggable and droppable items, in addition to droppable's accept option. A draggable with the same scope value as a droppable will be accepted.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Scope {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Specifies which mode to use for testing whether a draggable is 'over' a droppable. Possible values: 'fit', 'intersect', 'pointer', 'touch'.<ul><li>'''fit''': draggable overlaps the droppable entirely</li><li>'''intersect''': draggable overlaps the droppable at least 50%</li><li>'''pointer''': mouse pointer overlaps the droppable</li><li>'''touch''': draggable overlaps the droppable any amount</li></ul>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Tolerance {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizableEvents.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizableEvents.cs
new file mode 100644
index 000000000..33401d08f
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizableEvents.cs
@@ -0,0 +1,39 @@
+// ResizableEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Events raised by Resizable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ResizableEvents {
+
+        /// <summary>
+        /// This event is triggered when the resizable is created.
+        /// </summary>
+        Create,
+
+        /// <summary>
+        /// This event is triggered during the resize, on the drag of the resize handler.
+        /// </summary>
+        Resize,
+
+        /// <summary>
+        /// This event is triggered at the start of a resize operation.
+        /// </summary>
+        Start,
+
+        /// <summary>
+        /// This event is triggered at the end of a resize operation.
+        /// </summary>
+        Stop
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizableObject.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizableObject.cs
new file mode 100644
index 000000000..a99740c3c
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizableObject.cs
@@ -0,0 +1,34 @@
+// ResizableObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Change the size of an element using the mouse
+    /// </summary>
+    /// <remarks>
+    /// <para>The jQuery UI Resizable plugin makes selected elements resizable (meaning they have draggable resize handles). You can specify one or more handles as well as min and max width and height.</para><para>All callbacks (start,stop,resize) receive two arguments: The original browser event and a prepared ui object.</para><para>This interaction requires some functional CSS, otherwise it won't work. If you build a custom theme, use the interaction's specific CSS file as a starting point.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class ResizableObject : WidgetObject {
+
+        private ResizableObject() {
+        }
+
+        [ScriptName("resizable")]
+        public ResizableObject Resizable() {
+            return null;
+        }
+
+        [ScriptName("resizable")]
+        public ResizableObject Resizable(ResizableOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizableOption.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizableOption.cs
new file mode 100644
index 000000000..db1e67eb3
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizableOption.cs
@@ -0,0 +1,114 @@
+// ResizableOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Options for use with Resizable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ResizableOption {
+
+        /// <summary>
+        /// Resize these elements synchronous when resizing.
+        /// </summary>
+        AlsoResize,
+
+        /// <summary>
+        /// Animates to the final size after resizing.
+        /// </summary>
+        Animate,
+
+        /// <summary>
+        /// Duration time for animating, in milliseconds. Other possible values: 'slow', 'normal', 'fast'.
+        /// </summary>
+        AnimateDuration,
+
+        /// <summary>
+        /// Easing effect for animating.
+        /// </summary>
+        AnimateEasing,
+
+        /// <summary>
+        /// If set to true, resizing is constrained by the original aspect ratio. Otherwise a custom aspect ratio can be specified, such as 9 / 16, or 0.5.
+        /// </summary>
+        AspectRatio,
+
+        /// <summary>
+        /// If set to true, automatically hides the handles except when the mouse hovers over the element.
+        /// </summary>
+        AutoHide,
+
+        /// <summary>
+        /// Prevents resizing if you start on elements matching the selector.
+        /// </summary>
+        Cancel,
+
+        /// <summary>
+        /// Constrains resizing to within the bounds of the specified element. Possible values: 'parent', 'document', a DOMElement, or a Selector.
+        /// </summary>
+        Containment,
+
+        /// <summary>
+        /// Tolerance, in milliseconds, for when resizing should start. If specified, resizing will not start until after mouse is moved beyond duration. This can help prevent unintended resizing when clicking on an element.
+        /// </summary>
+        Delay,
+
+        /// <summary>
+        /// Disables the resizable if set to true.
+        /// </summary>
+        Disabled,
+
+        /// <summary>
+        /// Tolerance, in pixels, for when resizing should start. If specified, resizing will not start until after mouse is moved beyond distance. This can help prevent unintended resizing when clicking on an element.
+        /// </summary>
+        Distance,
+
+        /// <summary>
+        /// If set to true, a semi-transparent helper element is shown for resizing.
+        /// </summary>
+        Ghost,
+
+        /// <summary>
+        /// Snaps the resizing element to a grid, every x and y pixels. Array values: [x, y]
+        /// </summary>
+        Grid,
+
+        /// <summary>
+        /// If specified as a string, should be a comma-split list of any of the following: 'n, e, s, w, ne, se, sw, nw, all'. The necessary handles will be auto-generated by the plugin.<para>If specified as an object, the following keys are supported: { n, e, s, w, ne, se, sw, nw }. The value of any specified should be a jQuery selector matching the child element of the resizable to use as that handle. If the handle is not a child of the resizable, you can pass in the DOMElement or a valid jQuery object directly.</para>
+        /// </summary>
+        Handles,
+
+        /// <summary>
+        /// This is the css class that will be added to a proxy element to outline the resize during the drag of the resize handle. Once the resize is complete, the original element is sized.
+        /// </summary>
+        Helper,
+
+        /// <summary>
+        /// This is the maximum height the resizable should be allowed to resize to.
+        /// </summary>
+        MaxHeight,
+
+        /// <summary>
+        /// This is the maximum width the resizable should be allowed to resize to.
+        /// </summary>
+        MaxWidth,
+
+        /// <summary>
+        /// This is the minimum height the resizable should be allowed to resize to.
+        /// </summary>
+        MinHeight,
+
+        /// <summary>
+        /// This is the minimum width the resizable should be allowed to resize to.
+        /// </summary>
+        MinWidth
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizableOptions.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizableOptions.cs
new file mode 100644
index 000000000..12169b340
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizableOptions.cs
@@ -0,0 +1,301 @@
+// ResizableOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Options used to initialize or customize Resizable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class ResizableOptions {
+
+        public ResizableOptions() {
+        }
+
+        public ResizableOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// This event is triggered when the resizable is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered during the resize, on the drag of the resize handler.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<ResizeEvent> Resize {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered at the start of a resize operation.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<ResizeStartEvent> Start {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered at the end of a resize operation.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<ResizeStopEvent> Stop {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Resize these elements synchronous when resizing.
+        /// </summary>
+        [IntrinsicProperty]
+        public object AlsoResize {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Animates to the final size after resizing.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Animate {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Duration time for animating, in milliseconds. Other possible values: 'slow', 'normal', 'fast'.
+        /// </summary>
+        [IntrinsicProperty]
+        public object AnimateDuration {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Easing effect for animating.
+        /// </summary>
+        [IntrinsicProperty]
+        public string AnimateEasing {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to true, resizing is constrained by the original aspect ratio. Otherwise a custom aspect ratio can be specified, such as 9 / 16, or 0.5.
+        /// </summary>
+        [IntrinsicProperty]
+        public object AspectRatio {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to true, automatically hides the handles except when the mouse hovers over the element.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool AutoHide {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Prevents resizing if you start on elements matching the selector.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Cancel {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Constrains resizing to within the bounds of the specified element. Possible values: 'parent', 'document', a DOMElement, or a Selector.
+        /// </summary>
+        [IntrinsicProperty]
+        public object Containment {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Tolerance, in milliseconds, for when resizing should start. If specified, resizing will not start until after mouse is moved beyond duration. This can help prevent unintended resizing when clicking on an element.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Delay {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Disables the resizable if set to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Disabled {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Tolerance, in pixels, for when resizing should start. If specified, resizing will not start until after mouse is moved beyond distance. This can help prevent unintended resizing when clicking on an element.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Distance {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to true, a semi-transparent helper element is shown for resizing.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Ghost {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Snaps the resizing element to a grid, every x and y pixels. Array values: [x, y]
+        /// </summary>
+        [IntrinsicProperty]
+        public Array Grid {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If specified as a string, should be a comma-split list of any of the following: 'n, e, s, w, ne, se, sw, nw, all'. The necessary handles will be auto-generated by the plugin.<para>If specified as an object, the following keys are supported: { n, e, s, w, ne, se, sw, nw }. The value of any specified should be a jQuery selector matching the child element of the resizable to use as that handle. If the handle is not a child of the resizable, you can pass in the DOMElement or a valid jQuery object directly.</para>
+        /// </summary>
+        [IntrinsicProperty]
+        public object Handles {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// This is the css class that will be added to a proxy element to outline the resize during the drag of the resize handle. Once the resize is complete, the original element is sized.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// This is the maximum height the resizable should be allowed to resize to.
+        /// </summary>
+        [IntrinsicProperty]
+        public int MaxHeight {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// This is the maximum width the resizable should be allowed to resize to.
+        /// </summary>
+        [IntrinsicProperty]
+        public int MaxWidth {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// This is the minimum height the resizable should be allowed to resize to.
+        /// </summary>
+        [IntrinsicProperty]
+        public int MinHeight {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// This is the minimum width the resizable should be allowed to resize to.
+        /// </summary>
+        [IntrinsicProperty]
+        public int MinWidth {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizeEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizeEvent.cs
new file mode 100644
index 000000000..c0e1eb12b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizeEvent.cs
@@ -0,0 +1,79 @@
+// ResizeEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class ResizeEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Element {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject OriginalElement {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalSize {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Size {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizeStartEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizeStartEvent.cs
new file mode 100644
index 000000000..c188ccf48
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizeStartEvent.cs
@@ -0,0 +1,79 @@
+// ResizeStartEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class ResizeStartEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Element {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject OriginalElement {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalSize {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Size {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizeStopEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizeStopEvent.cs
new file mode 100644
index 000000000..ee0a199a9
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Resizable/ResizeStopEvent.cs
@@ -0,0 +1,79 @@
+// ResizeStopEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class ResizeStopEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Element {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject OriginalElement {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalSize {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Size {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableEvents.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableEvents.cs
new file mode 100644
index 000000000..961b78a1b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableEvents.cs
@@ -0,0 +1,54 @@
+// SelectableEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Events raised by Selectable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum SelectableEvents {
+
+        /// <summary>
+        /// This event is triggered when the selectable is created.
+        /// </summary>
+        Create,
+
+        /// <summary>
+        /// This event is triggered at the end of the select operation, on each element added to the selection.
+        /// </summary>
+        Selected,
+
+        /// <summary>
+        /// This event is triggered during the select operation, on each element added to the selection.
+        /// </summary>
+        Selecting,
+
+        /// <summary>
+        /// This event is triggered at the beginning of the select operation.
+        /// </summary>
+        Start,
+
+        /// <summary>
+        /// This event is triggered at the end of the select operation.
+        /// </summary>
+        Stop,
+
+        /// <summary>
+        /// This event is triggered at the end of the select operation, on each element removed from the selection.
+        /// </summary>
+        Unselected,
+
+        /// <summary>
+        /// This event is triggered during the select operation, on each element removed from the selection.
+        /// </summary>
+        Unselecting
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableMethod.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableMethod.cs
new file mode 100644
index 000000000..4d45424bd
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableMethod.cs
@@ -0,0 +1,37 @@
+// SelectableMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Operations supported by Selectable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum SelectableMethod {
+
+        /// <summary>
+        /// The <code>destroy()</code> method cleans up all common data, events, etc. and then delegates out to <code>_destroy()</code> for custom cleanup.
+        /// </summary>
+        Destroy,
+
+        Disable,
+
+        Enable,
+
+        Option,
+
+        /// <summary>
+        /// Refresh the position and size of each selectee element. This method can be used to manually recalculate the position and size of each selectee element. Very useful if autoRefresh is set to false.
+        /// </summary>
+        Refresh,
+
+        Widget
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableObject.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableObject.cs
new file mode 100644
index 000000000..7afce58af
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableObject.cs
@@ -0,0 +1,46 @@
+// SelectableObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Use the mouse to select individual or a group of elements
+    /// </summary>
+    /// <remarks>
+    /// <para>The jQuery UI Selectable plugin allows for elements to be selected by dragging a box (sometimes called a lasso) with the mouse over the elements. Also, elements can be selected by click or drag while holding the Ctrl/Meta key, allowing for multiple (non-contiguous) selections.</para><para>This interaction requires some functional CSS, otherwise it won't work. If you build a custom theme, use the interaction's specific CSS file as a starting point.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class SelectableObject : WidgetObject {
+
+        private SelectableObject() {
+        }
+
+        [ScriptName("selectable")]
+        public SelectableObject Selectable() {
+            return null;
+        }
+
+        [ScriptName("selectable")]
+        public SelectableObject Selectable(SelectableOptions options) {
+            return null;
+        }
+
+        [ScriptName("selectable")]
+        public object Selectable(SelectableMethod method, params object[] options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Refresh the position and size of each selectee element. This method can be used to manually recalculate the position and size of each selectee element. Very useful if autoRefresh is set to false.
+        /// </summary>
+        public void Refresh() {
+        }
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableOption.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableOption.cs
new file mode 100644
index 000000000..794f181ba
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableOption.cs
@@ -0,0 +1,54 @@
+// SelectableOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Options for use with Selectable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum SelectableOption {
+
+        /// <summary>
+        /// This determines whether to refresh (recalculate) the position and size of each selectee at the beginning of each select operation. If you have many many items, you may want to set this to false and call the refresh method manually.
+        /// </summary>
+        AutoRefresh,
+
+        /// <summary>
+        /// Prevents selecting if you start on elements matching the selector.
+        /// </summary>
+        Cancel,
+
+        /// <summary>
+        /// Time in milliseconds to define when the selecting should start. It helps preventing unwanted selections when clicking on an element.
+        /// </summary>
+        Delay,
+
+        /// <summary>
+        /// Disables the selectable if set to true.
+        /// </summary>
+        Disabled,
+
+        /// <summary>
+        /// Tolerance, in pixels, for when selecting should start. If specified, selecting will not start until after mouse is dragged beyond distance.
+        /// </summary>
+        Distance,
+
+        /// <summary>
+        /// The matching child elements will be made selectees (able to be selected).
+        /// </summary>
+        Filter,
+
+        /// <summary>
+        /// Possible values: 'touch', 'fit'.<ul><li>'''fit''': draggable overlaps the droppable entirely</li><li>'''touch''': draggable overlaps the droppable any amount</li></ul>
+        /// </summary>
+        Tolerance
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableOptions.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableOptions.cs
new file mode 100644
index 000000000..217baef17
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableOptions.cs
@@ -0,0 +1,193 @@
+// SelectableOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Options used to initialize or customize Selectable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SelectableOptions {
+
+        public SelectableOptions() {
+        }
+
+        public SelectableOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// This event is triggered when the selectable is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered at the end of the select operation, on each element added to the selection.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SelectableSelectedEvent> Selected {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered during the select operation, on each element added to the selection.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SelectableSelectingEvent> Selecting {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered at the beginning of the select operation.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<jQueryObject> Start {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered at the end of the select operation.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<jQueryObject> Stop {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered at the end of the select operation, on each element removed from the selection.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SelectableUnselectedEvent> Unselected {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered during the select operation, on each element removed from the selection.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SelectableUnselectingEvent> Unselecting {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This determines whether to refresh (recalculate) the position and size of each selectee at the beginning of each select operation. If you have many many items, you may want to set this to false and call the refresh method manually.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool AutoRefresh {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Prevents selecting if you start on elements matching the selector.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Cancel {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Time in milliseconds to define when the selecting should start. It helps preventing unwanted selections when clicking on an element.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Delay {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Disables the selectable if set to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Disabled {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Tolerance, in pixels, for when selecting should start. If specified, selecting will not start until after mouse is dragged beyond distance.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Distance {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The matching child elements will be made selectees (able to be selected).
+        /// </summary>
+        [IntrinsicProperty]
+        public string Filter {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Possible values: 'touch', 'fit'.<ul><li>'''fit''': draggable overlaps the droppable entirely</li><li>'''touch''': draggable overlaps the droppable any amount</li></ul>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Tolerance {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableSelectedEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableSelectedEvent.cs
new file mode 100644
index 000000000..cd77c659b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableSelectedEvent.cs
@@ -0,0 +1,25 @@
+// SelectableSelectedEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SelectableSelectedEvent {
+
+        [IntrinsicProperty]
+        public object Selected {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableSelectingEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableSelectingEvent.cs
new file mode 100644
index 000000000..59def6556
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableSelectingEvent.cs
@@ -0,0 +1,25 @@
+// SelectableSelectingEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SelectableSelectingEvent {
+
+        [IntrinsicProperty]
+        public object Selecting {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableUnselectedEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableUnselectedEvent.cs
new file mode 100644
index 000000000..940ed6236
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableUnselectedEvent.cs
@@ -0,0 +1,25 @@
+// SelectableUnselectedEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SelectableUnselectedEvent {
+
+        [IntrinsicProperty]
+        public object Unselected {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableUnselectingEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableUnselectingEvent.cs
new file mode 100644
index 000000000..73ba526da
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Selectable/SelectableUnselectingEvent.cs
@@ -0,0 +1,25 @@
+// SelectableUnselectingEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SelectableUnselectingEvent {
+
+        [IntrinsicProperty]
+        public object Unselecting {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/Windows/Gadgets/GadgetFlyout.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortActivateEvent.cs
similarity index 51%
rename from src/Libraries/Windows/Gadgets/GadgetFlyout.cs
rename to src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortActivateEvent.cs
index cf85efb6c..ab0298253 100644
--- a/src/Libraries/Windows/Gadgets/GadgetFlyout.cs
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortActivateEvent.cs
@@ -1,36 +1,38 @@
-// GadgetFlyout.cs
-// Script#/Libraries/Windows
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// SortActivateEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
-using System.Html;
 using System.Runtime.CompilerServices;
 
-namespace System.Gadgets {
+namespace jQueryApi.UI.Interactions {
 
-    /// <summary>
-    /// Represents the flyout associated with the gadget.
-    /// </summary>
-    [IgnoreNamespace]
     [Imported]
-    public sealed class GadgetFlyout {
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SortActivateEvent {
 
-        private GadgetFlyout() {
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
         }
 
         [IntrinsicProperty]
-        public DocumentInstance Document {
+        public jQueryObject Item {
             get {
                 return null;
             }
+            set {
+            }
         }
 
         [IntrinsicProperty]
-        public string File {
+        public object Offset {
             get {
                 return null;
             }
@@ -39,7 +41,7 @@ public string File {
         }
 
         [IntrinsicProperty]
-        public Action OnHide {
+        public object OriginalPosition {
             get {
                 return null;
             }
@@ -48,7 +50,7 @@ public Action OnHide {
         }
 
         [IntrinsicProperty]
-        public Action OnShow {
+        public object Position {
             get {
                 return null;
             }
@@ -57,9 +59,9 @@ public Action OnShow {
         }
 
         [IntrinsicProperty]
-        public bool Show {
+        public jQueryObject Sender {
             get {
-                return false;
+                return null;
             }
             set {
             }
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortBeforeStopEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortBeforeStopEvent.cs
new file mode 100644
index 000000000..ef5738ed5
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortBeforeStopEvent.cs
@@ -0,0 +1,70 @@
+// SortBeforeStopEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SortBeforeStopEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Sender {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortChangeEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortChangeEvent.cs
new file mode 100644
index 000000000..f37ac5ca6
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortChangeEvent.cs
@@ -0,0 +1,70 @@
+// SortChangeEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SortChangeEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Sender {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortDeactivateEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortDeactivateEvent.cs
new file mode 100644
index 000000000..71873522d
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortDeactivateEvent.cs
@@ -0,0 +1,70 @@
+// SortDeactivateEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SortDeactivateEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Sender {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortEvent.cs
new file mode 100644
index 000000000..f7706298a
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortEvent.cs
@@ -0,0 +1,70 @@
+// SortEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SortEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Sender {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortOutEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortOutEvent.cs
new file mode 100644
index 000000000..f67c53f12
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortOutEvent.cs
@@ -0,0 +1,70 @@
+// SortOutEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SortOutEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Sender {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortOverEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortOverEvent.cs
new file mode 100644
index 000000000..759a01828
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortOverEvent.cs
@@ -0,0 +1,70 @@
+// SortOverEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SortOverEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Sender {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortReceiveEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortReceiveEvent.cs
new file mode 100644
index 000000000..11215b9f3
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortReceiveEvent.cs
@@ -0,0 +1,70 @@
+// SortReceiveEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SortReceiveEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Sender {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortRemoveEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortRemoveEvent.cs
new file mode 100644
index 000000000..569866bf3
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortRemoveEvent.cs
@@ -0,0 +1,70 @@
+// SortRemoveEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SortRemoveEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Sender {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortStartEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortStartEvent.cs
new file mode 100644
index 000000000..d9f0de87d
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortStartEvent.cs
@@ -0,0 +1,70 @@
+// SortStartEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SortStartEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Sender {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortStopEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortStopEvent.cs
new file mode 100644
index 000000000..cebb98174
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortStopEvent.cs
@@ -0,0 +1,70 @@
+// SortStopEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SortStopEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Sender {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortUpdateEvent.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortUpdateEvent.cs
new file mode 100644
index 000000000..4ab39c266
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortUpdateEvent.cs
@@ -0,0 +1,70 @@
+// SortUpdateEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SortUpdateEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OriginalPosition {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Sender {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableEvents.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableEvents.cs
new file mode 100644
index 000000000..c1175b4b2
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableEvents.cs
@@ -0,0 +1,84 @@
+// SortableEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Events raised by Sortable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum SortableEvents {
+
+        /// <summary>
+        /// This event is triggered when using connected lists, every connected list on drag start receives it.
+        /// </summary>
+        Activate,
+
+        /// <summary>
+        /// This event is triggered when sorting stops, but when the placeholder/helper is still available.
+        /// </summary>
+        BeforeStop,
+
+        /// <summary>
+        /// This event is triggered during sorting, but only when the DOM position has changed.
+        /// </summary>
+        Change,
+
+        /// <summary>
+        /// This event is triggered when the sortable is created.
+        /// </summary>
+        Create,
+
+        /// <summary>
+        /// This event is triggered when sorting was stopped, is propagated to all possible connected lists.
+        /// </summary>
+        Deactivate,
+
+        /// <summary>
+        /// This event is triggered when a sortable item is moved away from a connected list.
+        /// </summary>
+        Out,
+
+        /// <summary>
+        /// This event is triggered when a sortable item is moved into a connected list.
+        /// </summary>
+        Over,
+
+        /// <summary>
+        /// This event is triggered when a connected sortable list has received an item from another list.
+        /// </summary>
+        Receive,
+
+        /// <summary>
+        /// This event is triggered when a sortable item has been dragged out from the list and into another.
+        /// </summary>
+        Remove,
+
+        /// <summary>
+        /// This event is triggered during sorting.
+        /// </summary>
+        Sort,
+
+        /// <summary>
+        /// This event is triggered when sorting starts.
+        /// </summary>
+        Start,
+
+        /// <summary>
+        /// This event is triggered when sorting has stopped.
+        /// </summary>
+        Stop,
+
+        /// <summary>
+        /// This event is triggered when the user stopped sorting and the DOM position has changed.
+        /// </summary>
+        Update
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableMethod.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableMethod.cs
new file mode 100644
index 000000000..a7334f418
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableMethod.cs
@@ -0,0 +1,52 @@
+// SortableMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Operations supported by Sortable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum SortableMethod {
+
+        /// <summary>
+        /// Cancels a change in the current sortable and reverts it to the state prior to when the current sort was started. Useful in the stop and receive callback functions.<para>If the sortable item is not being moved from one connected sortable to another:</para><c>$(this).sortable('cancel');</c>will cancel the change.<para>If the sortable item is being moved from one connected sortable to another:</para><c>$(ui.sender).sortable('cancel');</c>will cancel the change. Useful in the 'receive' callback.
+        /// </summary>
+        Cancel,
+
+        /// <summary>
+        /// The <code>destroy()</code> method cleans up all common data, events, etc. and then delegates out to <code>_destroy()</code> for custom cleanup.
+        /// </summary>
+        Destroy,
+
+        Disable,
+
+        Enable,
+
+        Option,
+
+        /// <summary>
+        /// Refresh the sortable items. Custom trigger the reloading of all sortable items, causing new items to be recognized.
+        /// </summary>
+        Refresh,
+
+        /// <summary>
+        /// Refresh the cached positions of the sortables' items. Calling this method refreshes the cached item positions of all sortables. This is usually done automatically by the script and slows down performance. Use wisely.
+        /// </summary>
+        RefreshPositions,
+
+        /// <summary>
+        /// Serializes the sortable's item id's into a form/ajax submittable string. Calling this method produces a hash that can be appended to any url to easily submit a new item order back to the server.<para>It works by default by looking at the id of each item in the format 'setname_number', and it spits out a hash like "setname[]=number&amp;setname[]=number".</para><para>You can also give in a option hash as second argument to custom define how the function works. The possible options are: 'key' (replaces part1[] with whatever you want), 'attribute' (test another attribute than 'id') and 'expression' (use your own regexp).</para><para>If serialize returns an empty string, make sure the id attributes include an underscore.  They must be in the form: "set_number" For example, a 3 element list with id attributes foo_1, foo_5, foo_2 will serialize to foo[]=1&amp;foo[]=5&amp;foo[]=2. You can use an underscore, equal sign or hyphen to separate the set and number.  For example foo=1 or foo-1 or foo_1 all serialize to foo[]=1.</para>
+        /// </summary>
+        Serialize,
+
+        Widget
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableObject.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableObject.cs
new file mode 100644
index 000000000..5e56ea030
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableObject.cs
@@ -0,0 +1,67 @@
+// SortableObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Reorder elements in a list or grid using the mouse
+    /// </summary>
+    /// <remarks>
+    /// <para>The jQuery UI Sortable plugin makes selected elements sortable by dragging with the mouse.</para><para>All callbacks receive two arguments: The original browser event and a prepared ui object.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class SortableObject : WidgetObject {
+
+        private SortableObject() {
+        }
+
+        [ScriptName("sortable")]
+        public SortableObject Sortable() {
+            return null;
+        }
+
+        [ScriptName("sortable")]
+        public SortableObject Sortable(SortableOptions options) {
+            return null;
+        }
+
+        [ScriptName("sortable")]
+        public object Sortable(SortableMethod method, params object[] options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Cancels a change in the current sortable and reverts it to the state prior to when the current sort was started. Useful in the stop and receive callback functions.<para>If the sortable item is not being moved from one connected sortable to another:</para><c>$(this).sortable('cancel');</c>will cancel the change.<para>If the sortable item is being moved from one connected sortable to another:</para><c>$(ui.sender).sortable('cancel');</c>will cancel the change. Useful in the 'receive' callback.
+        /// </summary>
+        public void Cancel() {
+        }
+
+
+        /// <summary>
+        /// Refresh the sortable items. Custom trigger the reloading of all sortable items, causing new items to be recognized.
+        /// </summary>
+        public void Refresh() {
+        }
+
+
+        /// <summary>
+        /// Refresh the cached positions of the sortables' items. Calling this method refreshes the cached item positions of all sortables. This is usually done automatically by the script and slows down performance. Use wisely.
+        /// </summary>
+        public void RefreshPositions() {
+        }
+
+
+        /// <summary>
+        /// Serializes the sortable's item id's into a form/ajax submittable string. Calling this method produces a hash that can be appended to any url to easily submit a new item order back to the server.<para>It works by default by looking at the id of each item in the format 'setname_number', and it spits out a hash like "setname[]=number&amp;setname[]=number".</para><para>You can also give in a option hash as second argument to custom define how the function works. The possible options are: 'key' (replaces part1[] with whatever you want), 'attribute' (test another attribute than 'id') and 'expression' (use your own regexp).</para><para>If serialize returns an empty string, make sure the id attributes include an underscore.  They must be in the form: "set_number" For example, a 3 element list with id attributes foo_1, foo_5, foo_2 will serialize to foo[]=1&amp;foo[]=5&amp;foo[]=2. You can use an underscore, equal sign or hyphen to separate the set and number.  For example foo=1 or foo-1 or foo_1 all serialize to foo[]=1.</para>
+        /// </summary>
+        public void Serialize(object options) {
+        }
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableOption.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableOption.cs
new file mode 100644
index 000000000..40623b574
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableOption.cs
@@ -0,0 +1,144 @@
+// SortableOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Options for use with Sortable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum SortableOption {
+
+        /// <summary>
+        /// Defines where the helper that moves with the mouse is being appended to during the drag (for example, to resolve overlap/zIndex issues).
+        /// </summary>
+        AppendTo,
+
+        /// <summary>
+        /// If defined, the items can be dragged only horizontally or vertically. Possible values:'x', 'y'.
+        /// </summary>
+        Axis,
+
+        /// <summary>
+        /// Prevents sorting if you start on elements matching the selector.
+        /// </summary>
+        Cancel,
+
+        /// <summary>
+        /// Takes a jQuery selector with items that also have sortables applied. If used, the sortable is now connected to the other one-way, so you can drag from this sortable to the other.
+        /// </summary>
+        ConnectWith,
+
+        /// <summary>
+        /// Constrains dragging to within the bounds of the specified element - can be a DOM element, 'parent', 'document', 'window', or a jQuery selector.<para>Note: the element specified for containment must have a calculated width and height (though it need not be explicit), so for example, if you have float:left sortable children and specify containment:'parent' be sure to have float:left on the sortable/parent container as well or it will have height: 0, causing undefined behavior.</para>
+        /// </summary>
+        Containment,
+
+        /// <summary>
+        /// Defines the cursor that is being shown while sorting.
+        /// </summary>
+        Cursor,
+
+        /// <summary>
+        /// Moves the sorting element or helper so the cursor always appears to drag from the same position. Coordinates can be given as a hash using a combination of one or two keys: <code>{ top, left, right, bottom }</code>.
+        /// </summary>
+        CursorAt,
+
+        /// <summary>
+        /// Time in milliseconds to define when the sorting should start. It helps preventing unwanted drags when clicking on an element.
+        /// </summary>
+        Delay,
+
+        /// <summary>
+        /// Disables the sortable if set to true.
+        /// </summary>
+        Disabled,
+
+        /// <summary>
+        /// Tolerance, in pixels, for when sorting should start. If specified, sorting will not start until after mouse is dragged beyond distance. Can be used to allow for clicks on elements within a handle.
+        /// </summary>
+        Distance,
+
+        /// <summary>
+        /// If false items from this sortable can't be dropped to an empty linked sortable.
+        /// </summary>
+        DropOnEmpty,
+
+        /// <summary>
+        /// If true, forces the helper to have a size.
+        /// </summary>
+        ForceHelperSize,
+
+        /// <summary>
+        /// If true, forces the placeholder to have a size.
+        /// </summary>
+        ForcePlaceholderSize,
+
+        /// <summary>
+        /// Snaps the sorting element or helper to a grid, every x and y pixels. Array values: [x, y]
+        /// </summary>
+        Grid,
+
+        /// <summary>
+        /// Restricts sort start click to the specified element.
+        /// </summary>
+        Handle,
+
+        /// <summary>
+        /// Allows for a helper element to be used for dragging display. The supplied function receives the event and the element being sorted, and should return a DOMElement to be used as a custom proxy helper. Possible values: 'original', 'clone'
+        /// </summary>
+        Helper,
+
+        /// <summary>
+        /// Specifies which items inside the element should be sortable.
+        /// </summary>
+        Items,
+
+        /// <summary>
+        /// Defines the opacity of the helper while sorting. From 0.01 to 1
+        /// </summary>
+        Opacity,
+
+        /// <summary>
+        /// Class that gets applied to the otherwise white space.
+        /// </summary>
+        Placeholder,
+
+        /// <summary>
+        /// If set to true, the item will be reverted to its new DOM position with a smooth animation. Optionally, it can also be set to a number that controls the duration of the animation in ms.
+        /// </summary>
+        Revert,
+
+        /// <summary>
+        /// If set to true, the page scrolls when coming to an edge.
+        /// </summary>
+        Scroll,
+
+        /// <summary>
+        /// Defines how near the mouse must be to an edge to start scrolling.
+        /// </summary>
+        ScrollSensitivity,
+
+        /// <summary>
+        /// The speed at which the window should scroll once the mouse pointer gets within the scrollSensitivity distance.
+        /// </summary>
+        ScrollSpeed,
+
+        /// <summary>
+        /// This is the way the reordering behaves during drag. Possible values: 'intersect', 'pointer'. In some setups, 'pointer' is more natural.<ul><li>'''intersect''': draggable overlaps the droppable at least 50%</li><li>'''pointer''': mouse pointer overlaps the droppable</li></ul>
+        /// </summary>
+        Tolerance,
+
+        /// <summary>
+        /// Z-index for element/helper while being sorted.
+        /// </summary>
+        ZIndex
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableOptions.cs b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableOptions.cs
new file mode 100644
index 000000000..e8101892a
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Interactions/Sortable/SortableOptions.cs
@@ -0,0 +1,481 @@
+// SortableOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Interactions {
+
+    /// <summary>
+    /// Options used to initialize or customize Sortable.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SortableOptions {
+
+        public SortableOptions() {
+        }
+
+        public SortableOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// This event is triggered when using connected lists, every connected list on drag start receives it.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SortActivateEvent> Activate {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when sorting stops, but when the placeholder/helper is still available.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SortBeforeStopEvent> BeforeStop {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered during sorting, but only when the DOM position has changed.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SortChangeEvent> Change {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the sortable is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when sorting was stopped, is propagated to all possible connected lists.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SortDeactivateEvent> Deactivate {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when a sortable item is moved away from a connected list.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SortOutEvent> Out {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when a sortable item is moved into a connected list.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SortOverEvent> Over {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when a connected sortable list has received an item from another list.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SortReceiveEvent> Receive {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when a sortable item has been dragged out from the list and into another.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SortRemoveEvent> Remove {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered during sorting.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SortEvent> Sort {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when sorting starts.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SortStartEvent> Start {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when sorting has stopped.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SortStopEvent> Stop {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the user stopped sorting and the DOM position has changed.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SortUpdateEvent> Update {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Defines where the helper that moves with the mouse is being appended to during the drag (for example, to resolve overlap/zIndex issues).
+        /// </summary>
+        [IntrinsicProperty]
+        public string AppendTo {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If defined, the items can be dragged only horizontally or vertically. Possible values:'x', 'y'.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Axis {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Prevents sorting if you start on elements matching the selector.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Cancel {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Takes a jQuery selector with items that also have sortables applied. If used, the sortable is now connected to the other one-way, so you can drag from this sortable to the other.
+        /// </summary>
+        [IntrinsicProperty]
+        public string ConnectWith {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Constrains dragging to within the bounds of the specified element - can be a DOM element, 'parent', 'document', 'window', or a jQuery selector.<para>Note: the element specified for containment must have a calculated width and height (though it need not be explicit), so for example, if you have float:left sortable children and specify containment:'parent' be sure to have float:left on the sortable/parent container as well or it will have height: 0, causing undefined behavior.</para>
+        /// </summary>
+        [IntrinsicProperty]
+        public object Containment {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Defines the cursor that is being shown while sorting.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Cursor {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Moves the sorting element or helper so the cursor always appears to drag from the same position. Coordinates can be given as a hash using a combination of one or two keys: <code>{ top, left, right, bottom }</code>.
+        /// </summary>
+        [IntrinsicProperty]
+        public object CursorAt {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Time in milliseconds to define when the sorting should start. It helps preventing unwanted drags when clicking on an element.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Delay {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Disables the sortable if set to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Disabled {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Tolerance, in pixels, for when sorting should start. If specified, sorting will not start until after mouse is dragged beyond distance. Can be used to allow for clicks on elements within a handle.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Distance {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If false items from this sortable can't be dropped to an empty linked sortable.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool DropOnEmpty {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If true, forces the helper to have a size.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool ForceHelperSize {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If true, forces the placeholder to have a size.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool ForcePlaceholderSize {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Snaps the sorting element or helper to a grid, every x and y pixels. Array values: [x, y]
+        /// </summary>
+        [IntrinsicProperty]
+        public Array Grid {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Restricts sort start click to the specified element.
+        /// </summary>
+        [IntrinsicProperty]
+        public object Handle {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Allows for a helper element to be used for dragging display. The supplied function receives the event and the element being sorted, and should return a DOMElement to be used as a custom proxy helper. Possible values: 'original', 'clone'
+        /// </summary>
+        [IntrinsicProperty]
+        public object Helper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Specifies which items inside the element should be sortable.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Items {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Defines the opacity of the helper while sorting. From 0.01 to 1
+        /// </summary>
+        [IntrinsicProperty]
+        public int Opacity {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Class that gets applied to the otherwise white space.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Placeholder {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to true, the item will be reverted to its new DOM position with a smooth animation. Optionally, it can also be set to a number that controls the duration of the animation in ms.
+        /// </summary>
+        [IntrinsicProperty]
+        public object Revert {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to true, the page scrolls when coming to an edge.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Scroll {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Defines how near the mouse must be to an edge to start scrolling.
+        /// </summary>
+        [IntrinsicProperty]
+        public int ScrollSensitivity {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The speed at which the window should scroll once the mouse pointer gets within the scrollSensitivity distance.
+        /// </summary>
+        [IntrinsicProperty]
+        public int ScrollSpeed {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// This is the way the reordering behaves during drag. Possible values: 'intersect', 'pointer'. In some setups, 'pointer' is more natural.<ul><li>'''intersect''': draggable overlaps the droppable at least 50%</li><li>'''pointer''': mouse pointer overlaps the droppable</li></ul>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Tolerance {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Z-index for element/helper while being sorted.
+        /// </summary>
+        [IntrinsicProperty]
+        public int ZIndex {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/PositionObject.cs b/src/Libraries/jQuery/jQuery.UI/PositionObject.cs
new file mode 100644
index 000000000..34603d0e8
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/PositionObject.cs
@@ -0,0 +1,34 @@
+// PositionObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI {
+
+    /// <summary>
+    /// Place an element relative to another
+    /// </summary>
+    /// <remarks>
+    /// <para>Utility script for positioning any widget relative to the window, document, a particular element, or the cursor/mouse.</para><para><em>Note: jQuery UI does not support positioning hidden elements.</em></para><para>This is a standalone jQuery plugin and has no dependencies on other jQuery UI components.</para><para>This plugin extends jQuery's built-in position getter method. If you forget to include this plugin, code calling position() won't fail directly, as the method still exists. But it'll just retrieve the position instead of setting it.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class PositionObject : jQueryUIObject {
+
+        private PositionObject() {
+        }
+
+        [ScriptName("position")]
+        public new PositionObject Position() {
+            return null;
+        }
+
+        [ScriptName("position")]
+        public PositionObject Position(PositionOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/PositionOption.cs b/src/Libraries/jQuery/jQuery.UI/PositionOption.cs
new file mode 100644
index 000000000..7336efa49
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/PositionOption.cs
@@ -0,0 +1,49 @@
+// PositionOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI {
+
+    /// <summary>
+    /// Options for use with Position.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum PositionOption {
+
+        /// <summary>
+        /// Defines which position <strong>on the target element</strong> to align the positioned element against: "horizontal vertical" alignment. A single value such as "right" will default to "right center", "top" will default to "center top" (following CSS convention). Acceptable values: "top", "center", "bottom", "left", "right". Example: "left top" or "center center". Each dimension can also contains offsets, in pixels or percent, e.g. `right+10 top-25%`. A perecentage is relative to the target element.
+        /// </summary>
+        At,
+
+        /// <summary>
+        /// <para>When the positioned element overflows the window in some direction, move it to an alternative position. Similar to my and at, this accepts a single value or a pair for horizontal/vertical, eg. "flip", "fit", "fit flip", "fit none".</para><ul><li><b>flip</b>: to the opposite side and the collision detection is run again to see if it will fit. Whichever side allows more of the element to be visible will be used.</li><li><b>fit</b>: so the element keeps in the desired direction, but is re-positioned so it fits.</li><li><b>flipfit</b>: apply both flip and fit. If flip works out, fit won't do anything, if flip gives up, fit should help.</li><li><b>none</b>: no collision detection.</li></ul>
+        /// </summary>
+        Collision,
+
+        /// <summary>
+        /// Defines which position <strong>on the element being positioned</strong> to align with the target element: "horizontal vertical" alignment. A single value such as "right" will default to "right center", "top" will default to "center top" (following CSS convention). Acceptable values: "top", "center", "bottom", "left", "right". Example: "left top" or "center center". Each dimension can also contains offsets, in pixels or percent, e.g. `right+10 top-25%`. A perecentage is relative to the element being positioned.
+        /// </summary>
+        My,
+
+        /// <summary>
+        /// Element to position against. If you provide a selector or jQuery object, the first matching element will be used. If you provide an event object, the pageX and pageY properties will be used. Example: "#top-menu"
+        /// </summary>
+        Of,
+
+        /// <summary>
+        /// Add these left-top values to the calculated position, eg. "50 50" (left top) A single value such as "50" will apply to both.
+        /// </summary>
+        Offset,
+
+        /// <summary>
+        /// When specified the actual property setting is delegated to this callback. Receives two parameters: The first is a hash of top and left values for the position that should be set and can be forwarded to offset() or animate() calls.<para>The second provides feedback about the position and dimensions of both elements, as well as calculations to their relative position. Both `target` and `element` have these properties: element, left, top, width, height. In addition, there's `horizontal`, `vertical` and `important`, giving you twelve potential directions like { horizontal: "center", vertical: "left", important: "horizontal" }.</para>
+        /// </summary>
+        Using
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/PositionOptions.cs b/src/Libraries/jQuery/jQuery.UI/PositionOptions.cs
new file mode 100644
index 000000000..c3768f737
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/PositionOptions.cs
@@ -0,0 +1,97 @@
+// PositionOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI {
+
+    /// <summary>
+    /// Options used to initialize or customize Position.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class PositionOptions {
+
+        public PositionOptions() {
+        }
+
+        public PositionOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// Defines which position <strong>on the target element</strong> to align the positioned element against: "horizontal vertical" alignment. A single value such as "right" will default to "right center", "top" will default to "center top" (following CSS convention). Acceptable values: "top", "center", "bottom", "left", "right". Example: "left top" or "center center". Each dimension can also contains offsets, in pixels or percent, e.g. `right+10 top-25%`. A perecentage is relative to the target element.
+        /// </summary>
+        [IntrinsicProperty]
+        public string At {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// <para>When the positioned element overflows the window in some direction, move it to an alternative position. Similar to my and at, this accepts a single value or a pair for horizontal/vertical, eg. "flip", "fit", "fit flip", "fit none".</para><ul><li><b>flip</b>: to the opposite side and the collision detection is run again to see if it will fit. Whichever side allows more of the element to be visible will be used.</li><li><b>fit</b>: so the element keeps in the desired direction, but is re-positioned so it fits.</li><li><b>flipfit</b>: apply both flip and fit. If flip works out, fit won't do anything, if flip gives up, fit should help.</li><li><b>none</b>: no collision detection.</li></ul>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Collision {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Defines which position <strong>on the element being positioned</strong> to align with the target element: "horizontal vertical" alignment. A single value such as "right" will default to "right center", "top" will default to "center top" (following CSS convention). Acceptable values: "top", "center", "bottom", "left", "right". Example: "left top" or "center center". Each dimension can also contains offsets, in pixels or percent, e.g. `right+10 top-25%`. A perecentage is relative to the element being positioned.
+        /// </summary>
+        [IntrinsicProperty]
+        public string My {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Element to position against. If you provide a selector or jQuery object, the first matching element will be used. If you provide an event object, the pageX and pageY properties will be used. Example: "#top-menu"
+        /// </summary>
+        [IntrinsicProperty]
+        public object Of {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Add these left-top values to the calculated position, eg. "50 50" (left top) A single value such as "50" will apply to both.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// When specified the actual property setting is delegated to this callback. Receives two parameters: The first is a hash of top and left values for the position that should be set and can be forwarded to offset() or animate() calls.<para>The second provides feedback about the position and dimensions of both elements, as well as calculations to their relative position. Both `target` and `element` have these properties: element, left, top, width, height. In addition, there's `horizontal`, `vertical` and `important`, giving you twelve potential directions like { horizontal: "center", vertical: "left", important: "horizontal" }.</para>
+        /// </summary>
+        [IntrinsicProperty]
+        public Action Using {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Properties/AssemblyInfo.cs b/src/Libraries/jQuery/jQuery.UI/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..4850b6396
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Properties/AssemblyInfo.cs
@@ -0,0 +1,13 @@
+// AssemblyInfo.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Script.jQuery.UI")]
+[assembly: AssemblyDescription("Script# jQuery UI Plugin")]
+[assembly: ScriptAssembly("jQueryUI")]
diff --git a/src/Libraries/jQuery/jQuery.UI/Properties/ScriptInfo.txt b/src/Libraries/jQuery/jQuery.UI/Properties/ScriptInfo.txt
new file mode 100644
index 000000000..c09a4bcf2
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Properties/ScriptInfo.txt
@@ -0,0 +1,14 @@
+jQuery UI
+===============================================================================
+
+This assembly provides access to jQuery UI APIs. This is only meant for use at
+development time, so you can reference and compile your c# code against 
+the plugin APIs. You must include the appropriate plugin scripts in your page for 
+runtime functionality.
+
+More information is on http://jqueryui.com.
+
+-------------------------------------------------------------------------------
+
+Associated scripts can be found at
+http://jqueryui.com/download
diff --git a/src/Libraries/jQuery/jQuery.UI/WidgetEvents.cs b/src/Libraries/jQuery/jQuery.UI/WidgetEvents.cs
new file mode 100644
index 000000000..45d250cdd
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/WidgetEvents.cs
@@ -0,0 +1,24 @@
+// WidgetEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI {
+
+    /// <summary>
+    /// Events raised by Widget.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum WidgetEvents {
+
+        /// <summary>
+        /// This event is triggered when the widget is created.
+        /// </summary>
+        Create
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/WidgetMethod.cs b/src/Libraries/jQuery/jQuery.UI/WidgetMethod.cs
new file mode 100644
index 000000000..8d2782f97
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/WidgetMethod.cs
@@ -0,0 +1,82 @@
+// WidgetMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI {
+
+    /// <summary>
+    /// Operations supported by Widget.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum WidgetMethod {
+
+        /// <summary>
+        /// This is the widget's constructor.
+        /// </summary>
+        [ScriptName("_create")]
+        Create,
+
+        [ScriptName("_createWidget")]
+        CreateWidget,
+
+        [ScriptName("_getCreateOptions")]
+        GetCreateOptions,
+
+        /// <summary>
+        /// Widgets have the concept of initialization that is distinct from creation. Any time the plugin is called with no arguments or with only an option hash, the widget is initialized; this includes when the widget is created.<para>Initialization should only be handled if there is a logical action to perform on successive calls to the widget with no arguments.</para>
+        /// </summary>
+        [ScriptName("_init")]
+        Init,
+
+        /// <summary>
+        /// Called from <code>_setOptions()</code> for each individual option.<para>Widget state should be updated based on changes.</para>
+        /// </summary>
+        [ScriptName("_setOption")]
+        SetOption,
+
+        /// <summary>
+        /// Called with a hash of key/value pairs to set whenever the <code>option()</code> method is called, regardless of the form in which option() was called.<para>Overriding this is useful if you can defer processor-intensive changes for multiple option changes.</para>
+        /// </summary>
+        [ScriptName("_setOptions")]
+        SetOptions,
+
+        /// <summary>
+        /// Triggers an event and its associated callback.<para>The option with the name equal to type is invoked as the callback.</para><para>The event name is the widget name + type.</para>
+        /// </summary>
+        [ScriptName("_trigger")]
+        Trigger,
+
+        /// <summary>
+        /// The <code>destroy()</code> method cleans up all common data, events, etc. and then delegates out to <code>_destroy()</code> for custom cleanup.
+        /// </summary>
+        Destroy,
+
+        Disable,
+
+        DisableSelection,
+
+        Enable,
+
+        EnableSelection,
+
+        Focus,
+
+        Option,
+
+        RemoveUniqueId,
+
+        ScrollParent,
+
+        UniqueId,
+
+        Widget,
+
+        ZIndex
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/WidgetObject.cs b/src/Libraries/jQuery/jQuery.UI/WidgetObject.cs
new file mode 100644
index 000000000..baef48603
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/WidgetObject.cs
@@ -0,0 +1,152 @@
+// WidgetObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI {
+
+    /// <summary>
+    /// Create stateful jQuery plugins using the same abstraction that all jQuery UI widgets.
+    /// </summary>
+    /// <remarks>
+    /// <para>You can create new widgets from scratch, using just the <code>$.Widget</code> object as base to inherit from, or you can explicitly inherit from existing jQuery UI or third-party widgets. Defining a widget with the same name as you inherit from even allows you to extend widgets in place.</para><para>For now, more details can be found at <a href="https://github.com/scottgonzalez/widget-factory-docs/">github.com/scottgonzalez/widget-factory-docs/</a></para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("$.Widget")]
+    public abstract class WidgetObject : jQueryUIObject {
+
+        protected WidgetObject() {
+        }
+
+        [IntrinsicProperty]
+        public static object Prototype {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Element {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Options {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("_setOption")]
+        public Function SetOption {
+            get {
+                return null;
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("_setOptions")]
+        public Function SetOptions {
+            get {
+                return null;
+            }
+        }
+
+
+
+        /// <summary>
+        /// This is the widget's constructor.
+        /// </summary>
+        [ScriptName("_create")]
+        public void Create() {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [ScriptName("_createWidget")]
+        public void CreateWidget() {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [ScriptName("_getCreateOptions")]
+        public void GetCreateOptions() {
+        }
+
+
+        /// <summary>
+        /// Widgets have the concept of initialization that is distinct from creation. Any time the plugin is called with no arguments or with only an option hash, the widget is initialized; this includes when the widget is created.<para>Initialization should only be handled if there is a logical action to perform on successive calls to the widget with no arguments.</para>
+        /// </summary>
+        [ScriptName("_init")]
+        public void Init() {
+        }
+
+
+        /// <summary>
+        /// Triggers an event and its associated callback.<para>The option with the name equal to type is invoked as the callback.</para><para>The event name is the widget name + type.</para>
+        /// </summary>
+        [ScriptName("_trigger")]
+        public bool Trigger(string type, jQueryEvent @event, object data) {
+                return false;
+        }
+
+
+        /// <summary>
+        /// The <code>destroy()</code> method cleans up all common data, events, etc. and then delegates out to <code>_destroy()</code> for custom cleanup.
+        /// </summary>
+        public void Destroy() {
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public WidgetObject Disable() {
+                return null;
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public WidgetObject Enable() {
+                return null;
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public WidgetObject Option(string key, object value) {
+                return null;
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public WidgetObject Option(params object[] options) {
+                return null;
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public WidgetObject Widget() {
+                return null;
+        }
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/WidgetOption.cs b/src/Libraries/jQuery/jQuery.UI/WidgetOption.cs
new file mode 100644
index 000000000..d119606ad
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/WidgetOption.cs
@@ -0,0 +1,24 @@
+// WidgetOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI {
+
+    /// <summary>
+    /// Options for use with Widget.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum WidgetOption {
+
+        /// <summary>
+        /// Disables the widget if set to true.
+        /// </summary>
+        Disabled
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/WidgetOptions.cs b/src/Libraries/jQuery/jQuery.UI/WidgetOptions.cs
new file mode 100644
index 000000000..121ee7a97
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/WidgetOptions.cs
@@ -0,0 +1,49 @@
+// WidgetOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI {
+
+    /// <summary>
+    /// Options used to initialize or customize Widget.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public  class WidgetOptions {
+
+        public WidgetOptions() {
+        }
+
+        public WidgetOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// This event is triggered when the widget is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Disables the widget if set to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Disabled {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/WidgetType.cs b/src/Libraries/jQuery/jQuery.UI/WidgetType.cs
new file mode 100644
index 000000000..87dffca83
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/WidgetType.cs
@@ -0,0 +1,51 @@
+// WidgetType.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI {
+
+    /// <summary>
+    /// The default widgets that are part of jQueryUI.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("$.ui")]
+    public sealed class WidgetType {
+
+         private WidgetType() {
+         }
+         
+         public static readonly WidgetType Accordion = null;
+
+         public static readonly WidgetType AutoComplete = null;
+
+         public static readonly WidgetType Button = null;
+
+         public static readonly WidgetType ButtonSet = null;
+
+         public static readonly WidgetType DatePicker = null;
+
+         public static readonly WidgetType Dialog = null;
+
+         public static readonly WidgetType Draggable = null;
+
+         public static readonly WidgetType Droppable = null;
+
+         public static readonly WidgetType ProgressBar = null;
+
+         public static readonly WidgetType Resizable = null;
+
+         public static readonly WidgetType Selectable = null;
+
+         public static readonly WidgetType Slider = null;
+
+         public static readonly WidgetType Sortable = null;
+
+         public static readonly WidgetType Tabs = null;
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionChangeEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionChangeEvent.cs
new file mode 100644
index 000000000..2fc887753
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionChangeEvent.cs
@@ -0,0 +1,52 @@
+// AccordionChangeEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class AccordionChangeEvent {
+
+        [IntrinsicProperty]
+        public object NewContent {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object NewHeader {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OldContent {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OldHeader {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionChangestartEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionChangestartEvent.cs
new file mode 100644
index 000000000..f827d9e6a
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionChangestartEvent.cs
@@ -0,0 +1,52 @@
+// AccordionChangestartEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class AccordionChangestartEvent {
+
+        [IntrinsicProperty]
+        public object NewContent {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object NewHeader {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OldContent {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object OldHeader {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionEvents.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionEvents.cs
new file mode 100644
index 000000000..692f43848
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionEvents.cs
@@ -0,0 +1,34 @@
+// AccordionEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Events raised by Accordion.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum AccordionEvents {
+
+        /// <summary>
+        /// This event is triggered every time the accordion changes. If the accordion is animated, the event will be triggered upon completion of the animation; otherwise, it is triggered immediately.
+        /// </summary>
+        Change,
+
+        /// <summary>
+        /// This event is triggered every time the accordion starts to change.
+        /// </summary>
+        Changestart,
+
+        /// <summary>
+        /// This event is triggered when the accordion is created.
+        /// </summary>
+        Create
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionMethod.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionMethod.cs
new file mode 100644
index 000000000..f4886a717
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionMethod.cs
@@ -0,0 +1,42 @@
+// AccordionMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Operations supported by Accordion.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum AccordionMethod {
+
+        /// <summary>
+        /// Activate a content part of the Accordion programmatically. The index can be a zero-indexed number to match the position of the header to close or a Selector matching an element.
+        /// </summary>
+        Activate,
+
+        /// <summary>
+        /// The <code>destroy()</code> method cleans up all common data, events, etc. and then delegates out to <code>_destroy()</code> for custom cleanup.
+        /// </summary>
+        Destroy,
+
+        Disable,
+
+        Enable,
+
+        Option,
+
+        /// <summary>
+        /// Recompute heights of the accordion contents when using the fillSpace option and the container height changed. For example, when the container is a resizable, this method should be called by its resize-event.
+        /// </summary>
+        Resize,
+
+        Widget
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionObject.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionObject.cs
new file mode 100644
index 000000000..18485ee3e
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionObject.cs
@@ -0,0 +1,53 @@
+// AccordionObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Convert a pair of headers and content panels into an accordion.
+    /// </summary>
+    /// <remarks>
+    /// <para>Make the selected elements Accordion widgets.</para><para>The markup of your accordion container needs pairs of headers and content panels:</para><c><div id="accordion"><h3><a href="#">First header</a></h3><div>First content</div><h3><a href="#">Second header</a></h3><div>Second content</div></div></c><para>If you use a different element for the header, specify the header-option with an appropriate selector, eg. header: 'a.header'. The content element must be always next to its header.</para><para>If you have links inside a accordion panel and use a-elements as headers, add a class to them and use that as the header, eg. header: 'a.header'.</para><para>Use activate(Number) to change the active panel programmatically.</para><para>This widget requires some functional CSS, otherwise it won't work. If you build a custom theme, use the widget's specific CSS file as a starting point.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class AccordionObject : WidgetObject {
+
+        private AccordionObject() {
+        }
+
+        [ScriptName("accordion")]
+        public AccordionObject Accordion() {
+            return null;
+        }
+
+        [ScriptName("accordion")]
+        public AccordionObject Accordion(AccordionOptions options) {
+            return null;
+        }
+
+        [ScriptName("accordion")]
+        public object Accordion(AccordionMethod method, params object[] options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Activate a content part of the Accordion programmatically. The index can be a zero-indexed number to match the position of the header to close or a Selector matching an element.
+        /// </summary>
+        public void Activate() {
+        }
+
+
+        /// <summary>
+        /// Recompute heights of the accordion contents when using the fillSpace option and the container height changed. For example, when the container is a resizable, this method should be called by its resize-event.
+        /// </summary>
+        public void Resize() {
+        }
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionOption.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionOption.cs
new file mode 100644
index 000000000..7207d9049
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionOption.cs
@@ -0,0 +1,79 @@
+// AccordionOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options for use with Accordion.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum AccordionOption {
+
+        /// <summary>
+        /// The zero-based index of the panel that is active (open). A negative value select panels going backward from the last panel.        <para>When collapsible is set to true, a false value closes the accordion, otherwise nothing happens</para>
+        /// </summary>
+        Active,
+
+        /// <summary>
+        /// Choose your favorite animation, or disable them (set to false). In addition to the default, 'bounceslide' and all defined easing methods are supported ('bounceslide' requires UI Effects Core).
+        /// </summary>
+        Animated,
+
+        /// <summary>
+        /// If set, the highest content part is used as height reference for all other parts. Provides more consistent animations.
+        /// </summary>
+        AutoHeight,
+
+        /// <summary>
+        /// If set, clears height and overflow styles after finishing animations. This enables accordions to work with dynamic content. Won't work together with autoHeight.
+        /// </summary>
+        ClearStyle,
+
+        /// <summary>
+        /// Whether all the sections can be closed at once. Allows collapsing the active section.
+        /// </summary>
+        Collapsible,
+
+        /// <summary>
+        /// Disables the accordion if set to true.
+        /// </summary>
+        Disabled,
+
+        /// <summary>
+        /// The event on which to trigger the accordion.
+        /// </summary>
+        Event,
+
+        /// <summary>
+        /// If set, the accordion completely fills the height of the parent element. Overrides autoheight.
+        /// </summary>
+        FillSpace,
+
+        /// <summary>
+        /// Selector for the header element.        <para>Must be a selector that applies to the accordion container element, via .find()</para><para>The default covers both ul/li accordions, as well as flat structures like dl/dt/dd</para>
+        /// </summary>
+        Header,
+
+        /// <summary>
+        /// Icons to use for headers, matching an icon defined by the jQuery UI CSS Framework. Set to false to have no icons displayed.        <ul><li>header (string, default: "ui-icon-triangle-1-e")</li><li>activeHeader (string, default: "ui-icon-triangle-1-s")</li></ul>
+        /// </summary>
+        Icons,
+
+        /// <summary>
+        /// If set, looks for the anchor that matches location.href and activates it. Great for href-based state-saving. Use navigationFilter to implement your own matcher.
+        /// </summary>
+        Navigation,
+
+        /// <summary>
+        /// Overwrite the default location.href-matching with your own matcher.
+        /// </summary>
+        NavigationFilter
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionOptions.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionOptions.cs
new file mode 100644
index 000000000..01ade79d5
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Accordion/AccordionOptions.cs
@@ -0,0 +1,205 @@
+// AccordionOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options used to initialize or customize Accordion.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class AccordionOptions {
+
+        public AccordionOptions() {
+        }
+
+        public AccordionOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// This event is triggered every time the accordion changes. If the accordion is animated, the event will be triggered upon completion of the animation; otherwise, it is triggered immediately.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<AccordionChangeEvent> Change {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered every time the accordion starts to change.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<AccordionChangestartEvent> Changestart {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the accordion is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// The zero-based index of the panel that is active (open). A negative value select panels going backward from the last panel.        <para>When collapsible is set to true, a false value closes the accordion, otherwise nothing happens</para>
+        /// </summary>
+        [IntrinsicProperty]
+        public object Active {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Choose your favorite animation, or disable them (set to false). In addition to the default, 'bounceslide' and all defined easing methods are supported ('bounceslide' requires UI Effects Core).
+        /// </summary>
+        [IntrinsicProperty]
+        public object Animated {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set, the highest content part is used as height reference for all other parts. Provides more consistent animations.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool AutoHeight {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set, clears height and overflow styles after finishing animations. This enables accordions to work with dynamic content. Won't work together with autoHeight.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool ClearStyle {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Whether all the sections can be closed at once. Allows collapsing the active section.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Collapsible {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Disables the accordion if set to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Disabled {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The event on which to trigger the accordion.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Event {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set, the accordion completely fills the height of the parent element. Overrides autoheight.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool FillSpace {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Selector for the header element.        <para>Must be a selector that applies to the accordion container element, via .find()</para><para>The default covers both ul/li accordions, as well as flat structures like dl/dt/dd</para>
+        /// </summary>
+        [IntrinsicProperty]
+        public string Header {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Icons to use for headers, matching an icon defined by the jQuery UI CSS Framework. Set to false to have no icons displayed.        <ul><li>header (string, default: "ui-icon-triangle-1-e")</li><li>activeHeader (string, default: "ui-icon-triangle-1-s")</li></ul>
+        /// </summary>
+        [IntrinsicProperty]
+        public object Icons {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set, looks for the anchor that matches location.href and activates it. Great for href-based state-saving. Use navigationFilter to implement your own matcher.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Navigation {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Overwrite the default location.href-matching with your own matcher.
+        /// </summary>
+        [IntrinsicProperty]
+        public Action NavigationFilter {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteChangeEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteChangeEvent.cs
new file mode 100644
index 000000000..6f370b3d2
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteChangeEvent.cs
@@ -0,0 +1,25 @@
+// AutoCompleteChangeEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class AutoCompleteChangeEvent {
+
+        [IntrinsicProperty]
+        public object Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteEvents.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteEvents.cs
new file mode 100644
index 000000000..1201c402c
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteEvents.cs
@@ -0,0 +1,59 @@
+// AutoCompleteEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Events raised by AutoComplete.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum AutoCompleteEvents {
+
+        /// <summary>
+        /// Triggered when the field is blurred, if the value has changed; ui.item refers to the selected item.
+        /// </summary>
+        Change,
+
+        /// <summary>
+        /// When the list is hidden - doesn't have to occur together with a change.
+        /// </summary>
+        Close,
+
+        /// <summary>
+        /// This event is triggered when the autocomplete is created.
+        /// </summary>
+        Create,
+
+        /// <summary>
+        /// Before focus is moved to an item (not selecting), ui.item refers to the focused item. The default action of focus is to replace the text field's value with the value of the focused item, though only if the focus event was triggered by a keyboard interaction.<para>Canceling this event prevents the value from being updated, but does not prevent the menu item from being focused.</para>
+        /// </summary>
+        Focus,
+
+        /// <summary>
+        /// Triggered when the suggestion menu is opened or updated.
+        /// </summary>
+        Open,
+
+        /// <summary>
+        /// Triggered after a request (source-option) completes, before the menu is shown. Useful for local manipulation of suggestion data, where a custom source-option callback is not required.
+        /// </summary>
+        Response,
+
+        /// <summary>
+        /// Before a request (source-option) is started, after minLength and delay are met. Can be canceled, then no request will be started and no items suggested.
+        /// </summary>
+        Search,
+
+        /// <summary>
+        /// Triggered when an item is selected from the menu; ui.item refers to the selected item. The default action of select is to replace the text field's value with the value of the selected item.<para>Canceling this event prevents the value from being updated, but does not prevent the menu from closing.</para>
+        /// </summary>
+        Select
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteFocusEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteFocusEvent.cs
new file mode 100644
index 000000000..7f42c1440
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteFocusEvent.cs
@@ -0,0 +1,25 @@
+// AutoCompleteFocusEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class AutoCompleteFocusEvent {
+
+        [IntrinsicProperty]
+        public object Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteMethod.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteMethod.cs
new file mode 100644
index 000000000..c28b1e215
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteMethod.cs
@@ -0,0 +1,42 @@
+// AutoCompleteMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Operations supported by AutoComplete.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum AutoCompleteMethod {
+
+        /// <summary>
+        /// Close the Autocomplete menu. Useful in combination with the search method, to close the open menu.
+        /// </summary>
+        Close,
+
+        /// <summary>
+        /// The <code>destroy()</code> method cleans up all common data, events, etc. and then delegates out to <code>_destroy()</code> for custom cleanup.
+        /// </summary>
+        Destroy,
+
+        Disable,
+
+        Enable,
+
+        Option,
+
+        /// <summary>
+        /// Triggers a search event, which, when data is available, then will display the suggestions; can be used by a selectbox-like button to open the suggestions when clicked. If no value argument is specified, the current input's value is used. Can be called with an empty string and minLength: 0 to display all items.
+        /// </summary>
+        Search,
+
+        Widget
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteObject.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteObject.cs
new file mode 100644
index 000000000..fbb2c3a5d
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteObject.cs
@@ -0,0 +1,53 @@
+// AutoCompleteObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Autocomplete, when added to an input field, enables users to quickly find and select from a pre-populated list of values as they type, leveraging searching and filtering.
+    /// </summary>
+    /// <remarks>
+    /// <para>By giving an Autocomplete field focus or entering something into it, the plugin starts searching for entries that match and displays a list of values to choose from. By entering more characters, the user can filter down the list to better matches.</para><para>This can be used to enter previous selected values, for example you could use Autocomplete for entering tags, to complete an address, you could enter a city name and get the zip code, or maybe enter email addresses from an address book.</para><para>You can pull data in from a local and/or a remote source: Local is good for small data sets (like an address book with 50 entries), remote is necessary for big data sets, like a database with hundreds or millions of entries to select from.</para><para>Autocomplete can be customized to work with various data sources, by just specifying the source option.</para><para>This widget requires some functional CSS, otherwise it won't work. If you build a custom theme, use the widget's specific CSS file as a starting point.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class AutoCompleteObject : WidgetObject {
+
+        private AutoCompleteObject() {
+        }
+
+        [ScriptName("autocomplete")]
+        public AutoCompleteObject AutoComplete() {
+            return null;
+        }
+
+        [ScriptName("autocomplete")]
+        public AutoCompleteObject AutoComplete(AutoCompleteOptions options) {
+            return null;
+        }
+
+        [ScriptName("autocomplete")]
+        public object AutoComplete(AutoCompleteMethod method, params object[] options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Close the Autocomplete menu. Useful in combination with the search method, to close the open menu.
+        /// </summary>
+        public void Close() {
+        }
+
+
+        /// <summary>
+        /// Triggers a search event, which, when data is available, then will display the suggestions; can be used by a selectbox-like button to open the suggestions when clicked. If no value argument is specified, the current input's value is used. Can be called with an empty string and minLength: 0 to display all items.
+        /// </summary>
+        public void Search(string value) {
+        }
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteOption.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteOption.cs
new file mode 100644
index 000000000..17d3e421c
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteOption.cs
@@ -0,0 +1,54 @@
+// AutoCompleteOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options for use with AutoComplete.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum AutoCompleteOption {
+
+        /// <summary>
+        /// Which element the menu should be appended to. Override this when the autocomplete is inside a <code>position:fixed</code> element. Otherwise the popup menu would still scroll with the page.
+        /// </summary>
+        AppendTo,
+
+        /// <summary>
+        /// If set to true the first item will be automatically focused.
+        /// </summary>
+        AutoFocus,
+
+        /// <summary>
+        /// The delay in milliseconds the Autocomplete waits after a keystroke to activate itself. A zero-delay makes sense for local data (more responsive), but can produce a lot of load for remote data, while being less responsive.
+        /// </summary>
+        Delay,
+
+        /// <summary>
+        /// Disables the autocomplete if set to true.
+        /// </summary>
+        Disabled,
+
+        /// <summary>
+        /// The minimum number of characters a user has to type before the Autocomplete activates. Zero is useful for local data with just a few items. Should be increased when there are a lot of items, where a single character would match a few thousand items.
+        /// </summary>
+        MinLength,
+
+        /// <summary>
+        /// Identifies the position of the Autocomplete widget in relation to the associated input element. The "of" option defaults to the input element, but you can specify another element to position against. You can refer to the [http://docs.jquery.com/UI/Position jQuery UI Position] utility for more details about the various options.
+        /// </summary>
+        Position,
+
+        /// <summary>
+        /// Defines the data to use, must be specified.<para>Independent of the variant you use, the label is always treated as text. If you want the label to be treated as html you can use [https://github.com/scottgonzalez/jquery-ui-extensions/blob/master/autocomplete/jquery.ui.autocomplete.html.js Scott González' html extension]. The demos all focus on different variations of the source-option - look for the one that matches your use case, and take a look at the code.</para>
+        /// </summary>
+        Source
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteOptions.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteOptions.cs
new file mode 100644
index 000000000..752127461
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteOptions.cs
@@ -0,0 +1,205 @@
+// AutoCompleteOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options used to initialize or customize AutoComplete.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class AutoCompleteOptions {
+
+        public AutoCompleteOptions() {
+        }
+
+        public AutoCompleteOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// Triggered when the field is blurred, if the value has changed; ui.item refers to the selected item.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<AutoCompleteChangeEvent> Change {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// When the list is hidden - doesn't have to occur together with a change.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<jQueryObject> Close {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the autocomplete is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Before focus is moved to an item (not selecting), ui.item refers to the focused item. The default action of focus is to replace the text field's value with the value of the focused item, though only if the focus event was triggered by a keyboard interaction.<para>Canceling this event prevents the value from being updated, but does not prevent the menu item from being focused.</para>
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<AutoCompleteFocusEvent> Focus {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Triggered when the suggestion menu is opened or updated.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<jQueryObject> Open {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Triggered after a request (source-option) completes, before the menu is shown. Useful for local manipulation of suggestion data, where a custom source-option callback is not required.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<AutoCompleteResponseEvent> Response {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Before a request (source-option) is started, after minLength and delay are met. Can be canceled, then no request will be started and no items suggested.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<jQueryObject> Search {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Triggered when an item is selected from the menu; ui.item refers to the selected item. The default action of select is to replace the text field's value with the value of the selected item.<para>Canceling this event prevents the value from being updated, but does not prevent the menu from closing.</para>
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<AutoCompleteSelectEvent> Select {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Which element the menu should be appended to. Override this when the autocomplete is inside a <code>position:fixed</code> element. Otherwise the popup menu would still scroll with the page.
+        /// </summary>
+        [IntrinsicProperty]
+        public string AppendTo {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to true the first item will be automatically focused.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool AutoFocus {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The delay in milliseconds the Autocomplete waits after a keystroke to activate itself. A zero-delay makes sense for local data (more responsive), but can produce a lot of load for remote data, while being less responsive.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Delay {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Disables the autocomplete if set to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Disabled {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The minimum number of characters a user has to type before the Autocomplete activates. Zero is useful for local data with just a few items. Should be increased when there are a lot of items, where a single character would match a few thousand items.
+        /// </summary>
+        [IntrinsicProperty]
+        public int MinLength {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Identifies the position of the Autocomplete widget in relation to the associated input element. The "of" option defaults to the input element, but you can specify another element to position against. You can refer to the [http://docs.jquery.com/UI/Position jQuery UI Position] utility for more details about the various options.
+        /// </summary>
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Defines the data to use, must be specified.<para>Independent of the variant you use, the label is always treated as text. If you want the label to be treated as html you can use [https://github.com/scottgonzalez/jquery-ui-extensions/blob/master/autocomplete/jquery.ui.autocomplete.html.js Scott González' html extension]. The demos all focus on different variations of the source-option - look for the one that matches your use case, and take a look at the code.</para>
+        /// </summary>
+        [IntrinsicProperty]
+        public object Source {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteResponseEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteResponseEvent.cs
new file mode 100644
index 000000000..7875e9d94
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteResponseEvent.cs
@@ -0,0 +1,25 @@
+// AutoCompleteResponseEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class AutoCompleteResponseEvent {
+
+        [IntrinsicProperty]
+        public object Content {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteSelectEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteSelectEvent.cs
new file mode 100644
index 000000000..d843d00e0
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/AutoComplete/AutoCompleteSelectEvent.cs
@@ -0,0 +1,25 @@
+// AutoCompleteSelectEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class AutoCompleteSelectEvent {
+
+        [IntrinsicProperty]
+        public object Item {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonEvents.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonEvents.cs
new file mode 100644
index 000000000..b5d659ac5
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonEvents.cs
@@ -0,0 +1,24 @@
+// ButtonEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Events raised by Button.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ButtonEvents {
+
+        /// <summary>
+        /// This event is triggered when the button is created.
+        /// </summary>
+        Create
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonMethod.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonMethod.cs
new file mode 100644
index 000000000..6aa53415f
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonMethod.cs
@@ -0,0 +1,37 @@
+// ButtonMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Operations supported by Button.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ButtonMethod {
+
+        /// <summary>
+        /// The <code>destroy()</code> method cleans up all common data, events, etc. and then delegates out to <code>_destroy()</code> for custom cleanup.
+        /// </summary>
+        Destroy,
+
+        Disable,
+
+        Enable,
+
+        Option,
+
+        /// <summary>
+        /// Refreshes the visual state of the button. Useful for updating button state after the native element's checked or disabled state is changed programatically.
+        /// </summary>
+        Refresh,
+
+        Widget
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonObject.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonObject.cs
new file mode 100644
index 000000000..6d762cdd7
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonObject.cs
@@ -0,0 +1,46 @@
+// ButtonObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Themable button and buttonsets
+    /// </summary>
+    /// <remarks>
+    /// <para>Button enhances standard form elements like button, input of type submit or reset or anchors to themable buttons with appropiate mouseover and active styles.</para><para>In addition to basic push buttons, radio buttons and checkboxes (inputs of type radio and checkbox) can be converted to buttons: Their associated label is styled to appear as the button, while the underlying input is updated on click.</para><para>In order to group radio buttons, Button also provides an additional widget-method, called buttonset. Its used by selecting a container element (which contains the radio buttons) and calling buttonset(). Buttonset will also provide visual grouping, and therefore should be used whenever you have a group of buttons. It works by selecting all descendents and applying button() to them. You can enable and disable a buttonset, which will enable and disable all contained buttons. Destroying a buttonset also calls each button's destroy method.</para><para>When using an input of type button, submit or reset, support is limited to plain text labels with no icons.</para><para>This widget requires some functional CSS, otherwise it won't work. If you build a custom theme, use the widget's specific CSS file as a starting point.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class ButtonObject : WidgetObject {
+
+        private ButtonObject() {
+        }
+
+        [ScriptName("button")]
+        public ButtonObject Button() {
+            return null;
+        }
+
+        [ScriptName("button")]
+        public ButtonObject Button(ButtonOptions options) {
+            return null;
+        }
+
+        [ScriptName("button")]
+        public object Button(ButtonMethod method, params object[] options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Refreshes the visual state of the button. Useful for updating button state after the native element's checked or disabled state is changed programatically.
+        /// </summary>
+        public void Refresh() {
+        }
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonOption.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonOption.cs
new file mode 100644
index 000000000..f947a5825
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonOption.cs
@@ -0,0 +1,39 @@
+// ButtonOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options for use with Button.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ButtonOption {
+
+        /// <summary>
+        /// Disables the button if set to true.
+        /// </summary>
+        Disabled,
+
+        /// <summary>
+        /// Icons to display, with or without text (see text option). The primary icon is displayed by default on the left of the label text, the secondary by default is on the right. Value for the primary and secondary properties must be a classname (String), eg. "ui-icon-gear". For using only one icon: icons: {primary:'ui-icon-locked'}. For using two icons: icons: {primary:'ui-icon-gear',secondary:'ui-icon-triangle-1-s'}
+        /// </summary>
+        Icons,
+
+        /// <summary>
+        /// Text to show on the button. When not specified (null), the element's html content is used, or its value attribute when it's an input element of type submit or reset; or the html content of the associated label element if its an input of type radio or checkbox
+        /// </summary>
+        Label,
+
+        /// <summary>
+        /// Whether to show any text - when set to false (display no text), icons (see icons option) must be enabled, otherwise it'll be ignored.
+        /// </summary>
+        Text
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonOptions.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonOptions.cs
new file mode 100644
index 000000000..22f8996b9
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Button/ButtonOptions.cs
@@ -0,0 +1,85 @@
+// ButtonOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options used to initialize or customize Button.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class ButtonOptions {
+
+        public ButtonOptions() {
+        }
+
+        public ButtonOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// This event is triggered when the button is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Disables the button if set to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Disabled {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Icons to display, with or without text (see text option). The primary icon is displayed by default on the left of the label text, the secondary by default is on the right. Value for the primary and secondary properties must be a classname (String), eg. "ui-icon-gear". For using only one icon: icons: {primary:'ui-icon-locked'}. For using two icons: icons: {primary:'ui-icon-gear',secondary:'ui-icon-triangle-1-s'}
+        /// </summary>
+        [IntrinsicProperty]
+        public object Icons {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Text to show on the button. When not specified (null), the element's html content is used, or its value attribute when it's an input element of type submit or reset; or the html content of the associated label element if its an input of type radio or checkbox
+        /// </summary>
+        [IntrinsicProperty]
+        public string Label {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Whether to show any text - when set to false (display no text), icons (see icons option) must be enabled, otherwise it'll be ignored.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Text {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetEvents.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetEvents.cs
new file mode 100644
index 000000000..e20e93745
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetEvents.cs
@@ -0,0 +1,24 @@
+// ButtonSetEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Events raised by ButtonSet.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ButtonSetEvents {
+
+        /// <summary>
+        /// This event is triggered when the buttonset is created.
+        /// </summary>
+        Create
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetMethod.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetMethod.cs
new file mode 100644
index 000000000..12445697f
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetMethod.cs
@@ -0,0 +1,37 @@
+// ButtonSetMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Operations supported by ButtonSet.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ButtonSetMethod {
+
+        /// <summary>
+        /// The <code>destroy()</code> method cleans up all common data, events, etc. and then delegates out to <code>_destroy()</code> for custom cleanup.
+        /// </summary>
+        Destroy,
+
+        Disable,
+
+        Enable,
+
+        Option,
+
+        /// <summary>
+        /// Refreshes the visual state of the button. Useful for updating button state after the native element's checked or disabled state is changed programatically.
+        /// </summary>
+        Refresh,
+
+        Widget
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetObject.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetObject.cs
new file mode 100644
index 000000000..1c49438aa
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetObject.cs
@@ -0,0 +1,46 @@
+// ButtonSetObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Themable buttonset
+    /// </summary>
+    /// <remarks>
+    /// <para>In order to group radio buttons, Button also provides an additional widget-method, called buttonset. Its used by selecting a container element (which contains the radio buttons) and calling buttonset(). Buttonset will also provide visual grouping, and therefore should be used whenever you have a group of buttons. It works by selecting all descendents and applying button() to them. You can enable and disable a buttonset, which will enable and disable all contained buttons. Destroying a buttonset also calls each button's destroy method.</para><para>When using an input of type button, submit or reset, support is limited to plain text labels with no icons.</para><para>This widget requires some functional CSS, otherwise it won't work. If you build a custom theme, use the widget's specific CSS file as a starting point.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class ButtonSetObject : WidgetObject {
+
+        private ButtonSetObject() {
+        }
+
+        [ScriptName("buttonset")]
+        public ButtonSetObject ButtonSet() {
+            return null;
+        }
+
+        [ScriptName("buttonset")]
+        public ButtonSetObject ButtonSet(ButtonSetOptions options) {
+            return null;
+        }
+
+        [ScriptName("buttonset")]
+        public object ButtonSet(ButtonSetMethod method, params object[] options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Refreshes the visual state of the button. Useful for updating button state after the native element's checked or disabled state is changed programatically.
+        /// </summary>
+        public void Refresh() {
+        }
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetOption.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetOption.cs
new file mode 100644
index 000000000..7560f3532
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetOption.cs
@@ -0,0 +1,26 @@
+// ButtonSetOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options for use with ButtonSet.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ButtonSetOption {
+
+        /// <summary>
+        /// Disables the widget if set to true.
+        /// </summary>
+        Disabled,
+
+        Items
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetOptions.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetOptions.cs
new file mode 100644
index 000000000..cba5539a0
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/ButtonSet/ButtonSetOptions.cs
@@ -0,0 +1,46 @@
+// ButtonSetOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options used to initialize or customize ButtonSet.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class ButtonSetOptions {
+
+        public ButtonSetOptions() {
+        }
+
+        public ButtonSetOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// This event is triggered when the button is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        [IntrinsicProperty]
+        public string Items {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerEvents.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerEvents.cs
new file mode 100644
index 000000000..11d4cb8c0
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerEvents.cs
@@ -0,0 +1,49 @@
+// DatePickerEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Events raised by DatePicker.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum DatePickerEvents {
+
+        /// <summary>
+        /// Can be a function that takes an input field and current datepicker instance and returns an options object to update the datepicker with. It is called just before the datepicker is displayed.
+        /// </summary>
+        BeforeShow,
+
+        /// <summary>
+        /// The function takes a date as a parameter and must return an array with [0] equal to true/false indicating whether or not this date is selectable, [1] equal to a CSS class name(s) or "" for the default presentation, and [2] an optional popup tooltip for this date. It is called for each day in the datepicker before it is displayed.
+        /// </summary>
+        BeforeShowDay,
+
+        /// <summary>
+        /// This event is triggered when the datepicker is created.
+        /// </summary>
+        Create,
+
+        /// <summary>
+        /// Allows you to define your own event when the datepicker moves to a new month and/or year. The function receives the selected year, month (1-12), and the datepicker instance as parameters. <code>this</code> refers to the associated input field.
+        /// </summary>
+        OnChangeMonthYear,
+
+        /// <summary>
+        /// Allows you to define your own event when the datepicker is closed, whether or not a date is selected. The function receives the selected date as text ("" if none) and the datepicker instance as parameters. <code>this</code> refers to the associated input field.
+        /// </summary>
+        OnClose,
+
+        /// <summary>
+        /// Allows you to define your own event when the datepicker is selected. The function receives the selected date as text and the datepicker instance as parameters. <code>this</code> refers to the associated input field.
+        /// </summary>
+        OnSelect
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerMethod.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerMethod.cs
new file mode 100644
index 000000000..d03322b26
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerMethod.cs
@@ -0,0 +1,57 @@
+// DatePickerMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Operations supported by DatePicker.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum DatePickerMethod {
+
+        /// <summary>
+        /// The <code>destroy()</code> method cleans up all common data, events, etc. and then delegates out to <code>_destroy()</code> for custom cleanup.
+        /// </summary>
+        Destroy,
+
+        /// <summary>
+        /// Function
+        /// </summary>
+        Dialog,
+
+        Disable,
+
+        Enable,
+
+        /// <summary>
+        /// Returns the current date for the datepicker or null if no date has been selected.
+        /// </summary>
+        GetDate,
+
+        /// <summary>
+        /// Determine whether a date picker has been disabled.
+        /// </summary>
+        IsDisabled,
+
+        Option,
+
+        /// <summary>
+        /// Redraw a date picker, after having made some external modifications.
+        /// </summary>
+        Refresh,
+
+        /// <summary>
+        /// Sets the current date for the datepicker. The new date may be a Date object or a string in the current [[UI/Datepicker#option-dateFormat|date format]] (e.g. '01/26/2009'), a number of days from today (e.g. +7) or a string of values and periods ('y' for years, 'm' for months, 'w' for weeks, 'd' for days, e.g. '+1m +7d'), or null to clear the selected date.
+        /// </summary>
+        SetDate,
+
+        Widget
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerObject.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerObject.cs
new file mode 100644
index 000000000..933a0f4c3
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerObject.cs
@@ -0,0 +1,74 @@
+// DatePickerObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Select a date from a popup or inline calendar
+    /// </summary>
+    /// <remarks>
+    /// <para>The jQuery UI Datepicker is a highly configurable plugin that adds datepicker functionality to your pages. You can customize the date format and language, restrict the selectable date ranges and add in buttons and other navigation options easily.</para><para>By default, the datepicker calendar opens in a small overlay onFocus and closes automatically onBlur or when a date is selected. For an inline calendar, simply attach the datepicker to a div or span.</para><para>You can use keyboard shortcuts to drive the datepicker:</para><ul><li>page up/down - previous/next month</li><li>ctrl+page up/down - previous/next year</li><li>ctrl+home - current month or open when closed</li><li>ctrl+left/right - previous/next day</li><li>ctrl+up/down - previous/next week</li><li>enter - accept the selected date</li><li>ctrl+end - close and erase the date</li><li>escape - close the datepicker without selection</li></ul><h3 id="utility-functions">Utility functions</h3><ul><li>$.datepicker.setDefaults( settings ) - Set settings for all datepicker instances.</li><li>$.datepicker.formatDate( format, date, settings ) - Format a date into a string value with a specified format.</li><li>$.datepicker.parseDate( format, value, settings )  - Extract a date from a string value with a specified format.</li><li>$.datepicker.iso8601Week( date ) - Determine the week of the year for a given date: 1 to 53.</li><li>$.datepicker.noWeekends - Set as beforeShowDay function to prevent selection of weekends.</li></ul><h3>Localization</h3><para>Datepicker provides support for localizing its content to cater for different languagesand date formats. Each localization is contained within its own file with thelanguage code appended to the name, e.g. <code>jquery.ui.datepicker-fr.js</code> for French.The desired localization file should be included after the main datepicker code. They add their settings to the setof available localizations and automatically apply them as defaults for all instances.</para><para>The <code>$.datepicker.regional</code> attribute holds an array of localizations,indexed by language code, with "" referring to the default (English). Each entry isan object with the following attributes: <code>closeText</code>, <code>prevText</code>,<code>nextText</code>, <code>currentText</code>, <code>monthNames</code>,<code>monthNamesShort</code>, <code>dayNames</code>, <code>dayNamesShort</code>,<code>dayNamesMin</code>, <code>weekHeader</code>, <code>dateFormat</code>,<code>firstDay</code>, <code>isRTL</code>, <code>showMonthAfterYear</code>,and <code>yearSuffix</code>.</para><para>You can restore the default localizations with:</para><code>$.datepicker.setDefaults($.datepicker.regional[""]);</code><para>And can then override an individual datepicker for a specific locale:</para><code>$(selector).datepicker($.datepicker.regional['fr']);</code><para>This widget requires some functional CSS, otherwise it won't work. If you build a custom theme, use the widget's specific CSS file as a starting point.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class DatePickerObject : WidgetObject {
+
+        private DatePickerObject() {
+        }
+
+        [ScriptName("datepicker")]
+        public DatePickerObject DatePicker() {
+            return null;
+        }
+
+        [ScriptName("datepicker")]
+        public DatePickerObject DatePicker(DatePickerOptions options) {
+            return null;
+        }
+
+        [ScriptName("datepicker")]
+        public object DatePicker(DatePickerMethod method, params object[] options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Function
+        /// </summary>
+        public void Dialog(object date, Action onSelect, object settings, object pos) {
+        }
+
+
+        /// <summary>
+        /// Returns the current date for the datepicker or null if no date has been selected.
+        /// </summary>
+        public void GetDate() {
+        }
+
+
+        /// <summary>
+        /// Determine whether a date picker has been disabled.
+        /// </summary>
+        public void IsDisabled() {
+        }
+
+
+        /// <summary>
+        /// Redraw a date picker, after having made some external modifications.
+        /// </summary>
+        public void Refresh() {
+        }
+
+
+        /// <summary>
+        /// Sets the current date for the datepicker. The new date may be a Date object or a string in the current [[UI/Datepicker#option-dateFormat|date format]] (e.g. '01/26/2009'), a number of days from today (e.g. +7) or a string of values and periods ('y' for years, 'm' for months, 'w' for weeks, 'd' for days, e.g. '+1m +7d'), or null to clear the selected date.
+        /// </summary>
+        public void SetDate(Date date) {
+        }
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerOption.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerOption.cs
new file mode 100644
index 000000000..3232603a7
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerOption.cs
@@ -0,0 +1,249 @@
+// DatePickerOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options for use with DatePicker.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum DatePickerOption {
+
+        /// <summary>
+        /// The jQuery selector for another field that is to be updated with the selected date from the datepicker. Use the <code>[[UI/Datepicker#option-altFormat|altFormat]]</code> setting to change the format of the date within this field. Leave as blank for no alternate field.
+        /// </summary>
+        AltField,
+
+        /// <summary>
+        /// The <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code> to be used for the <code>[[UI/Datepicker#option-altField|altField]]</code> option. This allows one date format to be shown to the user for selection purposes, while a different format is actually sent behind the scenes. For a full list of the possible formats see the [[UI/Datepicker/formatDate|formatDate]] function
+        /// </summary>
+        AltFormat,
+
+        /// <summary>
+        /// The text to display after each date field, e.g. to show the required format.
+        /// </summary>
+        AppendText,
+
+        /// <summary>
+        /// Set to true to automatically resize the input field to accommodate dates in the current <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code>.
+        /// </summary>
+        AutoSize,
+
+        /// <summary>
+        /// The URL for the popup button image. If set, <code>[[UI/Datepicker#option-buttonText|buttonText]]</code> becomes the ''alt'' value and is not directly displayed.
+        /// </summary>
+        ButtonImage,
+
+        /// <summary>
+        /// Set to true to place an image after the field to use as the trigger without it appearing on a button.
+        /// </summary>
+        ButtonImageOnly,
+
+        /// <summary>
+        /// The text to display on the trigger button. Use in conjunction with <code>[[UI/Datepicker#option-showOn|showOn]]</code> equal to 'button' or 'both'.
+        /// </summary>
+        ButtonText,
+
+        /// <summary>
+        /// myWeekCalc
+        /// </summary>
+        CalculateWeek,
+
+        /// <summary>
+        /// Allows you to change the month by selecting from a drop-down list. You can enable this feature by setting the attribute to true.
+        /// </summary>
+        ChangeMonth,
+
+        /// <summary>
+        /// Allows you to change the year by selecting from a drop-down list. You can enable this feature by setting the attribute to true. Use the <code>[[UI/Datepicker#option-yearRange|yearRange]]</code> option to control which years are made available for selection.
+        /// </summary>
+        ChangeYear,
+
+        /// <summary>
+        /// The text to display for the close link. This attribute is one of the regionalisation attributes. Use the <code>[[UI/Datepicker#option-showButtonPanel|showButtonPanel]]</code> to display this button.
+        /// </summary>
+        CloseText,
+
+        /// <summary>
+        /// When true entry in the input field is constrained to those characters allowed by the current <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code>.
+        /// </summary>
+        ConstrainInput,
+
+        /// <summary>
+        /// The text to display for the current day link. This attribute is one of the regionalisation attributes. Use the <code>[[UI/Datepicker#option-showButtonPanel|showButtonPanel]]</code> to display this button.
+        /// </summary>
+        CurrentText,
+
+        /// <summary>
+        /// The format for parsed and displayed dates. This attribute is one of the regionalisation attributes. For a full list of the possible formats see the <code>[[UI/Datepicker/formatDate|formatDate]]</code> function.
+        /// </summary>
+        DateFormat,
+
+        /// <summary>
+        /// The list of long day names, starting from Sunday, for use as requested via the <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code> setting. They also appear as popup hints when hovering over the corresponding column headings. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        DayNames,
+
+        /// <summary>
+        /// The list of minimised day names, starting from Sunday, for use as column headers within the datepicker. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        DayNamesMin,
+
+        /// <summary>
+        /// The list of abbreviated day names, starting from Sunday, for use as requested via the <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code> setting. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        DayNamesShort,
+
+        /// <summary>
+        /// Set the date to highlight on first opening if the field is blank. Specify either an actual date via a Date object or as a string in the current <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code>, or a number of days from today (e.g. +7) or a string of values and periods ('y' for years, 'm' for months, 'w' for weeks, 'd' for days, e.g. '+1m +7d'), or null for today.
+        /// </summary>
+        DefaultDate,
+
+        /// <summary>
+        /// Disables the widget if set to true.
+        /// </summary>
+        Disabled,
+
+        /// <summary>
+        /// Control the speed at which the datepicker appears, it may be a time in milliseconds or a string representing one of the three predefined speeds ("slow", "normal", "fast").
+        /// </summary>
+        Duration,
+
+        /// <summary>
+        /// Set the first day of the week: Sunday is 0, Monday is 1, ... This attribute is one of the regionalisation attributes.
+        /// </summary>
+        FirstDay,
+
+        /// <summary>
+        /// When true the current day link moves to the currently selected date instead of today.
+        /// </summary>
+        GotoCurrent,
+
+        /// <summary>
+        /// Normally the previous and next links are disabled when not applicable (see <code>[[UI/Datepicker#option-minDate|minDate]]</code>/<code>[[UI/Datepicker#option-maxDate|maxDate]]</code>). You can hide them altogether by setting this attribute to true.
+        /// </summary>
+        HideIfNoPrevNext,
+
+        /// <summary>
+        /// True if the current language is drawn from right to left. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        IsRTL,
+
+        /// <summary>
+        /// Set a maximum selectable date via a Date object or as a string in the current <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code>, or a number of days from today (e.g. +7) or a string of values and periods ('y' for years, 'm' for months, 'w' for weeks, 'd' for days, e.g. '+1m +1w'), or null for no limit.
+        /// </summary>
+        MaxDate,
+
+        /// <summary>
+        /// Set a minimum selectable date via a Date object or as a string in the current <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code>, or a number of days from today (e.g. +7) or a string of values and periods ('y' for years, 'm' for months, 'w' for weeks, 'd' for days, e.g. '-1y -1m'), or null for no limit.
+        /// </summary>
+        MinDate,
+
+        /// <summary>
+        /// The list of full month names, for use as requested via the <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code> setting. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        MonthNames,
+
+        /// <summary>
+        /// The list of abbreviated month names, as used in the month header on each datepicker and as requested via the <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code> setting. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        MonthNamesShort,
+
+        /// <summary>
+        /// When true the <code>[[UI/Datepicker/formatDate|formatDate]]</code> function is applied to the <code>[[UI/Datepicker#option-prevText|prevText]]</code>, <code>[[UI/Datepicker#option-nextText|nextText]]</code>, and <code>[[UI/Datepicker#option-currentText|currentText]]</code> values before display, allowing them to display the target month names for example.
+        /// </summary>
+        NavigationAsDateFormat,
+
+        /// <summary>
+        /// The text to display for the next month link. This attribute is one of the regionalisation attributes. With the standard ThemeRoller styling, this value is replaced by an icon.
+        /// </summary>
+        NextText,
+
+        /// <summary>
+        /// Set how many months to show at once. The value can be a straight integer, or can be a two-element array to define the number of rows and columns to display.
+        /// </summary>
+        NumberOfMonths,
+
+        /// <summary>
+        /// The text to display for the previous month link. This attribute is one of the regionalisation attributes. With the standard ThemeRoller styling, this value is replaced by an icon.
+        /// </summary>
+        PrevText,
+
+        /// <summary>
+        /// When true days in other months shown before or after the current month are selectable. This only applies if <code>[[UI/Datepicker#option-showOtherMonths|showOtherMonths]]</code> is also true.
+        /// </summary>
+        SelectOtherMonths,
+
+        /// <summary>
+        /// Set the cutoff year for determining the century for a date (used in conjunction with <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code> 'y'). If a numeric value (0-99) is provided then this value is used directly. If a string value is provided then it is converted to a number and added to the current year. Once the cutoff year is calculated, any dates entered with a year value less than or equal to it are considered to be in the current century, while those greater than it are deemed to be in the previous century.
+        /// </summary>
+        ShortYearCutoff,
+
+        /// <summary>
+        /// Set the name of the animation used to show/hide the datepicker. Use 'show' (the default), 'slideDown', 'fadeIn', any of the show/hide [http://docs.jquery.com/UI/Effects jQuery UI effects], or "" for no animation.
+        /// </summary>
+        ShowAnim,
+
+        /// <summary>
+        /// Whether to show the button panel.
+        /// </summary>
+        ShowButtonPanel,
+
+        /// <summary>
+        /// Specify where in a [[UI/Datepicker#option-numberOfMonths|multi-month]] display the current month shows, starting from 0 at the top/left.
+        /// </summary>
+        ShowCurrentAtPos,
+
+        /// <summary>
+        /// Whether to show the month after the year in the header. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        ShowMonthAfterYear,
+
+        /// <summary>
+        /// Have the datepicker appear automatically when the field receives focus ("focus"), appear only when a button is clicked ("button"), or appear when either event taks place ("both").
+        /// </summary>
+        ShowOn,
+
+        /// <summary>
+        /// If using one of the jQuery UI effects for <code>[[UI/Datepicker#option-showAnim|showAnim]]</code>, you can provide additional settings for that animation via this option.
+        /// </summary>
+        ShowOptions,
+
+        /// <summary>
+        /// Display dates in other months (non-selectable) at the start or end of the current month. To make these days selectable use <code>[[UI/Datepicker#option-selectOtherMonths|selectOtherMonths]]</code>.
+        /// </summary>
+        ShowOtherMonths,
+
+        /// <summary>
+        /// When true a column is added to show the week of the year. The <code>[[UI/Datepicker#option-calculateWeek|calculateWeek]]</code> option determines how the week of the year is calculated. You may also want to change the <code>[[UI/Datepicker#option-firstDay|firstDay]]</code> option.
+        /// </summary>
+        ShowWeek,
+
+        /// <summary>
+        /// Set how many months to move when clicking the Previous/Next links.
+        /// </summary>
+        StepMonths,
+
+        /// <summary>
+        /// The text to display for the week of the year column heading. This attribute is one of the regionalisation attributes. Use <code>[[UI/Datepicker#option-showWeek|showWeek]]</code> to display this column.
+        /// </summary>
+        WeekHeader,
+
+        /// <summary>
+        /// Control the range of years displayed in the year drop-down: either relative to today's year (-nn:+nn), relative to the currently selected year (c-nn:c+nn), absolute (nnnn:nnnn), or combinations of these formats (nnnn:-nn). Note that this option only affects what appears in the drop-down, to restrict which dates may be selected use the <code>[[UI/Datepicker#option-minDate|minDate]]</code> and/or <code>[[UI/Datepicker#option-maxDate|maxDate]]</code> options.
+        /// </summary>
+        YearRange,
+
+        /// <summary>
+        /// Additional text to display after the year in the month headers. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        YearSuffix
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerOptions.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerOptions.cs
new file mode 100644
index 000000000..2715f91de
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/DatePicker/DatePickerOptions.cs
@@ -0,0 +1,565 @@
+// DatePickerOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options used to initialize or customize DatePicker.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DatePickerOptions {
+
+        public DatePickerOptions() {
+        }
+
+        public DatePickerOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// The jQuery selector for another field that is to be updated with the selected date from the datepicker. Use the <code>[[UI/Datepicker#option-altFormat|altFormat]]</code> setting to change the format of the date within this field. Leave as blank for no alternate field.
+        /// </summary>
+        [IntrinsicProperty]
+        public object AltField {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code> to be used for the <code>[[UI/Datepicker#option-altField|altField]]</code> option. This allows one date format to be shown to the user for selection purposes, while a different format is actually sent behind the scenes. For a full list of the possible formats see the [[UI/Datepicker/formatDate|formatDate]] function
+        /// </summary>
+        [IntrinsicProperty]
+        public string AltFormat {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The text to display after each date field, e.g. to show the required format.
+        /// </summary>
+        [IntrinsicProperty]
+        public string AppendText {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Set to true to automatically resize the input field to accommodate dates in the current <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code>.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool AutoSize {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The URL for the popup button image. If set, <code>[[UI/Datepicker#option-buttonText|buttonText]]</code> becomes the ''alt'' value and is not directly displayed.
+        /// </summary>
+        [IntrinsicProperty]
+        public string ButtonImage {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Set to true to place an image after the field to use as the trigger without it appearing on a button.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool ButtonImageOnly {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The text to display on the trigger button. Use in conjunction with <code>[[UI/Datepicker#option-showOn|showOn]]</code> equal to 'button' or 'both'.
+        /// </summary>
+        [IntrinsicProperty]
+        public string ButtonText {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// myWeekCalc
+        /// </summary>
+        [IntrinsicProperty]
+        public object CalculateWeek {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Allows you to change the month by selecting from a drop-down list. You can enable this feature by setting the attribute to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool ChangeMonth {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Allows you to change the year by selecting from a drop-down list. You can enable this feature by setting the attribute to true. Use the <code>[[UI/Datepicker#option-yearRange|yearRange]]</code> option to control which years are made available for selection.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool ChangeYear {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The text to display for the close link. This attribute is one of the regionalisation attributes. Use the <code>[[UI/Datepicker#option-showButtonPanel|showButtonPanel]]</code> to display this button.
+        /// </summary>
+        [IntrinsicProperty]
+        public string CloseText {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// When true entry in the input field is constrained to those characters allowed by the current <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code>.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool ConstrainInput {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The text to display for the current day link. This attribute is one of the regionalisation attributes. Use the <code>[[UI/Datepicker#option-showButtonPanel|showButtonPanel]]</code> to display this button.
+        /// </summary>
+        [IntrinsicProperty]
+        public string CurrentText {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The format for parsed and displayed dates. This attribute is one of the regionalisation attributes. For a full list of the possible formats see the <code>[[UI/Datepicker/formatDate|formatDate]]</code> function.
+        /// </summary>
+        [IntrinsicProperty]
+        public string DateFormat {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The list of long day names, starting from Sunday, for use as requested via the <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code> setting. They also appear as popup hints when hovering over the corresponding column headings. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        [IntrinsicProperty]
+        public Array DayNames {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The list of minimised day names, starting from Sunday, for use as column headers within the datepicker. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        [IntrinsicProperty]
+        public Array DayNamesMin {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The list of abbreviated day names, starting from Sunday, for use as requested via the <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code> setting. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        [IntrinsicProperty]
+        public Array DayNamesShort {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Set the date to highlight on first opening if the field is blank. Specify either an actual date via a Date object or as a string in the current <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code>, or a number of days from today (e.g. +7) or a string of values and periods ('y' for years, 'm' for months, 'w' for weeks, 'd' for days, e.g. '+1m +7d'), or null for today.
+        /// </summary>
+        [IntrinsicProperty]
+        public object DefaultDate {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Control the speed at which the datepicker appears, it may be a time in milliseconds or a string representing one of the three predefined speeds ("slow", "normal", "fast").
+        /// </summary>
+        [IntrinsicProperty]
+        public object Duration {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Set the first day of the week: Sunday is 0, Monday is 1, ... This attribute is one of the regionalisation attributes.
+        /// </summary>
+        [IntrinsicProperty]
+        public int FirstDay {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// When true the current day link moves to the currently selected date instead of today.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool GotoCurrent {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Normally the previous and next links are disabled when not applicable (see <code>[[UI/Datepicker#option-minDate|minDate]]</code>/<code>[[UI/Datepicker#option-maxDate|maxDate]]</code>). You can hide them altogether by setting this attribute to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool HideIfNoPrevNext {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// True if the current language is drawn from right to left. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool IsRTL {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Set a maximum selectable date via a Date object or as a string in the current <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code>, or a number of days from today (e.g. +7) or a string of values and periods ('y' for years, 'm' for months, 'w' for weeks, 'd' for days, e.g. '+1m +1w'), or null for no limit.
+        /// </summary>
+        [IntrinsicProperty]
+        public object MaxDate {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Set a minimum selectable date via a Date object or as a string in the current <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code>, or a number of days from today (e.g. +7) or a string of values and periods ('y' for years, 'm' for months, 'w' for weeks, 'd' for days, e.g. '-1y -1m'), or null for no limit.
+        /// </summary>
+        [IntrinsicProperty]
+        public object MinDate {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The list of full month names, for use as requested via the <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code> setting. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        [IntrinsicProperty]
+        public Array MonthNames {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The list of abbreviated month names, as used in the month header on each datepicker and as requested via the <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code> setting. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        [IntrinsicProperty]
+        public Array MonthNamesShort {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// When true the <code>[[UI/Datepicker/formatDate|formatDate]]</code> function is applied to the <code>[[UI/Datepicker#option-prevText|prevText]]</code>, <code>[[UI/Datepicker#option-nextText|nextText]]</code>, and <code>[[UI/Datepicker#option-currentText|currentText]]</code> values before display, allowing them to display the target month names for example.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool NavigationAsDateFormat {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The text to display for the next month link. This attribute is one of the regionalisation attributes. With the standard ThemeRoller styling, this value is replaced by an icon.
+        /// </summary>
+        [IntrinsicProperty]
+        public string NextText {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Set how many months to show at once. The value can be a straight integer, or can be a two-element array to define the number of rows and columns to display.
+        /// </summary>
+        [IntrinsicProperty]
+        public object NumberOfMonths {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The text to display for the previous month link. This attribute is one of the regionalisation attributes. With the standard ThemeRoller styling, this value is replaced by an icon.
+        /// </summary>
+        [IntrinsicProperty]
+        public string PrevText {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// When true days in other months shown before or after the current month are selectable. This only applies if <code>[[UI/Datepicker#option-showOtherMonths|showOtherMonths]]</code> is also true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool SelectOtherMonths {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Set the cutoff year for determining the century for a date (used in conjunction with <code>[[UI/Datepicker#option-dateFormat|dateFormat]]</code> 'y'). If a numeric value (0-99) is provided then this value is used directly. If a string value is provided then it is converted to a number and added to the current year. Once the cutoff year is calculated, any dates entered with a year value less than or equal to it are considered to be in the current century, while those greater than it are deemed to be in the previous century.
+        /// </summary>
+        [IntrinsicProperty]
+        public object ShortYearCutoff {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Set the name of the animation used to show/hide the datepicker. Use 'show' (the default), 'slideDown', 'fadeIn', any of the show/hide [http://docs.jquery.com/UI/Effects jQuery UI effects], or "" for no animation.
+        /// </summary>
+        [IntrinsicProperty]
+        public string ShowAnim {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Whether to show the button panel.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool ShowButtonPanel {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Specify where in a [[UI/Datepicker#option-numberOfMonths|multi-month]] display the current month shows, starting from 0 at the top/left.
+        /// </summary>
+        [IntrinsicProperty]
+        public int ShowCurrentAtPos {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Whether to show the month after the year in the header. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool ShowMonthAfterYear {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Have the datepicker appear automatically when the field receives focus ("focus"), appear only when a button is clicked ("button"), or appear when either event taks place ("both").
+        /// </summary>
+        [IntrinsicProperty]
+        public string ShowOn {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If using one of the jQuery UI effects for <code>[[UI/Datepicker#option-showAnim|showAnim]]</code>, you can provide additional settings for that animation via this option.
+        /// </summary>
+        [IntrinsicProperty]
+        public object ShowOptions {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Display dates in other months (non-selectable) at the start or end of the current month. To make these days selectable use <code>[[UI/Datepicker#option-selectOtherMonths|selectOtherMonths]]</code>.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool ShowOtherMonths {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// When true a column is added to show the week of the year. The <code>[[UI/Datepicker#option-calculateWeek|calculateWeek]]</code> option determines how the week of the year is calculated. You may also want to change the <code>[[UI/Datepicker#option-firstDay|firstDay]]</code> option.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool ShowWeek {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Set how many months to move when clicking the Previous/Next links.
+        /// </summary>
+        [IntrinsicProperty]
+        public int StepMonths {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The text to display for the week of the year column heading. This attribute is one of the regionalisation attributes. Use <code>[[UI/Datepicker#option-showWeek|showWeek]]</code> to display this column.
+        /// </summary>
+        [IntrinsicProperty]
+        public string WeekHeader {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Control the range of years displayed in the year drop-down: either relative to today's year (-nn:+nn), relative to the currently selected year (c-nn:c+nn), absolute (nnnn:nnnn), or combinations of these formats (nnnn:-nn). Note that this option only affects what appears in the drop-down, to restrict which dates may be selected use the <code>[[UI/Datepicker#option-minDate|minDate]]</code> and/or <code>[[UI/Datepicker#option-maxDate|maxDate]]</code> options.
+        /// </summary>
+        [IntrinsicProperty]
+        public string YearRange {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Additional text to display after the year in the month headers. This attribute is one of the regionalisation attributes.
+        /// </summary>
+        [IntrinsicProperty]
+        public string YearSuffix {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogDragEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogDragEvent.cs
new file mode 100644
index 000000000..4b1ea567a
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogDragEvent.cs
@@ -0,0 +1,34 @@
+// DialogDragEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DialogDragEvent {
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogDragStartEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogDragStartEvent.cs
new file mode 100644
index 000000000..3e9280081
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogDragStartEvent.cs
@@ -0,0 +1,34 @@
+// DialogDragStartEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DialogDragStartEvent {
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogDragStopEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogDragStopEvent.cs
new file mode 100644
index 000000000..06f599163
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogDragStopEvent.cs
@@ -0,0 +1,34 @@
+// DialogDragStopEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DialogDragStopEvent {
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogEvents.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogEvents.cs
new file mode 100644
index 000000000..bd8bef7fd
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogEvents.cs
@@ -0,0 +1,74 @@
+// DialogEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Events raised by Dialog.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum DialogEvents {
+
+        /// <summary>
+        /// This event is triggered when a dialog attempts to close. If the beforeClose event handler (callback function) returns false, the close will be prevented.
+        /// </summary>
+        BeforeClose,
+
+        /// <summary>
+        /// This event is triggered when the dialog is closed.
+        /// </summary>
+        Close,
+
+        /// <summary>
+        /// This event is triggered when the dialog is created.
+        /// </summary>
+        Create,
+
+        /// <summary>
+        /// This event is triggered when the dialog is dragged.
+        /// </summary>
+        Drag,
+
+        /// <summary>
+        /// This event is triggered at the beginning of the dialog being dragged.
+        /// </summary>
+        DragStart,
+
+        /// <summary>
+        /// This event is triggered after the dialog has been dragged.
+        /// </summary>
+        DragStop,
+
+        /// <summary>
+        /// This event is triggered when the dialog gains focus.
+        /// </summary>
+        Focus,
+
+        /// <summary>
+        /// This event is triggered when dialog is opened.
+        /// </summary>
+        Open,
+
+        /// <summary>
+        /// This event is triggered when the dialog is resized.
+        /// </summary>
+        Resize,
+
+        /// <summary>
+        /// This event is triggered at the beginning of the dialog being resized.
+        /// </summary>
+        ResizeStart,
+
+        /// <summary>
+        /// This event is triggered after the dialog has been resized.
+        /// </summary>
+        ResizeStop
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogMethod.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogMethod.cs
new file mode 100644
index 000000000..f33706aac
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogMethod.cs
@@ -0,0 +1,52 @@
+// DialogMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Operations supported by Dialog.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum DialogMethod {
+
+        /// <summary>
+        /// Close the dialog.
+        /// </summary>
+        Close,
+
+        /// <summary>
+        /// The <code>destroy()</code> method cleans up all common data, events, etc. and then delegates out to <code>_destroy()</code> for custom cleanup.
+        /// </summary>
+        Destroy,
+
+        Disable,
+
+        Enable,
+
+        /// <summary>
+        /// Returns true if the dialog is currently open.
+        /// </summary>
+        IsOpen,
+
+        /// <summary>
+        /// Move the dialog to the top of the dialogs stack.
+        /// </summary>
+        MoveToTop,
+
+        /// <summary>
+        /// Open the dialog.
+        /// </summary>
+        Open,
+
+        Option,
+
+        Widget
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogObject.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogObject.cs
new file mode 100644
index 000000000..6e36edf61
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogObject.cs
@@ -0,0 +1,67 @@
+// DialogObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Open content in an interactive overlay
+    /// </summary>
+    /// <remarks>
+    /// <para>A dialog is a floating window that contains a title bar and a content area. The dialog window can be moved, resized and closed with the 'x' icon by default.</para><para>If the content length exceeds the maximum height, a scrollbar will automatically appear.</para><para>A bottom button bar and semi-transparent modal overlay layer are common options that can be added.</para><para>This widget requires some functional CSS, otherwise it won't work. If you build a custom theme, use the widget's specific CSS file as a starting point.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class DialogObject : WidgetObject {
+
+        private DialogObject() {
+        }
+
+        [ScriptName("dialog")]
+        public DialogObject Dialog() {
+            return null;
+        }
+
+        [ScriptName("dialog")]
+        public DialogObject Dialog(DialogOptions options) {
+            return null;
+        }
+
+        [ScriptName("dialog")]
+        public object Dialog(DialogMethod method, params object[] options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Close the dialog.
+        /// </summary>
+        public void Close() {
+        }
+
+
+        /// <summary>
+        /// Returns true if the dialog is currently open.
+        /// </summary>
+        public void IsOpen() {
+        }
+
+
+        /// <summary>
+        /// Move the dialog to the top of the dialogs stack.
+        /// </summary>
+        public void MoveToTop() {
+        }
+
+
+        /// <summary>
+        /// Open the dialog.
+        /// </summary>
+        public void Open() {
+        }
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogOption.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogOption.cs
new file mode 100644
index 000000000..a7dc19447
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogOption.cs
@@ -0,0 +1,124 @@
+// DialogOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options for use with Dialog.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum DialogOption {
+
+        /// <summary>
+        /// When ''autoOpen'' is ''true'' the dialog will open automatically when ''dialog'' is called. If ''false'' it will stay hidden until ''.dialog("open")'' is called on it.
+        /// </summary>
+        AutoOpen,
+
+        /// <summary>
+        /// Specifies which buttons should be displayed on the dialog. Each element of the array must be an Object defining the properties to set on the button.
+        /// </summary>
+        Buttons,
+
+        /// <summary>
+        /// Specifies whether the dialog should close when it has focus and the user presses the esacpe (ESC) key.
+        /// </summary>
+        CloseOnEscape,
+
+        /// <summary>
+        /// Specifies the text for the close button. Note that the close text is visibly hidden when using a standard theme.
+        /// </summary>
+        CloseText,
+
+        /// <summary>
+        /// The specified class name(s) will be added to the dialog, for additional theming.
+        /// </summary>
+        DialogClass,
+
+        /// <summary>
+        /// Disables the dialog if set to true.
+        /// </summary>
+        Disabled,
+
+        /// <summary>
+        /// If set to true, the dialog will be draggable by the titlebar.
+        /// </summary>
+        Draggable,
+
+        /// <summary>
+        /// The height of the dialog, in pixels. Specifying 'auto' is also supported to make the dialog adjust based on its content.
+        /// </summary>
+        Height,
+
+        /// <summary>
+        /// The effect to be used when the dialog is closed.
+        /// </summary>
+        Hide,
+
+        /// <summary>
+        /// The maximum height to which the dialog can be resized, in pixels.
+        /// </summary>
+        MaxHeight,
+
+        /// <summary>
+        /// The maximum width to which the dialog can be resized, in pixels.
+        /// </summary>
+        MaxWidth,
+
+        /// <summary>
+        /// The minimum height to which the dialog can be resized, in pixels.
+        /// </summary>
+        MinHeight,
+
+        /// <summary>
+        /// The minimum width to which the dialog can be resized, in pixels.
+        /// </summary>
+        MinWidth,
+
+        /// <summary>
+        /// If set to true, the dialog will have modal behavior; other items on the page will be disabled (i.e. cannot be interacted with). Modal dialogs create an overlay below the dialog but above other page elements.
+        /// </summary>
+        Modal,
+
+        /// <summary>
+        /// Specifies where the dialog should be displayed. Possible values: <br />1) a single string representing position within viewport: 'center', 'left', 'right', 'top', 'bottom'. <br />2) an array containing an <em>x,y</em> coordinate pair in pixel offset from left, top corner of viewport (e.g. [350,100]) <br />3) an array containing <em>x,y</em> position string values (e.g. ['right','top'] for top right corner).
+        /// </summary>
+        Position,
+
+        /// <summary>
+        /// If set to true, the dialog will be resizable.
+        /// </summary>
+        Resizable,
+
+        /// <summary>
+        /// The effect to be used when the dialog is opened.
+        /// </summary>
+        Show,
+
+        /// <summary>
+        /// Specifies whether the dialog will stack on top of other dialogs. This will cause the dialog to move to the front of other dialogs when it gains focus.
+        /// </summary>
+        Stack,
+
+        /// <summary>
+        /// Specifies the title of the dialog. Any valid HTML may be set as the title. The title can also be specified by the title attribute on the dialog source element.
+        /// </summary>
+        Title,
+
+        /// <summary>
+        /// The width of the dialog, in pixels.
+        /// </summary>
+        Width,
+
+        /// <summary>
+        /// The starting z-index for the dialog.
+        /// </summary>
+        ZIndex
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogOptions.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogOptions.cs
new file mode 100644
index 000000000..2532047f4
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogOptions.cs
@@ -0,0 +1,409 @@
+// DialogOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options used to initialize or customize Dialog.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DialogOptions {
+
+        public DialogOptions() {
+        }
+
+        public DialogOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// This event is triggered when a dialog attempts to close. If the beforeClose event handler (callback function) returns false, the close will be prevented.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<jQueryObject> BeforeClose {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the dialog is closed.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<jQueryObject> Close {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the dialog is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the dialog is dragged.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<DialogDragEvent> Drag {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered at the beginning of the dialog being dragged.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<DialogDragStartEvent> DragStart {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered after the dialog has been dragged.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<DialogDragStopEvent> DragStop {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the dialog gains focus.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<jQueryObject> Focus {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when dialog is opened.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<jQueryObject> Open {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the dialog is resized.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<DialogResizeEvent> Resize {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered at the beginning of the dialog being resized.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<DialogResizeStartEvent> ResizeStart {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered after the dialog has been resized.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<DialogResizeStopEvent> ResizeStop {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// When ''autoOpen'' is ''true'' the dialog will open automatically when ''dialog'' is called. If ''false'' it will stay hidden until ''.dialog("open")'' is called on it.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool AutoOpen {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Specifies which buttons should be displayed on the dialog. Each element of the array must be an Object defining the properties to set on the button.
+        /// </summary>
+        [IntrinsicProperty]
+        public Array Buttons {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Specifies whether the dialog should close when it has focus and the user presses the esacpe (ESC) key.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool CloseOnEscape {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Specifies the text for the close button. Note that the close text is visibly hidden when using a standard theme.
+        /// </summary>
+        [IntrinsicProperty]
+        public string CloseText {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The specified class name(s) will be added to the dialog, for additional theming.
+        /// </summary>
+        [IntrinsicProperty]
+        public string DialogClass {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Disables the dialog if set to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Disabled {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to true, the dialog will be draggable by the titlebar.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Draggable {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The height of the dialog, in pixels. Specifying 'auto' is also supported to make the dialog adjust based on its content.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Height {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The effect to be used when the dialog is closed.
+        /// </summary>
+        [IntrinsicProperty]
+        public object Hide {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The maximum height to which the dialog can be resized, in pixels.
+        /// </summary>
+        [IntrinsicProperty]
+        public int MaxHeight {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The maximum width to which the dialog can be resized, in pixels.
+        /// </summary>
+        [IntrinsicProperty]
+        public int MaxWidth {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The minimum height to which the dialog can be resized, in pixels.
+        /// </summary>
+        [IntrinsicProperty]
+        public int MinHeight {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The minimum width to which the dialog can be resized, in pixels.
+        /// </summary>
+        [IntrinsicProperty]
+        public int MinWidth {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to true, the dialog will have modal behavior; other items on the page will be disabled (i.e. cannot be interacted with). Modal dialogs create an overlay below the dialog but above other page elements.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Modal {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Specifies where the dialog should be displayed. Possible values: <br />1) a single string representing position within viewport: 'center', 'left', 'right', 'top', 'bottom'. <br />2) an array containing an <em>x,y</em> coordinate pair in pixel offset from left, top corner of viewport (e.g. [350,100]) <br />3) an array containing <em>x,y</em> position string values (e.g. ['right','top'] for top right corner).
+        /// </summary>
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to true, the dialog will be resizable.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Resizable {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The effect to be used when the dialog is opened.
+        /// </summary>
+        [IntrinsicProperty]
+        public object Show {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Specifies whether the dialog will stack on top of other dialogs. This will cause the dialog to move to the front of other dialogs when it gains focus.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Stack {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Specifies the title of the dialog. Any valid HTML may be set as the title. The title can also be specified by the title attribute on the dialog source element.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Title {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The width of the dialog, in pixels.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Width {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The starting z-index for the dialog.
+        /// </summary>
+        [IntrinsicProperty]
+        public int ZIndex {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogResizeEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogResizeEvent.cs
new file mode 100644
index 000000000..3d1e2059b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogResizeEvent.cs
@@ -0,0 +1,34 @@
+// DialogResizeEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DialogResizeEvent {
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogResizeStartEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogResizeStartEvent.cs
new file mode 100644
index 000000000..a1ac30645
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogResizeStartEvent.cs
@@ -0,0 +1,34 @@
+// DialogResizeStartEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DialogResizeStartEvent {
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogResizeStopEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogResizeStopEvent.cs
new file mode 100644
index 000000000..e4f0e77d4
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Dialog/DialogResizeStopEvent.cs
@@ -0,0 +1,34 @@
+// DialogResizeStopEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class DialogResizeStopEvent {
+
+        [IntrinsicProperty]
+        public object Offset {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public object Position {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarEvents.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarEvents.cs
new file mode 100644
index 000000000..4b2678e0b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarEvents.cs
@@ -0,0 +1,34 @@
+// ProgressBarEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Events raised by ProgressBar.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ProgressBarEvents {
+
+        /// <summary>
+        /// This event is triggered when the value of the progressbar changes.
+        /// </summary>
+        Change,
+
+        /// <summary>
+        /// This event is triggered when the value of the progressbar reaches the maximum value of 100.
+        /// </summary>
+        Complete,
+
+        /// <summary>
+        /// This event is triggered when the progressbar is created.
+        /// </summary>
+        Create
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarMethod.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarMethod.cs
new file mode 100644
index 000000000..fd8c498c5
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarMethod.cs
@@ -0,0 +1,37 @@
+// ProgressBarMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Operations supported by ProgressBar.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ProgressBarMethod {
+
+        /// <summary>
+        /// The <code>destroy()</code> method cleans up all common data, events, etc. and then delegates out to <code>_destroy()</code> for custom cleanup.
+        /// </summary>
+        Destroy,
+
+        Disable,
+
+        Enable,
+
+        Option,
+
+        /// <summary>
+        /// This method gets or sets the current value of the progressbar.
+        /// </summary>
+        Value,
+
+        Widget
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarObject.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarObject.cs
new file mode 100644
index 000000000..34589e9d0
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarObject.cs
@@ -0,0 +1,46 @@
+// ProgressBarObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Display status of a determinate process
+    /// </summary>
+    /// <remarks>
+    /// <para>The progress bar is designed to simply display the current percent complete for a process. The bar is coded to be flexibly sized through CSS and will scale to fit inside it's parent container by default.</para><para>This is a determinate progress bar, meaning that it should only be used in situations where the system can accurately update the current status complete. A determinate progress bar should never fill from left to right, then loop back to empty for a single process -- if the actual percent complete status cannot be calculated, an indeterminate progress bar or spinner animation is a better way to provide user feedback.</para><para>This widget requires some functional CSS, otherwise it won't work. If you build a custom theme, use the widget's specific CSS file as a starting point.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class ProgressBarObject : WidgetObject {
+
+        private ProgressBarObject() {
+        }
+
+        [ScriptName("progressbar")]
+        public ProgressBarObject ProgressBar() {
+            return null;
+        }
+
+        [ScriptName("progressbar")]
+        public ProgressBarObject ProgressBar(ProgressBarOptions options) {
+            return null;
+        }
+
+        [ScriptName("progressbar")]
+        public object ProgressBar(ProgressBarMethod method, params object[] options) {
+            return null;
+        }
+
+        /// <summary>
+        /// This method gets or sets the current value of the progressbar.
+        /// </summary>
+        public void Value(int value) {
+        }
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarOption.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarOption.cs
new file mode 100644
index 000000000..46f6a7d39
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarOption.cs
@@ -0,0 +1,29 @@
+// ProgressBarOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options for use with ProgressBar.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum ProgressBarOption {
+
+        /// <summary>
+        /// Disables the progressbar if set to true.
+        /// </summary>
+        Disabled,
+
+        /// <summary>
+        /// The value of the progressbar.
+        /// </summary>
+        Value
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarOptions.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarOptions.cs
new file mode 100644
index 000000000..cea1f8d44
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/ProgressBar/ProgressBarOptions.cs
@@ -0,0 +1,85 @@
+// ProgressBarOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options used to initialize or customize ProgressBar.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class ProgressBarOptions {
+
+        public ProgressBarOptions() {
+        }
+
+        public ProgressBarOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// This event is triggered when the value of the progressbar changes.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<jQueryObject> Change {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the value of the progressbar reaches the maximum value of 100.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<jQueryObject> Complete {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the progressbar is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Disables the progressbar if set to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Disabled {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The value of the progressbar.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Value {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SlideChangeEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SlideChangeEvent.cs
new file mode 100644
index 000000000..a5f65f256
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SlideChangeEvent.cs
@@ -0,0 +1,34 @@
+// SlideChangeEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SlideChangeEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Handle {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public int Value {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SlideEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SlideEvent.cs
new file mode 100644
index 000000000..49fbe2c12
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SlideEvent.cs
@@ -0,0 +1,43 @@
+// SlideEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SlideEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Handle {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public int Value {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public Array Values {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SlideStartEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SlideStartEvent.cs
new file mode 100644
index 000000000..9abf43990
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SlideStartEvent.cs
@@ -0,0 +1,34 @@
+// SlideStartEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SlideStartEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Handle {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public int Value {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SlideStopEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SlideStopEvent.cs
new file mode 100644
index 000000000..09558a73b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SlideStopEvent.cs
@@ -0,0 +1,34 @@
+// SlideStopEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SlideStopEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Handle {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public int Value {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderEvents.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderEvents.cs
new file mode 100644
index 000000000..7b856fe76
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderEvents.cs
@@ -0,0 +1,44 @@
+// SliderEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Events raised by Slider.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum SliderEvents {
+
+        /// <summary>
+        /// This event is triggered on slide stop, or if the value is changed programmatically (by the <code>value</code> method).  Takes arguments event and ui.  Use event.originalEvent to detect whether the value changed by mouse, keyboard, or programmatically. Use ui.value (single-handled sliders) to obtain the value of the current handle, $(this).slider('values', index) to get another handle's value.
+        /// </summary>
+        Change,
+
+        /// <summary>
+        /// This event is triggered when the slider is created.
+        /// </summary>
+        Create,
+
+        /// <summary>
+        /// This event is triggered on every mouse move during slide. Use ui.value (single-handled sliders) to obtain the value of the current handle, $(..).slider('value', index) to get another handles' value.Return false in order to prevent a slide, based on ui.value.
+        /// </summary>
+        Slide,
+
+        /// <summary>
+        /// This event is triggered when the user starts sliding.
+        /// </summary>
+        Start,
+
+        /// <summary>
+        /// This event is triggered when the user stops sliding.
+        /// </summary>
+        Stop
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderMethod.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderMethod.cs
new file mode 100644
index 000000000..3d8bdf066
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderMethod.cs
@@ -0,0 +1,42 @@
+// SliderMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Operations supported by Slider.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum SliderMethod {
+
+        /// <summary>
+        /// The <code>destroy()</code> method cleans up all common data, events, etc. and then delegates out to <code>_destroy()</code> for custom cleanup.
+        /// </summary>
+        Destroy,
+
+        Disable,
+
+        Enable,
+
+        Option,
+
+        /// <summary>
+        /// Gets or sets the value of the slider. For single handle sliders.
+        /// </summary>
+        Value,
+
+        /// <summary>
+        /// Number
+        /// </summary>
+        Values,
+
+        Widget
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderObject.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderObject.cs
new file mode 100644
index 000000000..71e6ca394
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderObject.cs
@@ -0,0 +1,53 @@
+// SliderObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Drag a handle to select a numeric value
+    /// </summary>
+    /// <remarks>
+    /// <para>The jQuery UI Slider plugin makes selected elements into sliders. There are various options such as multiple handles, and ranges. The handle can be moved with the mouse or the arrow keys.</para>The start, slide, and stop callbacks receive two arguments: The original browser event and a prepared ui object, view below for a documentation of this object (if you name your second argument 'ui'):The slider widget will create handle elements with the class 'ui-slider-handle' on initialization. You can specify custom handle elements by creating and appending the elements and adding the 'ui-slider-handle' class before init. It will only create the number of handles needed to match the length of value/values. For example, if you specify 'values: [1, 5, 18]' and create one custom handle, the plugin will create the other two.<ul><li><b>ui.handle</b>: DOMElement - the current focused handle</li><li><b>ui.value</b>: Integer - the current handle's value</li></ul><para>This widget requires some functional CSS, otherwise it won't work. If you build a custom theme, use the widget's specific CSS file as a starting point.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class SliderObject : WidgetObject {
+
+        private SliderObject() {
+        }
+
+        [ScriptName("slider")]
+        public SliderObject Slider() {
+            return null;
+        }
+
+        [ScriptName("slider")]
+        public SliderObject Slider(SliderOptions options) {
+            return null;
+        }
+
+        [ScriptName("slider")]
+        public object Slider(SliderMethod method, params object[] options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Gets or sets the value of the slider. For single handle sliders.
+        /// </summary>
+        public void Value(int value) {
+        }
+
+
+        /// <summary>
+        /// Number
+        /// </summary>
+        public void Values(int index, int value) {
+        }
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderOption.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderOption.cs
new file mode 100644
index 000000000..bf81fb613
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderOption.cs
@@ -0,0 +1,64 @@
+// SliderOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options for use with Slider.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum SliderOption {
+
+        /// <summary>
+        /// Whether to slide handle smoothly when user click outside handle on the bar. Will also accept a string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
+        /// </summary>
+        Animate,
+
+        /// <summary>
+        /// Disables the slider if set to true.
+        /// </summary>
+        Disabled,
+
+        /// <summary>
+        /// The maximum value of the slider.
+        /// </summary>
+        Max,
+
+        /// <summary>
+        /// The minimum value of the slider.
+        /// </summary>
+        Min,
+
+        /// <summary>
+        /// This option determines whether the slider has the min at the left, the max at the right or the min at the bottom, the max at the top. Possible values: 'horizontal', 'vertical'.
+        /// </summary>
+        Orientation,
+
+        /// <summary>
+        /// If set to true, the slider will detect if you have two handles and create a stylable range element between these two. Two other possible values are 'min' and 'max'. A min range goes from the slider min to one handle. A max range goes from one handle to the slider max.
+        /// </summary>
+        Range,
+
+        /// <summary>
+        /// Determines the size or amount of each interval or step the slider takes between min and max. The full specified value range of the slider (max - min) needs to be evenly divisible by the step.
+        /// </summary>
+        Step,
+
+        /// <summary>
+        /// Determines the value of the slider, if there's only one handle. If there is more than one handle, determines the value of the first handle.
+        /// </summary>
+        Value,
+
+        /// <summary>
+        /// This option can be used to specify multiple handles. If range is set to true, the length of 'values' should be 2.
+        /// </summary>
+        Values
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderOptions.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderOptions.cs
new file mode 100644
index 000000000..943ba82ce
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Slider/SliderOptions.cs
@@ -0,0 +1,193 @@
+// SliderOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options used to initialize or customize Slider.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class SliderOptions {
+
+        public SliderOptions() {
+        }
+
+        public SliderOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// This event is triggered on slide stop, or if the value is changed programmatically (by the <code>value</code> method).  Takes arguments event and ui.  Use event.originalEvent to detect whether the value changed by mouse, keyboard, or programmatically. Use ui.value (single-handled sliders) to obtain the value of the current handle, $(this).slider('values', index) to get another handle's value.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SlideChangeEvent> Change {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the slider is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered on every mouse move during slide. Use ui.value (single-handled sliders) to obtain the value of the current handle, $(..).slider('value', index) to get another handles' value.Return false in order to prevent a slide, based on ui.value.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SlideEvent> Slide {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the user starts sliding.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SlideStartEvent> Start {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the user stops sliding.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<SlideStopEvent> Stop {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Whether to slide handle smoothly when user click outside handle on the bar. Will also accept a string representing one of the three predefined speeds ("slow", "normal", or "fast") or the number of milliseconds to run the animation (e.g. 1000).
+        /// </summary>
+        [IntrinsicProperty]
+        public object Animate {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Disables the slider if set to true.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Disabled {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The maximum value of the slider.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Max {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The minimum value of the slider.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Min {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// This option determines whether the slider has the min at the left, the max at the right or the min at the bottom, the max at the top. Possible values: 'horizontal', 'vertical'.
+        /// </summary>
+        [IntrinsicProperty]
+        public string Orientation {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// If set to true, the slider will detect if you have two handles and create a stylable range element between these two. Two other possible values are 'min' and 'max'. A min range goes from the slider min to one handle. A max range goes from one handle to the slider max.
+        /// </summary>
+        [IntrinsicProperty]
+        public object Range {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Determines the size or amount of each interval or step the slider takes between min and max. The full specified value range of the slider (max - min) needs to be evenly divisible by the step.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Step {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Determines the value of the slider, if there's only one handle. If there is more than one handle, determines the value of the first handle.
+        /// </summary>
+        [IntrinsicProperty]
+        public int Value {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// This option can be used to specify multiple handles. If range is set to true, the length of 'values' should be 2.
+        /// </summary>
+        [IntrinsicProperty]
+        public Array Values {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsAddEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsAddEvent.cs
new file mode 100644
index 000000000..ff8a7078e
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsAddEvent.cs
@@ -0,0 +1,34 @@
+// TabsAddEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class TabsAddEvent {
+
+        [IntrinsicProperty]
+        public string Panel {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Tab {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsDisableEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsDisableEvent.cs
new file mode 100644
index 000000000..3b74b8c16
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsDisableEvent.cs
@@ -0,0 +1,34 @@
+// TabsDisableEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class TabsDisableEvent {
+
+        [IntrinsicProperty]
+        public string Panel {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Tab {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsEnableEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsEnableEvent.cs
new file mode 100644
index 000000000..0cc926c44
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsEnableEvent.cs
@@ -0,0 +1,34 @@
+// TabsEnableEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class TabsEnableEvent {
+
+        [IntrinsicProperty]
+        public string Panel {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Tab {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsEvents.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsEvents.cs
new file mode 100644
index 000000000..467e9fb09
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsEvents.cs
@@ -0,0 +1,59 @@
+// TabsEvents.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Events raised by Tabs.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum TabsEvents {
+
+        /// <summary>
+        /// Triggered after a new tab is added.
+        /// </summary>
+        Add,
+
+        /// <summary>
+        /// This event is triggered when the tabs is created.
+        /// </summary>
+        Create,
+
+        /// <summary>
+        /// Triggered after an enabled tab has been disabled.
+        /// </summary>
+        Disable,
+
+        /// <summary>
+        /// Triggered after a disabled tab has been enabled.
+        /// </summary>
+        Enable,
+
+        /// <summary>
+        /// Triggered after a remote tab has been loaded.
+        /// </summary>
+        Load,
+
+        /// <summary>
+        /// Triggered after a tab has been removed.
+        /// </summary>
+        Remove,
+
+        /// <summary>
+        /// This event is triggered when clicking a tab.
+        /// </summary>
+        Select,
+
+        /// <summary>
+        /// Triggered after a tab has been shown.
+        /// </summary>
+        Show
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsLoadEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsLoadEvent.cs
new file mode 100644
index 000000000..e9d27c716
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsLoadEvent.cs
@@ -0,0 +1,34 @@
+// TabsLoadEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class TabsLoadEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Panel {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Tab {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsMethod.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsMethod.cs
new file mode 100644
index 000000000..7291debac
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsMethod.cs
@@ -0,0 +1,72 @@
+// TabsMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Operations supported by Tabs.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum TabsMethod {
+
+        /// <summary>
+        /// Terminate all running tab ajax requests and animations.
+        /// </summary>
+        Abort,
+
+        /// <summary>
+        /// Add a new tab. The second argument is either a URL consisting of a fragment identifier only to create an in-page tab or a full url (relative or absolute, no cross-domain support) to turn the new tab into an Ajax (remote) tab. The third is the zero-based position where to insert the new tab. Optional, by default a new tab is appended at the end.
+        /// </summary>
+        Add,
+
+        /// <summary>
+        /// The <code>destroy()</code> method cleans up all common data, events, etc. and then delegates out to <code>_destroy()</code> for custom cleanup.
+        /// </summary>
+        Destroy,
+
+        Disable,
+
+        Enable,
+
+        /// <summary>
+        /// Retrieve the number of tabs of the first matched tab pane.
+        /// </summary>
+        Length,
+
+        /// <summary>
+        /// Load the panel content of a remote tab (specified by index)
+        /// </summary>
+        Load,
+
+        Option,
+
+        /// <summary>
+        /// Remove a tab. The second argument is the zero-based index of the tab to be removed. Instead of an index, the href of the tab may be passed.
+        /// </summary>
+        Remove,
+
+        /// <summary>
+        /// Set up an automatic rotation through tabs of a tab pane. The second argument is an amount of time in milliseconds until the next tab in the cycle gets activated. Use 0 or null to stop the rotation. The third controls whether or not to continue the rotation after a tab has been selected by a user. Default: false.
+        /// </summary>
+        Rotate,
+
+        /// <summary>
+        /// Select a tab, as if it were clicked. The second argument is the zero-based index of the tab to be selected or the id selector of the panel the tab is associated with (the tab's href fragment identifier, e.g. hash, points to the panel's id).
+        /// </summary>
+        Select,
+
+        /// <summary>
+        /// Change the url from which an Ajax (remote) tab will be loaded. The specified URL will be used for subsequent loads. Note that you can not only change the URL for an existing remote tab with this method, but also turn an in-page tab into a remote tab. The second argument is the zero-based index of the tab of which its URL is to be updated. The third is a URL the content of the tab is loaded from.
+        /// </summary>
+        Url,
+
+        Widget
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsObject.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsObject.cs
new file mode 100644
index 000000000..d04feb491
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsObject.cs
@@ -0,0 +1,109 @@
+// TabsObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// A single content area with multiple panels, each associated with a header in a list
+    /// </summary>
+    /// <remarks>
+    /// <para>Tabs are generally used to break content into multiple sections that can be swapped to save space, much like an accordion.</para><para>By default a tab widget will swap between tabbed sections on click, but the events can be changed to onHover through an option. Tab content can be loaded via Ajax by setting an href on a tab.</para><para>This widget requires some functional CSS, otherwise it won't work. If you build a custom theme, use the widget's specific CSS file as a starting point.</para>
+    /// </remarks>
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class TabsObject : WidgetObject {
+
+        private TabsObject() {
+        }
+
+        [ScriptName("tabs")]
+        public TabsObject Tabs() {
+            return null;
+        }
+
+        [ScriptName("tabs")]
+        public TabsObject Tabs(TabsOptions options) {
+            return null;
+        }
+
+        [ScriptName("tabs")]
+        public object Tabs(TabsMethod method, params object[] options) {
+            return null;
+        }
+
+        /// <summary>
+        /// Terminate all running tab ajax requests and animations.
+        /// </summary>
+        public void Abort() {
+        }
+
+
+        /// <summary>
+        /// Add a new tab. The second argument is either a URL consisting of a fragment identifier only to create an in-page tab or a full url (relative or absolute, no cross-domain support) to turn the new tab into an Ajax (remote) tab. The third is the zero-based position where to insert the new tab. Optional, by default a new tab is appended at the end.
+        /// </summary>
+        public void Add(string url, string label, object index) {
+        }
+
+
+        /// <summary>
+        /// Disable a tab. The selected tab cannot be disabled. To disable more than one tab at once use: <code>$('#example').tabs("option","disabled", [1, 2, 3]);</code><para>The argument is the zero-based index of the tab to be disabled. Instead of an index, the href of the tab may be passed.</para>
+        /// </summary>
+        public void Disable(object index) {
+        }
+
+
+        /// <summary>
+        /// Enable a disabled tab. To enable more than one tab at once reset the disabled property like: <code>$('#example').tabs("option","disabled",[]);</code>.<para>The argument is the zero-based index of the tab to be enabled. Instead of an index, the href of the tab may be passed.</para>
+        /// </summary>
+        public void Enable(object index) {
+        }
+
+
+        /// <summary>
+        /// Retrieve the number of tabs of the first matched tab pane.
+        /// </summary>
+        public new void Length() {
+        }
+
+
+        /// <summary>
+        /// Load the panel content of a remote tab (specified by index)
+        /// </summary>
+        public void Load(object index) {
+        }
+
+
+        /// <summary>
+        /// Remove a tab. The second argument is the zero-based index of the tab to be removed. Instead of an index, the href of the tab may be passed.
+        /// </summary>
+        public void Remove(object index) {
+        }
+
+
+        /// <summary>
+        /// Set up an automatic rotation through tabs of a tab pane. The second argument is an amount of time in milliseconds until the next tab in the cycle gets activated. Use 0 or null to stop the rotation. The third controls whether or not to continue the rotation after a tab has been selected by a user. Default: false.
+        /// </summary>
+        public void Rotate(int ms, bool continuing) {
+        }
+
+
+        /// <summary>
+        /// Select a tab, as if it were clicked. The second argument is the zero-based index of the tab to be selected or the id selector of the panel the tab is associated with (the tab's href fragment identifier, e.g. hash, points to the panel's id).
+        /// </summary>
+        public void Select(object index) {
+        }
+
+
+        /// <summary>
+        /// Change the url from which an Ajax (remote) tab will be loaded. The specified URL will be used for subsequent loads. Note that you can not only change the URL for an existing remote tab with this method, but also turn an in-page tab into a remote tab. The second argument is the zero-based index of the tab of which its URL is to be updated. The third is a URL the content of the tab is loaded from.
+        /// </summary>
+        public void Url(object index, string url) {
+        }
+
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsOption.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsOption.cs
new file mode 100644
index 000000000..82788fb7f
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsOption.cs
@@ -0,0 +1,49 @@
+// TabsOption.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options for use with Tabs.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum TabsOption {
+
+        /// <summary>
+        /// The zero-based index of the panel that is active (open). A negative value select panels going backward from the last panel.<para>When collapsible is set to true, a false value closes the accordion, otherwise nothing happens</para>
+        /// </summary>
+        Active,
+
+        /// <summary>
+        /// Allow the active panel to be closed.
+        /// </summary>
+        Collapsible,
+
+        /// <summary>
+        /// An array containing the position of the tabs (zero-based index) that should be disabled.
+        /// </summary>
+        Disabled,
+
+        /// <summary>
+        /// The type of event to be used for activating a tab. To activate on hover, use "mouseover".
+        /// </summary>
+        Event,
+
+        /// <summary>
+        /// Controls the height of the tabs widget and each panel. Possible values:<ul><li>auto: all panels will be set to the height of the tallest panel</li><li>fill: expand to the available height based on the tabs's parent height</li><li>content: each panel will be only as tall as its content</li></ul>
+        /// </summary>
+        HeightStyle,
+
+        /// <summary>
+        /// How to hide a panel.
+        /// </summary>
+        Hide
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsOptions.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsOptions.cs
new file mode 100644
index 000000000..454be658a
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsOptions.cs
@@ -0,0 +1,193 @@
+// TabsOptions.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    /// <summary>
+    /// Options used to initialize or customize Tabs.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class TabsOptions {
+
+        public TabsOptions() {
+        }
+
+        public TabsOptions(params object[] nameValuePairs) {
+        }
+
+        /// <summary>
+        /// Triggered after a new tab is added.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<TabsAddEvent> Add {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when the tabs widget is created.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryEventHandler Create {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Triggered after an enabled tab has been disabled.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<TabsDisableEvent> Disable {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Triggered after a disabled tab has been enabled.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<TabsEnableEvent> Enable {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Triggered after a remote tab has been loaded.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<TabsLoadEvent> Load {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Triggered after a tab has been removed.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<TabsRemoveEvent> Remove {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// This event is triggered when clicking a tab.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<TabsSelectEvent> Select {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// Triggered after a tab has been shown.
+        /// </summary>
+        [IntrinsicProperty]
+        public jQueryUIEventHandler<TabsShowEvent> Show {
+             get {
+                return null;
+             }
+             set {
+             }
+        }
+
+        /// <summary>
+        /// The zero-based index of the panel that is active (open). A negative value select panels going backward from the last panel.<para>When collapsible is set to true, a false value closes the accordion, otherwise nothing happens</para>
+        /// </summary>
+        [IntrinsicProperty]
+        public object Active {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Allow the active panel to be closed.
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Collapsible {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// An array containing the position of the tabs (zero-based index) that should be disabled.
+        /// </summary>
+        [IntrinsicProperty]
+        public object Disabled {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// The type of event to be used for activating a tab. To activate on hover, use "mouseover".
+        /// </summary>
+        [IntrinsicProperty]
+        public string Event {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Controls the height of the tabs widget and each panel. Possible values:<ul><li>auto: all panels will be set to the height of the tallest panel</li><li>fill: expand to the available height based on the tabs's parent height</li><li>content: each panel will be only as tall as its content</li></ul>
+        /// </summary>
+        [IntrinsicProperty]
+        public string HeightStyle {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// How to hide a panel.
+        /// </summary>
+        [IntrinsicProperty]
+        public object Hide {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsRemoveEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsRemoveEvent.cs
new file mode 100644
index 000000000..8035deece
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsRemoveEvent.cs
@@ -0,0 +1,34 @@
+// TabsRemoveEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class TabsRemoveEvent {
+
+        [IntrinsicProperty]
+        public string Panel {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Tab {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsSelectEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsSelectEvent.cs
new file mode 100644
index 000000000..5b544572b
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsSelectEvent.cs
@@ -0,0 +1,43 @@
+// TabsSelectEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class TabsSelectEvent {
+
+        [IntrinsicProperty]
+        public int Index {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Panel {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryObject Tab {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsShowEvent.cs b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsShowEvent.cs
new file mode 100644
index 000000000..7a0d07b41
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/Widgets/Tabs/TabsShowEvent.cs
@@ -0,0 +1,34 @@
+// TabsShowEvent.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI.Widgets {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class TabsShowEvent {
+
+        [IntrinsicProperty]
+        public jQueryObject Panel {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Tab {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/jQuery.UI.csproj b/src/Libraries/jQuery/jQuery.UI/jQuery.UI.csproj
new file mode 100644
index 000000000..89208d8af
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/jQuery.UI.csproj
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{824C1FEC-2455-4183-AFC6-891EDB88213A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoStdLib>True</NoStdLib>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>jQueryApi.UI</RootNamespace>
+    <AssemblyName>Script.jQuery.UI</AssemblyName>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>false</DebugSymbols>
+    <Optimize>false</Optimize>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <OutputPath>..\..\..\..\bin\Debug\</OutputPath>
+    <DocumentationFile>..\..\..\..\bin\Debug\Script.jQuery.UI.xml</DocumentationFile>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <OutputPath>..\..\..\..\bin\Release\</OutputPath>
+    <DocumentationFile>..\..\..\..\bin\Release\Script.jQuery.UI.xml</DocumentationFile>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Widgets\Accordion\*.cs" />
+    <Compile Include="Widgets\AutoComplete\*.cs" />
+    <Compile Include="Effects\Blind\*.cs" />
+    <Compile Include="Effects\Bounce\*.cs" />
+    <Compile Include="Widgets\Button\*.cs" />
+    <Compile Include="Widgets\ButtonSet\*.cs" />
+    <Compile Include="Effects\Clip\*.cs" />
+    <Compile Include="*.cs" />
+    <Compile Include="Widgets\DatePicker\*.cs" />
+    <Compile Include="Widgets\Dialog\*.cs" />
+    <Compile Include="Interactions\Draggable\*.cs" />
+    <Compile Include="Effects\Drop\*.cs" />
+    <Compile Include="Interactions\Droppable\*.cs" />
+    <Compile Include="Effects\Effect\*.cs" />
+    <Compile Include="Effects\Explode\*.cs" />
+    <Compile Include="Effects\Fade\*.cs" />
+    <Compile Include="Effects\Fold\*.cs" />
+    <Compile Include="Effects\Highlight\*.cs" />
+    <Compile Include="Widgets\ProgressBar\*.cs" />
+    <Compile Include="Effects\Puff\*.cs" />
+    <Compile Include="Effects\Pulsate\*.cs" />
+    <Compile Include="Interactions\Resizable\*.cs" />
+    <Compile Include="Effects\Scale\*.cs" />
+    <Compile Include="Interactions\Selectable\*.cs" />
+    <Compile Include="Effects\Shake\*.cs" />
+    <Compile Include="Effects\Size\*.cs" />
+    <Compile Include="Effects\Slide\*.cs" />
+    <Compile Include="Widgets\Slider\*.cs" />
+    <Compile Include="Interactions\Sortable\*.cs" />
+    <Compile Include="Widgets\Tabs\*.cs" />
+    <Compile Include="Effects\Transfer\*.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
+    </Compile>
+    <ScriptInfo Include="Properties\ScriptInfo.txt">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </ScriptInfo>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Core\CoreLib\CoreLib.csproj">
+      <Project>{36D4B098-A21C-4725-ACD3-400922885F38}</Project>
+      <Name>CoreLib</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Web\Web.csproj">
+      <Project>{3681A9A8-FC40-4125-B842-7775713C8DCE}</Project>
+      <Name>Web</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\jQuery.Core\jQuery.Core.csproj">
+      <Project>{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}</Project>
+      <Name>jQuery.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(ScriptInfo)" DestinationFiles="$(OutputPath)$(AssemblyName).txt" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Libraries/jQuery/jQuery.UI/jQueryUI.cs b/src/Libraries/jQuery/jQuery.UI/jQueryUI.cs
new file mode 100644
index 000000000..abfb0c656
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/jQueryUI.cs
@@ -0,0 +1,60 @@
+// jQueryUI.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI {
+
+    /// <summary>
+    /// Top-level jQueryUI methods.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("$")]
+    public static class jQueryUI {
+
+        /// <summary>
+        /// Exposes the widget with the specified name on the top-level jQuery API.
+        /// </summary>
+        /// <param name="name">The name of the widget.</param>
+        /// <param name="widget">The widget object.</param>
+        [ScriptName("widget.bridge")]
+        public static void Bridge(string name, object widget) {
+        }
+
+        /// <summary>
+        /// Create stateful jQuery plugins using the same abstraction that all jQuery UI widgets.
+        /// </summary>
+        /// <param name="name">The name of the widget.</param>
+        /// <param name="widget">The widget object.</param>
+        [ScriptName("widget")]
+        public static WidgetObject CreateWidget(string name, object widget) {
+            return null;
+        }
+
+        /// <summary>
+        /// Create stateful jQuery plugins using the same abstraction that all jQuery UI widgets.
+        /// </summary>
+        /// <param name="name">The name of the widget.</param>
+        /// <param name="baseWidgetType">The widget type to inherit from.</param>
+        /// <param name="widget">The widget object.</param>
+        [ScriptName("widget")]
+        public static WidgetObject CreateWidget(string name, WidgetType baseWidgetType, object widget) {
+            return null;
+        }
+
+        /// <summary>
+        /// Create stateful jQuery plugins using the same abstraction that all jQuery UI widgets.
+        /// </summary>
+        /// <param name="name">The name of the widget.</param>
+        /// <param name="baseWidgetType">The widget type to inherit from.</param>
+        /// <param name="widget">The widget object.</param>
+        [ScriptName("widget")]
+        public static WidgetObject CreateWidget(string name, object baseWidgetType, object widget) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/jQueryUIEventHandler.cs b/src/Libraries/jQuery/jQuery.UI/jQueryUIEventHandler.cs
new file mode 100644
index 000000000..b9bc3e100
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/jQueryUIEventHandler.cs
@@ -0,0 +1,20 @@
+// jQueryUIEventHandler.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI {
+
+    /// <summary>
+    /// Handles a widget event.
+    /// </summary>
+    /// <typeparam name="T">The type of the widget event object.</typeparam>
+    /// <param name="e">The associated jQuery event object.</param>
+    /// <param name="uiEvent">The widget event information.</param>
+    [Imported]
+    [IgnoreNamespace]
+    public delegate void jQueryUIEventHandler<T>(jQueryEvent e, T uiEvent);
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/jQueryUIMethod.cs b/src/Libraries/jQuery/jQuery.UI/jQueryUIMethod.cs
new file mode 100644
index 000000000..b8448f7b3
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/jQueryUIMethod.cs
@@ -0,0 +1,33 @@
+// jQueryUIMethod.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI {
+
+    /// <summary>
+    /// Operations supported by jQueryUI.
+    /// </summary>
+    [Imported]
+    [IgnoreNamespace]
+    [NamedValues]
+    public enum jQueryUIMethod {
+
+        DisableSelection,
+
+        EnableSelection,
+
+        Focus,
+
+        RemoveUniqueId,
+
+        ScrollParent,
+
+        UniqueId,
+
+        ZIndex
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.UI/jQueryUIObject.cs b/src/Libraries/jQuery/jQuery.UI/jQueryUIObject.cs
new file mode 100644
index 000000000..a28c6d413
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.UI/jQueryUIObject.cs
@@ -0,0 +1,55 @@
+// jQueryUIObject.cs
+// Script#/Libraries/jQuery/UI
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.UI {
+
+    [Imported]
+    [IgnoreNamespace]
+    public abstract class jQueryUIObject : jQueryObject {
+
+        protected jQueryUIObject() {
+        }
+
+        [ScriptName("ui")]
+        public jQueryUIObject jQueryUI() {
+            return null;
+        }
+
+        [ScriptName("ui")]
+        public object jQueryUI(jQueryUIMethod method, params object[] options) {
+            return null;
+        }
+
+        public jQueryObject DisableSelection() {
+                return null;
+        }
+
+        public jQueryObject EnableSelection() {
+                return null;
+        }
+
+        public jQueryObject Focus(int delay) {
+                return null;
+        }
+
+        public jQueryObject RemoveUniqueId() {
+                return null;
+        }
+
+        public object ScrollParent() {
+                return null;
+        }
+
+        public jQueryObject UniqueId() {
+                return null;
+        }
+
+        public void ZIndex(int zIndex) {
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.Validation/Properties/AssemblyInfo.cs b/src/Libraries/jQuery/jQuery.Validation/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..08aff32e5
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Validation/Properties/AssemblyInfo.cs
@@ -0,0 +1,12 @@
+// AssemblyInfo.cs
+// Script#/Libraries/jQuery/Validation
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("Script.jQuery.Validation")]
+[assembly: AssemblyDescription("Script# jQuery Validation Plugin")]
+[assembly: ScriptAssembly("jQueryValidation")]
diff --git a/src/Libraries/jQuery/jQuery.Validation/Properties/ScriptInfo.txt b/src/Libraries/jQuery/jQuery.Validation/Properties/ScriptInfo.txt
new file mode 100644
index 000000000..8c73f125c
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Validation/Properties/ScriptInfo.txt
@@ -0,0 +1,15 @@
+jQuery Validation Plugin
+===============================================================================
+
+This assembly provides access to jQuery Validation plugin APIs. This is only meant for
+use at development time, so you can reference and compile your c# code against
+the plugin APIs. You must include the appropriate plugin scripts in your page for
+runtime functionality.
+
+More information is on http://docs.jquery.com/Plugins/Validation and
+https://github.com/jzaefferer/jquery-validation
+
+-------------------------------------------------------------------------------
+
+Associated scripts can be found at
+http://jzaefferer.github.com/jquery-validation/jquery.validate.js
diff --git a/src/Libraries/jQuery/jQuery.Validation/jQuery.Validation.csproj b/src/Libraries/jQuery/jQuery.Validation/jQuery.Validation.csproj
new file mode 100644
index 000000000..d2a0e9d25
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Validation/jQuery.Validation.csproj
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <NoStdLib>True</NoStdLib>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>jQueryApi.Validation</RootNamespace>
+    <AssemblyName>Script.jQuery.Validation</AssemblyName>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>none</DebugType>
+    <OutputPath>..\..\..\..\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <DocumentationFile>..\..\..\..\bin\Debug\Script.jQuery.Validation.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugSymbols>false</DebugSymbols>
+    <DebugType>none</DebugType>
+    <OutputPath>..\..\..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <DocumentationFile>..\..\..\..\bin\Release\Script.jQuery.Validation.xml</DocumentationFile>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="jQueryValidationHighlight.cs" />
+    <Compile Include="jQueryValidationMethod.cs" />
+    <Compile Include="jQueryValidationObject.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
+    </Compile>
+    <ScriptInfo Include="Properties\ScriptInfo.txt" />
+    <Compile Include="jQueryValidationRules.cs" />
+    <Compile Include="jQueryValidator.cs" />
+    <Compile Include="jQueryValidatorOptions.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\Core\CoreLib\CoreLib.csproj">
+      <Project>{36D4B098-A21C-4725-ACD3-400922885F38}</Project>
+      <Name>CoreLib</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\jQuery.Core\jQuery.Core.csproj">
+      <Project>{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}</Project>
+      <Name>jQuery.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Web\Web.csproj">
+      <Project>{3681A9A8-FC40-4125-B842-7775713C8DCE}</Project>
+      <Name>Web</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(ScriptInfo)" DestinationFiles="$(OutputPath)$(AssemblyName).txt" />
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/src/Libraries/jQuery/jQuery.Validation/jQueryValidationHighlight.cs b/src/Libraries/jQuery/jQuery.Validation/jQueryValidationHighlight.cs
new file mode 100644
index 000000000..71a5d7fe0
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Validation/jQueryValidationHighlight.cs
@@ -0,0 +1,12 @@
+// jQueryValidationHighlight.cs
+// Script#/Libraries/jQuery/Validation
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Html;
+
+namespace jQueryApi.Validation {
+
+    public delegate bool jQueryValidationHighlight(Element element, string errorClass, string validClass);
+}
diff --git a/src/Libraries/jQuery/jQuery.Validation/jQueryValidationMethod.cs b/src/Libraries/jQuery/jQuery.Validation/jQueryValidationMethod.cs
new file mode 100644
index 000000000..32250e5cf
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Validation/jQueryValidationMethod.cs
@@ -0,0 +1,12 @@
+// jQueryValidationMethod.cs
+// Script#/Libraries/jQuery/Validation
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Html;
+
+namespace jQueryApi.Validation {
+
+    public delegate bool jQueryValidationMethod(string value, Element element, object[] parameters);
+}
diff --git a/src/Libraries/jQuery/jQuery.Validation/jQueryValidationObject.cs b/src/Libraries/jQuery/jQuery.Validation/jQueryValidationObject.cs
new file mode 100644
index 000000000..f366e65dd
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Validation/jQueryValidationObject.cs
@@ -0,0 +1,73 @@
+// jQueryValidation.cs
+// Script#/Libraries/jQuery/Validation
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.Validation {
+
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class jQueryValidationObject : jQueryObject {
+
+        private jQueryValidationObject() {
+        }
+
+        /// <summary>
+        /// Returns the validation rules for the first selected argument.
+        /// </summary>
+        /// <returns>The rules which have been assigned to the specified element.</returns>
+        [ScriptName("rules")]
+        public jQueryValidationRules GetRules() {
+            return null;
+        }
+
+        /// <summary>
+        /// Removes the specified attributes from the first matched element
+        /// </summary>
+        /// <param name="attributes">The attribute names to remove</param>
+        /// <returns>The attributes which have been removed</returns>
+        [ScriptName("removeAttrs")]
+        public string RemoveAttributes(string attributes) {
+            return null;
+        }
+
+        /// <summary>
+        /// Adds or removes the specified rules to the first matched element. Requires that the parent form has 
+        /// been validated prior to the call.
+        /// </summary>
+        /// <param name="action">The action to perform. Should be 'add' or 'remove'</param>
+        /// <param name="rules">The rules to add or remove to the specified element.</param>
+        /// <returns>The current state of the rules collection for the first matched element.</returns>
+        public jQueryValidationRules Rules(string action, jQueryValidationRules rules) {
+            return null;
+        }
+
+        /// <summary>
+        /// Checks whether the selected form is valid or whether all selected elements are valid.
+        /// </summary>
+        /// <returns>True if the form is valid, otherwise false.</returns>
+        public bool Valid() {
+            return false;
+        }
+
+        /// <summary>
+        /// Validates the selected form.
+        /// </summary>
+        /// <returns>An instance of the validation controller for the specified form.</returns>
+        public jQueryValidator Validate() {
+            return null;
+        }
+
+        /// <summary>
+        /// Validates the selected form.
+        /// </summary>
+        /// <param name="options">The validation options</param>
+        /// <returns>An instance of the validation controller for the specified form.</returns>
+        public jQueryValidator Validate(jQueryValidatorOptions options) {
+            return null;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.Validation/jQueryValidationRules.cs b/src/Libraries/jQuery/jQuery.Validation/jQueryValidationRules.cs
new file mode 100644
index 000000000..9dea2db84
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Validation/jQueryValidationRules.cs
@@ -0,0 +1,261 @@
+// jQueryValidationRules.cs
+// Script#/Libraries/jQuery/Validation
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.Validation {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class jQueryValidationRules {
+
+        private jQueryValidationRules() {
+        }
+
+        /// <summary>
+        /// Makes the element require a certain file extension
+        /// </summary>
+        [IntrinsicProperty]
+        public string Accept {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element require a creditcard number
+        /// </summary>
+        [IntrinsicProperty]
+        [ScriptName("creditcard")]
+        public bool CreditCard {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element require a date
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Date {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element require a ISO date
+        /// </summary>
+        [IntrinsicProperty]
+        [ScriptName("dateISO")]
+        public bool DateISO {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element require digits only
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Digits {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element require a valid email address
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Email {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Requires the element to be the same as another one
+        /// </summary>
+        [IntrinsicProperty]
+        public string EqualTo {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element require a given maximum
+        /// </summary>
+        [IntrinsicProperty]
+        public int Max {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element require a given maximum length
+        /// </summary>
+        [IntrinsicProperty]
+        public int MaxLength {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element require given minimum
+        /// </summary>
+        [IntrinsicProperty]
+        public int Min {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element require a given minimum length
+        /// </summary>
+        [IntrinsicProperty]
+        public int MinLength {
+            get {
+                return 0;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element require a decimal number
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Number {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("phoneUS")]
+        public bool PhoneUS {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the value require a given value range
+        /// </summary>
+        [IntrinsicProperty]
+        public int[] Range {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element require a given value range
+        /// </summary>
+        [IntrinsicProperty]
+        public int[] RangeLength {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Requests a resource to check the element for validity
+        /// </summary>
+        [IntrinsicProperty]
+        public object Remote {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element required, depending on the result of the given callback
+        /// </summary>
+        [IntrinsicProperty]
+        [ScriptName("required")]
+        public Func<bool> RequiredCallback {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element required, depending on the result of the given expression
+        /// </summary>
+        [IntrinsicProperty]
+        [ScriptName("required")]
+        public string RequiredExpression {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element always required
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Required {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        /// <summary>
+        /// Makes the element require a valid url
+        /// </summary>
+        [IntrinsicProperty]
+        public bool Url {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.Validation/jQueryValidator.cs b/src/Libraries/jQuery/jQuery.Validation/jQueryValidator.cs
new file mode 100644
index 000000000..bf14d0cb5
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Validation/jQueryValidator.cs
@@ -0,0 +1,125 @@
+// jQueryValidator.cs
+// Script#/Libraries/jQuery/Validation
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.Validation {
+
+    [Imported]
+    [IgnoreNamespace]
+    public sealed class jQueryValidator {
+
+        private jQueryValidator() {
+        }
+
+        /// <summary>
+        /// Add compound class methods
+        /// </summary>
+        /// <param name="rules">A map of class name - rules pairs.</param>
+        [ScriptAlias("$.validator.addClassRules")]
+        public static void AddClassRules(Dictionary rules) {
+        }
+
+        /// <summary>
+        /// Adds a compound class method
+        /// </summary>
+        /// <param name="name">The name of the class rule to add</param>
+        /// <param name="rules">The compound rules</param>
+        [ScriptAlias("$.validator.addClassRules")]
+        public static void AddClassRules(string name, Dictionary rules) {
+        }
+
+        /// <summary>
+        /// Adds a custom validation method.
+        /// </summary>
+        /// <param name="name">The name of the method. Must be a valid Javascript identifier</param>
+        /// <param name="callback">The method callback to invoke during validation</param>
+        [ScriptAlias("$.validator.addMethod")]
+        public static void AddMethod(string name, jQueryValidationMethod callback) {
+        }
+
+        /// <summary>
+        /// Adds a custom validation method.
+        /// </summary>
+        /// <param name="name">The name of the method. Must be a valid Javascript identifier</param>
+        /// <param name="callback">The method callback to invoke during validation</param>
+        /// <param name="message">The default message to display for this method.</param>
+        [ScriptAlias("$.validator.addMethod")]
+        public static void AddMethod(string name, jQueryValidationMethod callback, string message) {
+        }
+
+        /// <summary>
+        /// Formats a string, replacing {n} placeholders with arguments.
+        /// </summary>
+        /// <param name="template">The template string</param>
+        /// <param name="args">The arguments</param>
+        /// <returns>A formatted string where each placeholder has been replaced by its argument.</returns>
+        [ScriptAlias("$.validator.format")]
+        public static string Format(string template, params object[] args) {
+            return null;
+        }
+
+        /// <summary>
+        /// Gets the number of invalid fields on the controlled form.
+        /// </summary>
+        /// <returns>The number of invalid fields</returns>
+        [ScriptName("numberOfInvalids")]
+        public int GetInvalidFieldCount() {
+            return 0;
+        }
+        /// <summary>
+        /// Checks if the current element is optional.
+        /// </summary>
+        /// <param name="element">The element to validate</param>
+        /// <returns>True if the element is optional, otherwise returns false.</returns>
+        public static bool Optional(Element element) {
+            return false;
+        }
+
+        /// <summary>
+        /// Resets the controlled form
+        /// </summary>
+        public void ResetForm() {
+        }
+
+        /// <summary>
+        /// Sets the default settings for validation
+        /// </summary>
+        /// <param name="options">The validation options to by used by default during validation</param>
+        [ScriptAlias("$.validator.setDefaults")]
+        public static void SetDefaults(jQueryValidatorOptions options) {
+        }
+
+        /// <summary>
+        /// Shows the specified errors messages.
+        /// </summary>
+        /// <param name="errors">Key/value pairs of error messages, where the keys relate to names of elements in the form, and
+        /// the values are the error messages to display for those elements.</param>
+        public void ShowErrors(Dictionary errors) {
+        }
+
+        /// <summary>
+        /// Validates the specified element
+        /// </summary>
+        /// <param name="element">The element to validate</param>
+        /// <returns>True if the form is valid, otherwise returns false.</returns>
+        [ScriptName("element")]
+        public bool ValidateElement(Element element) {
+            return false;
+        }
+
+        /// <summary>
+        /// Validates the controlled form
+        /// </summary>
+        /// <returns>True if the form is valid, otherwise returns false.</returns>
+        [ScriptName("form")]
+        public bool ValidateForm() {
+            return false;
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.Validation/jQueryValidatorOptions.cs b/src/Libraries/jQuery/jQuery.Validation/jQueryValidatorOptions.cs
new file mode 100644
index 000000000..6707d02bb
--- /dev/null
+++ b/src/Libraries/jQuery/jQuery.Validation/jQueryValidatorOptions.cs
@@ -0,0 +1,229 @@
+// jQueryValidatorOptions.cs
+// Script#/Libraries/jQuery/Validation
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+namespace jQueryApi.Validation {
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public sealed class jQueryValidatorOptions {
+
+        [IntrinsicProperty]
+        public bool Debug {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string ErrorClass {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string ErrorContainer {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string ErrorElement {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string ErrorLabelContainer {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public bool FocusCleanup {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public bool FocusInvalid {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public Dictionary Groups {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryValidationHighlight Highlight {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("ignore")]
+        public string IgnoreSelector {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string IgnoreTitle {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public Action<jQueryEvent, jQueryValidator> InvalidHandler {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public Dictionary Messages {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Meta {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public Dictionary Rules {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public Action<jQueryObject> SubmitHandler {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public jQueryValidationHighlight Unhighlight {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("onclick")]
+        public bool ValidateOnClick {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("onfocusout")]
+        public bool ValidateOnFocusOut {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("onkeyup")]
+        public bool ValidateOnKeyUp {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        [ScriptName("onsubmit")]
+        public bool ValidateOnSubmit {
+            get {
+                return false;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string ValidClass {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+
+        [IntrinsicProperty]
+        public string Wrapper {
+            get {
+                return null;
+            }
+            set {
+            }
+        }
+    }
+}
diff --git a/src/Libraries/jQuery/jQuery.txt b/src/Libraries/jQuery/jQuery.txt
deleted file mode 100644
index 60b6f109f..000000000
--- a/src/Libraries/jQuery/jQuery.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-Script# jQuery Assemblies
-===============================================================================
-
-The script# jQuery assemblies contain API definitions for various jQuery
-libraries and allow you to code against them using script#. At runtime, you
-must include the appropriate scripts into your page.
-
-Script.jQuery.dll
--------------------------------------------------------------------------------
-This matches the API in jQuery Core 1.5.1. The corresponding scripts are at:
-Google CDNs:
-http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js
-http://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js
-https://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js
-https://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.js
-Download Locations:
-http://code.jquery.com/jquery-1.5.1.min.js
-http://code.jquery.com/jquery-1.5.1.js
-More information is on http://jquery.com.
-
-Script.jQuery.History.dll
--------------------------------------------------------------------------------
-This corresponds to the jQuery bbq script (back button and query) by Ben
-Alman, and provides support for managing the back button in Ajax applications.
-The assembly corresponds to version 1.2.1 and more information as well as
-associated scripts can be found at
-http://benalman.com/projects/jquery-bbq-plugin/
-
-Script.jQuery.Templating.dll
--------------------------------------------------------------------------------
-This corresponds to the jQuery templating plugin. More information along with
-scripts can be found at:
-http://api.jquery.com/category/plugins/templates/
diff --git a/src/Common/CommonAssemblyInfo.cs b/src/ScriptSharp.cs
similarity index 50%
rename from src/Common/CommonAssemblyInfo.cs
rename to src/ScriptSharp.cs
index 9f3da3414..12a97f09c 100644
--- a/src/Common/CommonAssemblyInfo.cs
+++ b/src/ScriptSharp.cs
@@ -1,9 +1,6 @@
-// AssemblyInfo.cs
+// ScriptSharp.cs
 // Script#/Common
-// Copyright (c) Nikhil Kothari.
-// Copyright (c) Microsoft Corporation.
-// This source code is subject to terms and conditions of the Microsoft 
-// Public License. A copy of the license can be found in License.txt.
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
 //
 
 using System;
@@ -12,9 +9,9 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("http://www.scriptsharp.com")]
 [assembly: AssemblyProduct("Script#")]
-[assembly: AssemblyCopyright("Copyright © 2010")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("0.7.0.0")]
-[assembly: AssemblyFileVersion("0.7.0.0")]
+[assembly: AssemblyFileVersion("0.7.6.0")]
 [assembly: CLSCompliant(true)]
diff --git a/src/ScriptSharp.sln b/src/ScriptSharp.sln
index 3b6bfb762..93cf128d8 100644
--- a/src/ScriptSharp.sln
+++ b/src/ScriptSharp.sln
@@ -1,12 +1,10 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jQuery.Core", "Libraries\jQuery\jQuery.Core\jQuery.Core.csproj", "{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "Libraries\Web\Web.csproj", "{3681A9A8-FC40-4125-B842-7775713C8DCE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Windows", "Libraries\Windows\Windows.csproj", "{A102330A-3018-4968-AF4C-6175DC48EAAB}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{5D0FD0F6-498E-4126-A297-97B7763DD0AB}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jQuery.History", "Libraries\jQuery\jQuery.History\jQuery.History.csproj", "{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}"
@@ -15,86 +13,274 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jQuery.Templating", "Librar
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BingMaps", "Libraries\Microsoft\BingMaps\BingMaps.csproj", "{9600C55B-E14E-45EA-92C6-F453B19F5D7F}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Knockout", "Libraries\Knockout\Knockout.csproj", "{DCA0235F-88C1-43A0-A8DB-FF765D344E06}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreLib", "Core\CoreLib\CoreLib.csproj", "{36D4B098-A21C-4725-ACD3-400922885F38}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{37239BB8-2FA4-4831-A7EA-AF89D74EA10E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Testing", "Tools\Testing\Testing.csproj", "{31456150-1093-407F-9231-58D0F663945D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FxCop", "Tools\FxCop\FxCop.csproj", "{B87E403B-354D-47A1-9876-14C618A80A41}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "App", "Core\App\App.csproj", "{1772A38C-7204-42DC-B81D-6C74D17A4F66}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Build", "Core\Build\Build.csproj", "{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZipX", "ZipX\ZipX.csproj", "{4123C976-739E-42A2-87FB-E04D163BC99C}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66} = {1772A38C-7204-42DC-B81D-6C74D17A4F66}
+		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43} = {2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}
+		{31456150-1093-407F-9231-58D0F663945D} = {31456150-1093-407F-9231-58D0F663945D}
+		{3681A9A8-FC40-4125-B842-7775713C8DCE} = {3681A9A8-FC40-4125-B842-7775713C8DCE}
+		{36D4B098-A21C-4725-ACD3-400922885F38} = {36D4B098-A21C-4725-ACD3-400922885F38}
+		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4} = {4A9F7CE0-5A45-4B28-AD01-05528709B6E4}
+		{824C1FEC-2455-4183-AFC6-891EDB88213A} = {824C1FEC-2455-4183-AFC6-891EDB88213A}
+		{8780581F-7C26-4B64-9235-BA1C458DF36E} = {8780581F-7C26-4B64-9235-BA1C458DF36E}
+		{9600C55B-E14E-45EA-92C6-F453B19F5D7F} = {9600C55B-E14E-45EA-92C6-F453B19F5D7F}
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A} = {967A6FD7-E14B-4DB0-81D9-86E0DC12291A}
+		{B87E403B-354D-47A1-9876-14C618A80A41} = {B87E403B-354D-47A1-9876-14C618A80A41}
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A} = {BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4} = {BE1E0A21-F6C0-4698-B405-66FC2BB289F4}
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06} = {DCA0235F-88C1-43A0-A8DB-FF765D344E06}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jQuery.Validation", "Libraries\jQuery\jQuery.Validation\jQuery.Validation.csproj", "{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{D1DF352A-45B6-4130-9A8B-A24C20257B7D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoreScript", "Core\CoreScript\CoreScript.csproj", "{8780581F-7C26-4B64-9235-BA1C458DF36E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "jQuery.UI", "Libraries\jQuery\jQuery.UI\jQuery.UI.csproj", "{824C1FEC-2455-4183-AFC6-891EDB88213A}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Other", "Other", "{BB2DB888-0F52-4CB5-9625-9D99A33DCE4F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Compiler", "Core\Compiler\Compiler.csproj", "{9F14036F-673F-418E-B817-7E2289D7F3F6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
 		Debug|Any CPU = Debug|Any CPU
 		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
 		Release|.NET = Release|.NET
 		Release|Any CPU = Release|Any CPU
 		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Release|.NET.ActiveCfg = Release|Any CPU
-		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Release|.NET.ActiveCfg = Release|Any CPU
-		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A102330A-3018-4968-AF4C-6175DC48EAAB}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{A102330A-3018-4968-AF4C-6175DC48EAAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A102330A-3018-4968-AF4C-6175DC48EAAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A102330A-3018-4968-AF4C-6175DC48EAAB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A102330A-3018-4968-AF4C-6175DC48EAAB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A102330A-3018-4968-AF4C-6175DC48EAAB}.Release|.NET.ActiveCfg = Release|Any CPU
-		{A102330A-3018-4968-AF4C-6175DC48EAAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A102330A-3018-4968-AF4C-6175DC48EAAB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A102330A-3018-4968-AF4C-6175DC48EAAB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A102330A-3018-4968-AF4C-6175DC48EAAB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66}.Release|.NET.ActiveCfg = Release|Any CPU
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66}.Release|x86.ActiveCfg = Release|Any CPU
 		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}.Release|.NET.ActiveCfg = Release|Any CPU
 		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}.Release|Any CPU.Build.0 = Release|Any CPU
 		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43}.Release|x86.ActiveCfg = Release|Any CPU
+		{31456150-1093-407F-9231-58D0F663945D}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{31456150-1093-407F-9231-58D0F663945D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{31456150-1093-407F-9231-58D0F663945D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{31456150-1093-407F-9231-58D0F663945D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{31456150-1093-407F-9231-58D0F663945D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{31456150-1093-407F-9231-58D0F663945D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{31456150-1093-407F-9231-58D0F663945D}.Release|.NET.ActiveCfg = Release|Any CPU
+		{31456150-1093-407F-9231-58D0F663945D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{31456150-1093-407F-9231-58D0F663945D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{31456150-1093-407F-9231-58D0F663945D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{31456150-1093-407F-9231-58D0F663945D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{31456150-1093-407F-9231-58D0F663945D}.Release|x86.ActiveCfg = Release|Any CPU
+		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Release|.NET.ActiveCfg = Release|Any CPU
+		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3681A9A8-FC40-4125-B842-7775713C8DCE}.Release|x86.ActiveCfg = Release|Any CPU
+		{36D4B098-A21C-4725-ACD3-400922885F38}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{36D4B098-A21C-4725-ACD3-400922885F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36D4B098-A21C-4725-ACD3-400922885F38}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36D4B098-A21C-4725-ACD3-400922885F38}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{36D4B098-A21C-4725-ACD3-400922885F38}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{36D4B098-A21C-4725-ACD3-400922885F38}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{36D4B098-A21C-4725-ACD3-400922885F38}.Release|.NET.ActiveCfg = Release|Any CPU
+		{36D4B098-A21C-4725-ACD3-400922885F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36D4B098-A21C-4725-ACD3-400922885F38}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36D4B098-A21C-4725-ACD3-400922885F38}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{36D4B098-A21C-4725-ACD3-400922885F38}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{36D4B098-A21C-4725-ACD3-400922885F38}.Release|x86.ActiveCfg = Release|Any CPU
+		{4123C976-739E-42A2-87FB-E04D163BC99C}.Debug|.NET.ActiveCfg = Debug|x86
+		{4123C976-739E-42A2-87FB-E04D163BC99C}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{4123C976-739E-42A2-87FB-E04D163BC99C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{4123C976-739E-42A2-87FB-E04D163BC99C}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{4123C976-739E-42A2-87FB-E04D163BC99C}.Debug|x86.ActiveCfg = Debug|x86
+		{4123C976-739E-42A2-87FB-E04D163BC99C}.Debug|x86.Build.0 = Debug|x86
+		{4123C976-739E-42A2-87FB-E04D163BC99C}.Release|.NET.ActiveCfg = Debug|x86
+		{4123C976-739E-42A2-87FB-E04D163BC99C}.Release|Any CPU.ActiveCfg = Debug|x86
+		{4123C976-739E-42A2-87FB-E04D163BC99C}.Release|Mixed Platforms.ActiveCfg = Debug|x86
+		{4123C976-739E-42A2-87FB-E04D163BC99C}.Release|Mixed Platforms.Build.0 = Debug|x86
+		{4123C976-739E-42A2-87FB-E04D163BC99C}.Release|x86.ActiveCfg = Debug|x86
+		{4123C976-739E-42A2-87FB-E04D163BC99C}.Release|x86.Build.0 = Debug|x86
+		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Release|.NET.ActiveCfg = Release|Any CPU
+		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4}.Release|x86.ActiveCfg = Release|Any CPU
+		{824C1FEC-2455-4183-AFC6-891EDB88213A}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{824C1FEC-2455-4183-AFC6-891EDB88213A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{824C1FEC-2455-4183-AFC6-891EDB88213A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{824C1FEC-2455-4183-AFC6-891EDB88213A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{824C1FEC-2455-4183-AFC6-891EDB88213A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{824C1FEC-2455-4183-AFC6-891EDB88213A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{824C1FEC-2455-4183-AFC6-891EDB88213A}.Release|.NET.ActiveCfg = Release|Any CPU
+		{824C1FEC-2455-4183-AFC6-891EDB88213A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{824C1FEC-2455-4183-AFC6-891EDB88213A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{824C1FEC-2455-4183-AFC6-891EDB88213A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{824C1FEC-2455-4183-AFC6-891EDB88213A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{824C1FEC-2455-4183-AFC6-891EDB88213A}.Release|x86.ActiveCfg = Release|Any CPU
+		{8780581F-7C26-4B64-9235-BA1C458DF36E}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{8780581F-7C26-4B64-9235-BA1C458DF36E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8780581F-7C26-4B64-9235-BA1C458DF36E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8780581F-7C26-4B64-9235-BA1C458DF36E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{8780581F-7C26-4B64-9235-BA1C458DF36E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{8780581F-7C26-4B64-9235-BA1C458DF36E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8780581F-7C26-4B64-9235-BA1C458DF36E}.Release|.NET.ActiveCfg = Release|Any CPU
+		{8780581F-7C26-4B64-9235-BA1C458DF36E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8780581F-7C26-4B64-9235-BA1C458DF36E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8780581F-7C26-4B64-9235-BA1C458DF36E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{8780581F-7C26-4B64-9235-BA1C458DF36E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{8780581F-7C26-4B64-9235-BA1C458DF36E}.Release|x86.ActiveCfg = Release|Any CPU
 		{9600C55B-E14E-45EA-92C6-F453B19F5D7F}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{9600C55B-E14E-45EA-92C6-F453B19F5D7F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9600C55B-E14E-45EA-92C6-F453B19F5D7F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9600C55B-E14E-45EA-92C6-F453B19F5D7F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{9600C55B-E14E-45EA-92C6-F453B19F5D7F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9600C55B-E14E-45EA-92C6-F453B19F5D7F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{9600C55B-E14E-45EA-92C6-F453B19F5D7F}.Release|.NET.ActiveCfg = Release|Any CPU
 		{9600C55B-E14E-45EA-92C6-F453B19F5D7F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9600C55B-E14E-45EA-92C6-F453B19F5D7F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9600C55B-E14E-45EA-92C6-F453B19F5D7F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{9600C55B-E14E-45EA-92C6-F453B19F5D7F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9600C55B-E14E-45EA-92C6-F453B19F5D7F}.Release|x86.ActiveCfg = Release|Any CPU
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}.Release|.NET.ActiveCfg = Release|Any CPU
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A}.Release|x86.ActiveCfg = Release|Any CPU
+		{9F14036F-673F-418E-B817-7E2289D7F3F6}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{9F14036F-673F-418E-B817-7E2289D7F3F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9F14036F-673F-418E-B817-7E2289D7F3F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9F14036F-673F-418E-B817-7E2289D7F3F6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9F14036F-673F-418E-B817-7E2289D7F3F6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9F14036F-673F-418E-B817-7E2289D7F3F6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9F14036F-673F-418E-B817-7E2289D7F3F6}.Release|.NET.ActiveCfg = Release|Any CPU
+		{9F14036F-673F-418E-B817-7E2289D7F3F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9F14036F-673F-418E-B817-7E2289D7F3F6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9F14036F-673F-418E-B817-7E2289D7F3F6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9F14036F-673F-418E-B817-7E2289D7F3F6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9F14036F-673F-418E-B817-7E2289D7F3F6}.Release|x86.ActiveCfg = Release|Any CPU
+		{B87E403B-354D-47A1-9876-14C618A80A41}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{B87E403B-354D-47A1-9876-14C618A80A41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B87E403B-354D-47A1-9876-14C618A80A41}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B87E403B-354D-47A1-9876-14C618A80A41}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B87E403B-354D-47A1-9876-14C618A80A41}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B87E403B-354D-47A1-9876-14C618A80A41}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B87E403B-354D-47A1-9876-14C618A80A41}.Release|.NET.ActiveCfg = Release|Any CPU
+		{B87E403B-354D-47A1-9876-14C618A80A41}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B87E403B-354D-47A1-9876-14C618A80A41}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B87E403B-354D-47A1-9876-14C618A80A41}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B87E403B-354D-47A1-9876-14C618A80A41}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B87E403B-354D-47A1-9876-14C618A80A41}.Release|x86.ActiveCfg = Release|Any CPU
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A}.Release|x86.ActiveCfg = Release|Any CPU
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4}.Release|x86.ActiveCfg = Release|Any CPU
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06}.Release|.NET.ActiveCfg = Release|Any CPU
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06}.Release|x86.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{1772A38C-7204-42DC-B81D-6C74D17A4F66} = {D1DF352A-45B6-4130-9A8B-A24C20257B7D}
+		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
+		{31456150-1093-407F-9231-58D0F663945D} = {37239BB8-2FA4-4831-A7EA-AF89D74EA10E}
 		{3681A9A8-FC40-4125-B842-7775713C8DCE} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
-		{A102330A-3018-4968-AF4C-6175DC48EAAB} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
+		{36D4B098-A21C-4725-ACD3-400922885F38} = {D1DF352A-45B6-4130-9A8B-A24C20257B7D}
+		{4123C976-739E-42A2-87FB-E04D163BC99C} = {BB2DB888-0F52-4CB5-9625-9D99A33DCE4F}
 		{4A9F7CE0-5A45-4B28-AD01-05528709B6E4} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
-		{2E5D9DFC-97BD-4652-B09A-B88E6ECDEF43} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
-		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
+		{824C1FEC-2455-4183-AFC6-891EDB88213A} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
+		{8780581F-7C26-4B64-9235-BA1C458DF36E} = {D1DF352A-45B6-4130-9A8B-A24C20257B7D}
 		{9600C55B-E14E-45EA-92C6-F453B19F5D7F} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
+		{967A6FD7-E14B-4DB0-81D9-86E0DC12291A} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
+		{9F14036F-673F-418E-B817-7E2289D7F3F6} = {D1DF352A-45B6-4130-9A8B-A24C20257B7D}
+		{B87E403B-354D-47A1-9876-14C618A80A41} = {37239BB8-2FA4-4831-A7EA-AF89D74EA10E}
+		{BA1CDDAF-7E54-4DC0-A4D3-AEF05B975A4A} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
+		{BE1E0A21-F6C0-4698-B405-66FC2BB289F4} = {D1DF352A-45B6-4130-9A8B-A24C20257B7D}
+		{DCA0235F-88C1-43A0-A8DB-FF765D344E06} = {5D0FD0F6-498E-4126-A297-97B7763DD0AB}
 	EndGlobalSection
 EndGlobal
diff --git a/src/ScriptSharp.snk b/src/ScriptSharp.snk
new file mode 100644
index 000000000..2e4527a12
Binary files /dev/null and b/src/ScriptSharp.snk differ
diff --git a/src/Tools/FxCop/FxCop.csproj b/src/Tools/FxCop/FxCop.csproj
new file mode 100644
index 000000000..8af709328
--- /dev/null
+++ b/src/Tools/FxCop/FxCop.csproj
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B87E403B-354D-47A1-9876-14C618A80A41}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ScriptSharp.FxCop</RootNamespace>
+    <AssemblyName>ScriptSharp.FxCop</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>false</DelaySign>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FxCopSdk">
+      <HintPath>$(CodeAnalysisPath)\FxCopSdk.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="Microsoft.Cci">
+      <HintPath>$(CodeAnalysisPath)\Microsoft.Cci.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ScriptUnusedFields.cs" />
+    <Compile Include="ScriptAvoidLiteralScript.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
+    </Compile>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ScriptAvoidEval.cs" />
+    <EmbeddedResource Include="RuleData.xml" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Tools/FxCop/Properties/AssemblyInfo.cs b/src/Tools/FxCop/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..3e522d075
--- /dev/null
+++ b/src/Tools/FxCop/Properties/AssemblyInfo.cs
@@ -0,0 +1,11 @@
+// AssemblyInfo.cs
+// Script#/Tools/FxCop
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("ScriptSharp.FxCop")]
+[assembly: AssemblyDescription("Script# FxCop Rules")]
diff --git a/src/Tools/FxCop/RuleData.xml b/src/Tools/FxCop/RuleData.xml
new file mode 100644
index 000000000..39cffe863
--- /dev/null
+++ b/src/Tools/FxCop/RuleData.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Rules FriendlyName="Script Rules">
+  <Rule TypeName="ScriptAvoidEval" Category="Script.General" CheckId="SS0001">
+    <Name>Avoid Script.Eval if possible.</Name>
+    <Description>Avoid Script.Eval (i.e. eval) for performance reasons when possible. If you need to output literal script using Script#, use Script.Literal instead. If you need to parse a JSON string, use Json.Parse instead.</Description>
+    <Owner></Owner>
+    <Email></Email>
+    <Url></Url>
+    <Resolution>Use Script.Literal or Json.Parse when possible.</Resolution>
+    <MessageLevel Certainty="75">Warning</MessageLevel>
+    <FixCategories>NonBreaking</FixCategories>
+  </Rule>
+  <Rule TypeName="ScriptAvoidLiteralScript" Category="Script.General" CheckId="SS0002">
+    <Name>Avoid Script.Literal if possible.</Name>
+    <Description>Avoid Script.Literal as it prevents type checking at compile time. Report any missing metadata APIs needed to avoid Script.Literal.</Description>
+    <Owner></Owner>
+    <Email></Email>
+    <Url></Url>
+    <Resolution>Add any strongly typed APIs if possible.</Resolution>
+    <MessageLevel Certainty="75">Warning</MessageLevel>
+    <FixCategories>NonBreaking</FixCategories>
+  </Rule>
+  <Rule TypeName="ScriptUnusedFields" Category="Script.General" CheckId="SS0003">
+    <Name>Do not declare visible instance fields on non-Record classes</Name>
+    <Description>Instance fields that are visible outside of the type that declares them, limit your ability to change the implementation details for those data items. Use properties instead. They do not compromise usability or performance and they do provide flexibility in that they conceal the implementation details of the underlying data.</Description>
+    <Owner></Owner>
+    <Email></Email>
+    <Url></Url>
+    <Resolution>Because field {0} is visible outside of its declaring type, change its accessibility to private and add a property, with the same accessibility as the field has currently, to provide access to it.</Resolution>
+    <MessageLevel Certainty="90">Error</MessageLevel>
+    <FixCategories>Breaking</FixCategories>
+  </Rule>
+</Rules>
diff --git a/src/Tools/FxCop/ScriptAvoidEval.cs b/src/Tools/FxCop/ScriptAvoidEval.cs
new file mode 100644
index 000000000..00a1a809a
--- /dev/null
+++ b/src/Tools/FxCop/ScriptAvoidEval.cs
@@ -0,0 +1,35 @@
+// ScriptAvoidEval.cs
+// Script#/Tools/FxCop
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using Microsoft.FxCop.Sdk;
+
+namespace ScriptSharp.FxCop {
+
+    public sealed class ScriptAvoidEval : BaseIntrospectionRule {
+
+        public ScriptAvoidEval() :
+            base(typeof(ScriptAvoidEval).Name,
+                 typeof(ScriptAvoidEval).Namespace + ".RuleData",
+                 typeof(ScriptAvoidEval).Assembly) {
+        }
+
+        public override ProblemCollection Check(Member member) {
+            Visit(member);
+            return Problems;
+        }
+
+        public override void VisitMethodCall(MethodCall call) {
+            Method method = ((MemberBinding)call.Callee).BoundMember as Method;
+
+            if ((method != null) &&
+                (method.DeclaringType.FullName == "System.Script") &&
+                (method.Name.Name == "Eval")) {
+                Problems.Add(new Problem(GetResolution(), call.SourceContext));
+            }
+        }
+    }
+}
diff --git a/src/Tools/FxCop/ScriptAvoidLiteralScript.cs b/src/Tools/FxCop/ScriptAvoidLiteralScript.cs
new file mode 100644
index 000000000..6d148b272
--- /dev/null
+++ b/src/Tools/FxCop/ScriptAvoidLiteralScript.cs
@@ -0,0 +1,35 @@
+// ScriptAvoidLiteralScript.cs
+// Script#/Tools/FxCop
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using Microsoft.FxCop.Sdk;
+
+namespace ScriptSharp.FxCop {
+
+    public sealed class ScriptAvoidLiteralScript : BaseIntrospectionRule {
+
+        public ScriptAvoidLiteralScript() :
+            base(typeof(ScriptAvoidLiteralScript).Name,
+                 typeof(ScriptAvoidLiteralScript).Namespace + ".RuleData",
+                 typeof(ScriptAvoidLiteralScript).Assembly) {
+        }
+
+        public override ProblemCollection Check(Member member) {
+            Visit(member);
+            return Problems;
+        }
+
+        public override void VisitMethodCall(MethodCall call) {
+            Method method = ((MemberBinding)call.Callee).BoundMember as Method;
+
+            if ((method != null) &&
+                (method.DeclaringType.FullName == "System.Script") &&
+                (method.Name.Name == "Literal")) {
+                Problems.Add(new Problem(GetResolution(), call.SourceContext));
+            }
+        }
+    }
+}
diff --git a/src/Tools/FxCop/ScriptUnusedFields.cs b/src/Tools/FxCop/ScriptUnusedFields.cs
new file mode 100644
index 000000000..6f2f522ea
--- /dev/null
+++ b/src/Tools/FxCop/ScriptUnusedFields.cs
@@ -0,0 +1,59 @@
+// ScriptInvalidSelector.cs
+// Script#/Tools/FxCop
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using Microsoft.FxCop.Sdk;
+
+namespace ScriptSharp.FxCop {
+
+    public sealed class ScriptUnusedFields : BaseIntrospectionRule {
+
+        private TypeNode _importedAttributeType;
+        private TypeNode _recordType;
+
+        public ScriptUnusedFields() :
+            base(typeof(ScriptUnusedFields).Name,
+                 typeof(ScriptUnusedFields).Namespace + ".RuleData",
+                 typeof(ScriptUnusedFields).Assembly) {
+        }
+
+        public override TargetVisibilities TargetVisibility {
+            get {
+                return (TargetVisibilities.Overridable | TargetVisibilities.ExternallyVisible);
+            }
+        }
+
+        public override void BeforeAnalysis() {
+            base.BeforeAnalysis();
+
+            _importedAttributeType =
+                FrameworkAssemblies.Mscorlib.GetType(Identifier.For("System.Runtime.CompilerServices"),
+                                                     Identifier.For("ImportedAttribute"));
+            _recordType =
+                FrameworkAssemblies.Mscorlib.GetType(Identifier.For("System"),
+                                                     Identifier.For("Record"));
+        }
+
+        public override ProblemCollection Check(Member member) {
+            if (!(member is Field) || member.IsStatic || member.IsPrivate) {
+                return null;
+            }
+
+            // If the declaring type has [Imported] applied, we have no choice but to allow the field to exist
+            if (RuleUtilities.HasCustomAttribute(member.DeclaringType, _importedAttributeType)) {
+                return null;
+            }
+
+            // If the type derives from Record, allow the field to exist
+            if (member.DeclaringType.BaseType == _recordType) {
+                return null;
+            }
+
+            Problems.Add(new Problem(base.GetResolution(new object[] { member })));
+            return Problems;
+        }
+    }
+}
diff --git a/src/Tools/Testing/Properties/AssemblyInfo.cs b/src/Tools/Testing/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..72577276a
--- /dev/null
+++ b/src/Tools/Testing/Properties/AssemblyInfo.cs
@@ -0,0 +1,11 @@
+// AssemblyInfo.cs
+// Script#/Tools/Testing
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("ScriptSharp.Testing")]
+[assembly: AssemblyDescription("Script# Testing Framework")]
diff --git a/src/Tools/Testing/Testing.csproj b/src/Tools/Testing/Testing.csproj
new file mode 100644
index 000000000..e8a35b4f2
--- /dev/null
+++ b/src/Tools/Testing/Testing.csproj
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{31456150-1093-407F-9231-58D0F663945D}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ScriptSharp.Testing</RootNamespace>
+    <AssemblyName>ScriptSharp.Testing</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>false</DelaySign>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\..\..\bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\bin\Debug\ScriptSharp.Testing.xml</DocumentationFile>
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\bin\Release\ScriptSharp.Testing.xml</DocumentationFile>
+    <NoWarn>1591</NoWarn>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Web" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="WebServer\WebTestHttpServer.cs" />
+    <Compile Include="WebServer\HttpServer.cs" />
+    <Compile Include="WebServer\WebTestLogEventArgs.cs" />
+    <Compile Include="WebTestPageBuilder.cs" />
+    <Compile Include="WebTest.cs" />
+    <Compile Include="WebTestResult.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\..\ScriptSharp.cs">
+      <Link>Properties\ScriptSharp.cs</Link>
+    </Compile>
+    <Compile Include="WebBrowser.cs" />
+    <Compile Include="WebServer\HttpMessage.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/Tools/Testing/WebBrowser.cs b/src/Tools/Testing/WebBrowser.cs
new file mode 100644
index 000000000..5bbcb5f77
--- /dev/null
+++ b/src/Tools/Testing/WebBrowser.cs
@@ -0,0 +1,107 @@
+// WebBrowser.cs
+// Script#/Tools/Testing
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.IO;
+using Microsoft.Win32;
+
+namespace ScriptSharp.Testing {
+
+    public sealed class WebBrowser {
+
+        public static readonly WebBrowser InternetExplorer = new WebBrowser("Internet Explorer", "iexplore.exe", "-noframemerging ");
+        public static readonly WebBrowser Chrome = new WebBrowser("Chrome", GetChromeExecutablePath(), "--new-window ");
+        public static readonly WebBrowser Firefox = new WebBrowser("Firefox", GetFirefoxExecutablePath(), "-new-window ");
+        public static readonly WebBrowser Safari = new WebBrowser("Safari", GetSafariExecutablePath(), String.Empty);
+
+        private string _name;
+        private string _executablePath;
+        private string _arguments;
+
+        private WebBrowser(string name, string executablePath, string arguments) {
+            _name = name;
+            _executablePath = executablePath;
+            _arguments = arguments;
+        }
+
+        internal string Arguments {
+            get {
+                return _arguments;
+            }
+        }
+
+        internal string ExecutablePath {
+            get {
+                return _executablePath;
+            }
+        }
+
+        public string Name {
+            get {
+                return _name;
+            }
+        }
+
+        private static string GetChromeExecutablePath() {
+            string path = null;
+
+            RegistryKey chromeKey = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Uninstall\Google Chrome\");
+            if (chromeKey != null) {
+                path = Path.Combine((string)chromeKey.GetValue("InstallLocation"), "chrome.exe");
+                if (!File.Exists(path)) {
+                    path = null;
+                }
+            }
+
+            return path;
+        }
+
+        private static string GetFirefoxExecutablePath() {
+            string path = null;
+
+            RegistryKey mozillaKey = Registry.LocalMachine.OpenSubKey(@"Software\Mozilla\Mozilla Firefox");
+            if (mozillaKey != null) {
+                string currentVersion = (string)mozillaKey.GetValue("CurrentVersion");
+                if (String.IsNullOrEmpty(currentVersion) == false) {
+                    RegistryKey currentMain = mozillaKey.OpenSubKey(String.Format(@"{0}\Main", currentVersion));
+                    if (currentMain != null) {
+                        path = (string)currentMain.GetValue("PathToExe");
+                        if (File.Exists(path) == false) {
+                            path = null;
+                        }
+                    }
+                }
+            }
+            else {
+                string tempPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), @"Mozilla FireFox\FireFox.exe");
+                if (File.Exists(tempPath)) {
+                    path = tempPath;
+                }
+                else {
+                    tempPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles) + " (x86)", @"Mozilla FireFox\FireFox.exe");
+                    if (File.Exists(tempPath) == false) {
+                        path = tempPath;
+                    }
+                }
+            }
+
+            return path;
+        }
+
+        private static string GetSafariExecutablePath() {
+            string path = null;
+
+            RegistryKey safariKey = Registry.LocalMachine.OpenSubKey(@"Software\Apple Computer, Inc.\Safari");
+            if (safariKey != null) {
+                path = (string)safariKey.GetValue("BrowserExe");
+                if (!File.Exists(path)) {
+                    path = null;
+                }
+            }
+
+            return path;
+        }
+    }
+}
diff --git a/src/Tools/Testing/WebServer/HttpMessage.cs b/src/Tools/Testing/WebServer/HttpMessage.cs
new file mode 100644
index 000000000..fd3726a1c
--- /dev/null
+++ b/src/Tools/Testing/WebServer/HttpMessage.cs
@@ -0,0 +1,258 @@
+// HttpMessage.cs
+// Script#/Tools/Testing
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+
+namespace ScriptSharp.Testing.WebServer {
+
+    internal sealed class HttpMessage {
+
+        private const int MaximumPostSize = 10 * 1024 * 1024; // 10MB
+        private const int BufferSize = 4096;
+
+        private HttpServer _server;
+        private TcpClient _client;
+
+        private Action<HttpMessage> _getHandler;
+        private Action<HttpMessage> _postHandler;
+
+        private string _method;
+        private string _path;
+        private Dictionary<string, string> _headers;
+
+        private Stream _requestStream;
+        private Stream _responseStream;
+
+        internal HttpMessage(HttpServer server, Action<HttpMessage> getHandler, Action<HttpMessage> postHandler) {
+            _server = server;
+            _getHandler = getHandler;
+            _postHandler = postHandler;
+        }
+
+        public string Method {
+            get {
+                return _method;
+            }
+        }
+
+        public string Path {
+            get {
+                return _path;
+            }
+        }
+
+        public Stream RequestStream {
+            get {
+                return _requestStream;
+            }
+        }
+
+        public Stream ResponseStream {
+            get {
+                return _responseStream;
+            }
+        }
+
+        private void ParseRequest(Stream inputStream) {
+            string request = ReadLine(inputStream);
+
+            string[] tokens = request.Split(' ');
+            if (tokens.Length != 3) {
+                throw new Exception("Invalid HTTP request");
+            }
+
+            _method = tokens[0].ToUpper();
+            _path = tokens[1];
+        }
+
+        private void ParseRequestHeaders(Stream inputStream) {
+            _headers = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
+
+            string line;
+            while ((line = ReadLine(inputStream)) != null) {
+                if (line.Equals("")) {
+                    // Finished reading headers
+                    return;
+                }
+
+                int separator = line.IndexOf(':');
+                if (separator == -1) {
+                    throw new Exception("Invalid HTTP header: " + line);
+                }
+
+                string name = line.Substring(0, separator);
+                int pos = separator + 1;
+                while ((pos < line.Length) && (line[pos] == ' ')) {
+                    // Strip any spaces
+                    pos++;
+                }
+
+                string value = line.Substring(pos, line.Length - pos);
+                if (String.IsNullOrEmpty(value)) {
+                    throw new Exception("Invalid HTTP header: " + line);
+                }
+
+                _headers[name] = value;
+            }
+        }
+
+        private void ParseRequestBody(Stream inputStream) {
+            MemoryStream ms = new MemoryStream();
+
+            int contentLength;
+            string contentLengthValue;
+            if (_headers.TryGetValue("Content-Length", out contentLengthValue) &&
+                Int32.TryParse(contentLengthValue, out contentLength)) {
+                if (contentLength > MaximumPostSize) {
+                    throw new Exception("Request is too large");
+                }
+
+                int bytesToRead = contentLength;
+
+                byte[] buffer = new byte[BufferSize];
+                while (bytesToRead > 0) {
+                    int bytesRead = inputStream.Read(buffer, 0, Math.Min(BufferSize, bytesToRead));
+                    if (bytesRead == 0) {
+                        if (bytesToRead == 0) {
+                            break;
+                        }
+                        else {
+                            throw new Exception("Client disconnected");
+                        }
+                    }
+
+                    bytesToRead -= bytesRead;
+                    ms.Write(buffer, 0, bytesRead);
+                }
+                ms.Seek(0, SeekOrigin.Begin);
+            }
+
+            _requestStream = ms;
+        }
+
+        public void ProcessClient(TcpClient client) {
+            _client = client;
+
+            Thread messageThread = new Thread(Run);
+            messageThread.Start();
+        }
+
+        private string ReadLine(Stream inputStream) {
+            int nextByte;
+
+            string data = "";
+            while (true) {
+                nextByte = inputStream.ReadByte();
+
+                if (nextByte == '\n') {
+                    break;
+                }
+                if (nextByte == '\r') {
+                    continue;
+                }
+                if (nextByte == -1) {
+                    Thread.Sleep(1);
+                    continue;
+                };
+
+                data += Convert.ToChar(nextByte);
+            }
+
+            return data;
+        }
+
+        private void Run() {
+            NetworkStream tcpStream = _client.GetStream();
+
+            BufferedStream tcpReadStream = new BufferedStream(tcpStream);
+            BufferedStream tcpSendStream = new BufferedStream(tcpStream);
+
+            _responseStream = tcpSendStream;
+
+            try {
+                ParseRequest(tcpReadStream);
+                ParseRequestHeaders(tcpReadStream);
+
+                bool processed = false;
+                if (_method.Equals("GET")) {
+                    if (_getHandler != null) {
+                        _getHandler(this);
+
+                        processed = true;
+                    }
+                }
+                else if (_method.Equals("POST")) {
+                    if (_postHandler != null) {
+                        ParseRequestBody(tcpReadStream);
+                        _postHandler(this);
+
+                        processed = true;
+                    }
+                }
+
+                if (processed == false) {
+                    WriteStatus(HttpStatusCode.MethodNotAllowed);
+                }
+            }
+            catch (Exception) {
+                WriteStatus(HttpStatusCode.InternalServerError);
+            }
+
+            _responseStream.Flush();
+
+            _client.Close();
+        }
+
+        public void WriteContent(string content, string contentType) {
+            StreamWriter writer = new StreamWriter(_responseStream);
+
+            writer.WriteLine("HTTP/1.0 200 OK");
+            writer.WriteLine("Content-Type: " + contentType);
+            writer.WriteLine("Connection: close");
+            writer.WriteLine("");
+            writer.Write(content);
+
+            writer.Flush();
+        }
+
+        public void WriteFile(string path, string contentType) {
+            StreamWriter writer = new StreamWriter(_responseStream);
+
+            writer.WriteLine("HTTP/1.0 200");
+            writer.WriteLine("Content-Type: " + contentType);
+            writer.WriteLine("Connection: close");
+            writer.WriteLine("");
+            writer.Flush();
+
+            using (Stream fileStream = File.OpenRead(path)) {
+                byte[] buffer = new byte[BufferSize];
+
+                int bytesRead = 0;
+                do {
+                    bytesRead = fileStream.Read(buffer, 0, BufferSize);
+                    if (bytesRead != 0) {
+                        _responseStream.Write(buffer, 0, bytesRead);
+                    }
+                }
+                while (bytesRead != 0);
+            }
+        }
+
+        public void WriteStatus(HttpStatusCode statusCode) {
+            StreamWriter writer = new StreamWriter(_responseStream);
+
+            writer.WriteLine("HTTP/1.0 " + (int)statusCode);
+            writer.WriteLine("Connection: close");
+            writer.WriteLine("");
+
+            writer.Flush();
+        }
+    }
+}
diff --git a/src/Tools/Testing/WebServer/HttpServer.cs b/src/Tools/Testing/WebServer/HttpServer.cs
new file mode 100644
index 000000000..b0f17ddbc
--- /dev/null
+++ b/src/Tools/Testing/WebServer/HttpServer.cs
@@ -0,0 +1,62 @@
+// HttpServer.cs
+// Script#/Tools/Testing
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+
+namespace ScriptSharp.Testing.WebServer {
+
+    internal abstract class HttpServer {
+
+        private int _port;
+        private Action<HttpMessage> _getHandler;
+        private Action<HttpMessage> _postHandler;
+
+        private bool _alive;
+
+        protected void Initialize(Action<HttpMessage> getHandler, Action<HttpMessage> postHandler) {
+            _getHandler = getHandler;
+            _postHandler = postHandler;
+        }
+
+        private void Run() {
+            TcpListener listener = new TcpListener(new IPEndPoint(IPAddress.Loopback, _port));
+            listener.Start();
+
+            while (_alive) {
+                try {
+                    TcpClient client = listener.AcceptTcpClient();
+
+                    HttpMessage message = new HttpMessage(this, _getHandler, _postHandler);
+                    message.ProcessClient(client);
+                }
+                catch {
+                }
+
+                Thread.Sleep(1);
+            }
+
+            listener.Stop();
+        }
+
+        public void Start(int port) {
+            if (_alive) {
+                throw new InvalidOperationException();
+            }
+
+            _alive = true;
+            _port = port;
+
+            Thread mainThread = new Thread(Run);
+            mainThread.Start();
+        }
+
+        public void Stop() {
+            _alive = false;
+        }
+    }
+}
diff --git a/src/Tools/Testing/WebServer/WebTestHttpServer.cs b/src/Tools/Testing/WebServer/WebTestHttpServer.cs
new file mode 100644
index 000000000..928e3505a
--- /dev/null
+++ b/src/Tools/Testing/WebServer/WebTestHttpServer.cs
@@ -0,0 +1,112 @@
+// WebTestHttpServer.cs
+// Script#/Tools/Testing
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+
+namespace ScriptSharp.Testing.WebServer {
+
+    internal sealed class WebTestHttpServer : HttpServer {
+
+        private Uri _baseUri;
+        private string _contentRoot;
+
+        private Dictionary<string, Tuple<string, string>> _registeredContent;
+
+        public WebTestHttpServer(string contentRoot) {
+            _contentRoot = contentRoot;
+            _baseUri = new Uri("http://localhost/", UriKind.Absolute);
+
+            Initialize(HandleGetRequest, HandlePostRequest);
+
+            _registeredContent =
+                new Dictionary<string, Tuple<string, string>>(StringComparer.OrdinalIgnoreCase);
+        }
+
+        public event EventHandler<WebTestLogEventArgs> Log;
+
+        private string GetContentType(string path) {
+            string extension = Path.GetExtension(path).ToLowerInvariant();
+
+            if ((String.CompareOrdinal(extension, ".htm") == 0) ||
+                (String.CompareOrdinal(extension, ".html") == 0)) {
+                return "text/html";
+            }
+            else if (String.CompareOrdinal(extension, ".js") == 0) {
+                return "text/javascript";
+            }
+            else if (String.CompareOrdinal(extension, ".css") == 0) {
+                return "text/css";
+            }
+            else if (String.CompareOrdinal(extension, ".png") == 0) {
+                return "image/png";
+            }
+
+            return "text/plain";
+        }
+
+        private string GetResolvedPath(string urlPath, out string cleanedUrlPath) {
+            Uri relativeUri = new Uri(urlPath, UriKind.Relative);
+            Uri resolvedUri = new Uri(_baseUri, relativeUri);
+
+            // Get the cleaned up path with the leading slash trimmed off
+            cleanedUrlPath = resolvedUri.LocalPath;
+            string path = resolvedUri.LocalPath.Substring(1);
+
+            return Path.Combine(_contentRoot, path);
+        }
+
+        private void HandleGetRequest(HttpMessage message) {
+            string urlPath;
+            string path = GetResolvedPath(message.Path, out urlPath);
+
+            Tuple<string, string> content;
+            if (_registeredContent.TryGetValue(urlPath, out content)) {
+                message.WriteContent(content.Item1, content.Item2);
+                return;
+            }
+
+            if (File.Exists(path)) {
+                message.WriteFile(path, GetContentType(path));
+            }
+            else {
+                message.WriteStatus(HttpStatusCode.NotFound);
+            }
+        }
+
+        private void HandlePostRequest(HttpMessage message) {
+            string path = message.Path;
+
+            bool? success = null;
+            if (String.CompareOrdinal(path, "/log/success") == 0) {
+                success = true;
+            }
+            else if (String.CompareOrdinal(path, "/log/failure") == 0) {
+                success = false;
+            }
+
+            if (success.HasValue) {
+                if (Log != null) {
+                    string log = new StreamReader(message.RequestStream).ReadToEnd();
+
+                    WebTestLogEventArgs logEvent = new WebTestLogEventArgs(success.Value, log);
+                    Log(this, logEvent);
+                }
+
+                message.WriteStatus(HttpStatusCode.NoContent);
+                return;
+            }
+
+            message.WriteStatus(HttpStatusCode.NotFound);
+        }
+
+        public void RegisterContent(string path, string data, string contentType) {
+            Tuple<string, string> content = new Tuple<string, string>(data, contentType);
+            _registeredContent[path] = content;
+        }
+    }
+}
diff --git a/src/Tools/Testing/WebServer/WebTestLogEventArgs.cs b/src/Tools/Testing/WebServer/WebTestLogEventArgs.cs
new file mode 100644
index 000000000..6cc48caf4
--- /dev/null
+++ b/src/Tools/Testing/WebServer/WebTestLogEventArgs.cs
@@ -0,0 +1,32 @@
+// WebTestLogEventArgs.cs
+// Script#/Tools/Testing
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Testing {
+
+    internal sealed class WebTestLogEventArgs : EventArgs {
+
+        private bool _succeeded;
+        private string _log;
+
+        internal WebTestLogEventArgs(bool succeeded, string log) {
+            _succeeded = succeeded;
+            _log = log;
+        }
+
+        public string Log {
+            get {
+                return _log;
+            }
+        }
+
+        public bool Succeeded {
+            get {
+                return _succeeded;
+            }
+        }
+    }
+}
diff --git a/src/Tools/Testing/WebTest.cs b/src/Tools/Testing/WebTest.cs
new file mode 100644
index 000000000..7a8835200
--- /dev/null
+++ b/src/Tools/Testing/WebTest.cs
@@ -0,0 +1,197 @@
+// WebTest.cs
+// Script#/Tools/Testing
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Text;
+using System.Threading;
+using ScriptSharp.Testing.WebServer;
+
+namespace ScriptSharp.Testing {
+
+    public sealed class WebTest {
+
+        private WebTestHttpServer _server;
+        private Uri _rootUri;
+
+        public Uri CreateContent(string virtualPath, string content, string contentType) {
+            if (_server == null) {
+                throw new InvalidOperationException("The server has not been started.");
+            }
+            if (String.IsNullOrEmpty(virtualPath)) {
+                throw new ArgumentNullException("virtualPath");
+            }
+            if (String.IsNullOrEmpty(content)) {
+                throw new ArgumentNullException("content");
+            }
+            if (String.IsNullOrEmpty(contentType)) {
+                throw new ArgumentNullException("contentType");
+            }
+
+            _server.RegisterContent(virtualPath, content, contentType);
+            return GetTestUri(virtualPath);
+        }
+
+        public Uri GetTestUri(string virtualPath, params string[] testModules) {
+            if (_server == null) {
+                throw new InvalidOperationException("The server has not been started.");
+            }
+            if (String.IsNullOrEmpty(virtualPath)) {
+                throw new ArgumentNullException("virtualPath");
+            }
+
+            string path = virtualPath;
+
+            if ((testModules != null) && (testModules.Length != 0)) {
+                StringBuilder uriBuilder = new StringBuilder(virtualPath);
+                uriBuilder.Append("?");
+
+                int moduleIndex = 0;
+                foreach (string m in testModules) {
+                    if (moduleIndex != 0) {
+                        uriBuilder.Append(",");
+                    }
+                    uriBuilder.Append(m);
+                    moduleIndex++;
+                }
+
+                path = uriBuilder.ToString();
+            }
+
+            return new Uri(_rootUri, path);
+        }
+
+        public WebTestResult RunTest(Uri testUri) {
+            return RunTest(testUri, WebBrowser.InternetExplorer, TimeSpan.FromMinutes(1));
+        }
+
+        public WebTestResult RunTest(Uri testUri, WebBrowser browser) {
+            return RunTest(testUri, browser, TimeSpan.FromMinutes(1));
+        }
+
+        public WebTestResult RunTest(Uri testUri, WebBrowser browser, TimeSpan timeout) {
+            if (_server == null) {
+                throw new InvalidOperationException("The server has not been started.");
+            }
+
+            if (testUri == null) {
+                throw new ArgumentNullException("testUri");
+            }
+            if (testUri.IsAbsoluteUri == false) {
+                throw new ArgumentException("URI must be absolute.", "testUri");
+            }
+            if (browser == null) {
+                throw new ArgumentNullException("browser");
+            }
+            if (String.IsNullOrEmpty(browser.ExecutablePath)) {
+                throw new InvalidOperationException("The specified browser could not be located.");
+            }
+
+            if (timeout.TotalMilliseconds == 0) {
+                timeout = TimeSpan.FromMinutes(1);
+            }
+
+            AutoResetEvent waitHandle = new AutoResetEvent(/* initialSignaledState */ false);
+            WebTestResult result = null;
+            Process browserProcess = null;
+
+            EventHandler<WebTestLogEventArgs> logEventHandler = null;
+            logEventHandler = delegate(object sender, WebTestLogEventArgs e) {
+                _server.Log -= logEventHandler;
+
+                result = new WebTestResult(e.Succeeded, e.Log);
+                waitHandle.Set();
+            };
+
+            try {
+                string arguments = browser.Arguments + testUri.AbsoluteUri;
+
+                ProcessStartInfo psi = new ProcessStartInfo(browser.ExecutablePath, arguments);
+                psi.UseShellExecute = true;
+                psi.WindowStyle = ProcessWindowStyle.Minimized;
+
+                _server.Log += logEventHandler;
+                browserProcess = Process.Start(psi);
+            }
+            catch (Exception) {
+                _server.Log -= logEventHandler;
+                return new WebTestResult(/* succeeded */ false, String.Empty);
+            }
+
+            bool signaled = waitHandle.WaitOne(timeout);
+            if (browserProcess != null) {
+                try {
+                    browserProcess.CloseMainWindow();
+                    browserProcess.Kill();
+                    browserProcess.WaitForExit(1000);
+                }
+                catch {
+                }
+                finally {
+                    browserProcess.Close();
+                }
+                browserProcess = null;
+            }
+
+            if (signaled == false) {
+                return new WebTestResult();
+            }
+            else {
+                return result;
+            }
+        }
+
+        public bool StartWebServer(string webRoot, int port) {
+            if (_server != null) {
+                throw new InvalidOperationException("The server has already been started.");
+            }
+            if (String.IsNullOrEmpty(webRoot)) {
+                throw new ArgumentNullException("webRoot");
+            }
+            if (Directory.Exists(webRoot) == false) {
+                throw new ArgumentException("Invalid directory specified as the web root.", "webRoot");
+            }
+
+            bool started = false;
+            try {
+                WebTestHttpServer server = new WebTestHttpServer(webRoot);
+                server.Start(port);
+
+                _server = server;
+                started = true;
+            }
+            catch (Exception e) {
+                throw new InvalidOperationException("Failed to start server.", e);
+            }
+
+            if (started) {
+                UriBuilder uriBuilder = new UriBuilder();
+                uriBuilder.Scheme = "http";
+                uriBuilder.Host = "localhost";
+                uriBuilder.Port = port;
+
+                _rootUri = uriBuilder.Uri;
+            }
+
+            return started;
+        }
+
+        public bool StopWebServer() {
+            bool stopped = false;
+
+            if (_server != null) {
+                try {
+                    _server.Stop();
+                    stopped = true;
+                }
+                catch {
+                }
+                _server = null;
+            }
+            return stopped;
+        }
+    }
+}
diff --git a/src/Tools/Testing/WebTestPageBuilder.cs b/src/Tools/Testing/WebTestPageBuilder.cs
new file mode 100644
index 000000000..82bf093ac
--- /dev/null
+++ b/src/Tools/Testing/WebTestPageBuilder.cs
@@ -0,0 +1,82 @@
+// WebTestPageBuilder.cs
+// Script#/Tools/Testing
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ScriptSharp.Testing {
+
+    public sealed class WebTestPageBuilder {
+
+        private const string PageMarkupFormat =
+@"<!DOCTYPE html>
+<html>
+<head>
+  <title>{0}</title>
+  <link rel=""stylesheet"" href=""/QUnit.css"" type=""text/css"" />
+</head>
+<body>
+  {1}
+  <div>
+    <h1 id=""qunit-header"">{1}</h1>
+    <h2 id=""qunit-banner""></h2>
+    <h2 id=""qunit-userAgent""></h2>
+    <ol id=""qunit-tests""></ol>
+    <br />
+    <textarea id=""qunit-log"" rows=""10"" cols=""100""></textarea>
+  </div>
+  <script type=""text/javascript"" src=""/QUnit.js""></script>
+  <script type=""text/javascript"" src=""/QUnitExt.js""></script>
+{2}
+</body>
+</html>
+";
+
+        private const string ScriptFormat =
+@"  <script type=""text/javascript"" src=""{0}""></script>";
+
+        private string _title;
+        private List<string> _scripts;
+        private string _content;
+
+        public WebTestPageBuilder()
+            : this("Tests") {
+        }
+
+        public WebTestPageBuilder(string title) {
+            _title = title;
+            _content = String.Empty;
+            _scripts = new List<string>();
+        }
+
+        public WebTestPageBuilder AddScript(string scriptPath) {
+            _scripts.Add(scriptPath);
+            return this;
+        }
+
+        public WebTestPageBuilder AddScripts(params string[] scriptPaths) {
+            _scripts.AddRange(scriptPaths);
+            return this;
+        }
+
+        public WebTestPageBuilder SetContent(string content) {
+            _content = content;
+            return this;
+        }
+
+        public string ToHtml() {
+            StringBuilder scriptsBuilder = new StringBuilder();
+            foreach (string s in _scripts) {
+                scriptsBuilder.AppendFormat(ScriptFormat, s);
+                scriptsBuilder.AppendLine();
+            }
+
+            return String.Format(PageMarkupFormat,
+                                 _title, _content,
+                                 scriptsBuilder.ToString());
+        }
+    }
+}
diff --git a/src/Tools/Testing/WebTestResult.cs b/src/Tools/Testing/WebTestResult.cs
new file mode 100644
index 000000000..5896002f8
--- /dev/null
+++ b/src/Tools/Testing/WebTestResult.cs
@@ -0,0 +1,43 @@
+// WebTestResult.cs
+// Script#/Tools/Testing
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Testing {
+
+    public sealed class WebTestResult {
+
+        private bool _succeeded;
+        private bool _timedOut;
+        private string _log;
+
+        internal WebTestResult() {
+            _timedOut = true;
+        }
+
+        internal WebTestResult(bool succeeded, string log) {
+            _succeeded = succeeded;
+            _log = log;
+        }
+
+        public string Log {
+            get {
+                return _log;
+            }
+        }
+
+        public bool Succeeded {
+            get {
+                return _succeeded;
+            }
+        }
+
+        public bool TimedOut {
+            get {
+                return _timedOut;
+            }
+        }
+    }
+}
diff --git a/src/ZipX/ItemTemplates/Class/Class.cs b/src/ZipX/ItemTemplates/Class/Class.cs
new file mode 100644
index 000000000..946c8be89
--- /dev/null
+++ b/src/ZipX/ItemTemplates/Class/Class.cs
@@ -0,0 +1,12 @@
+// $safeitemrootname$.cs
+//
+
+using System;
+using System.Collections.Generic;
+
+namespace $rootnamespace$
+{
+    public class $safeitemrootname$
+    {
+    }
+}
diff --git a/src/ZipX/ItemTemplates/Class/Class.vstemplate b/src/ZipX/ItemTemplates/Class/Class.vstemplate
new file mode 100644
index 000000000..a42726b37
--- /dev/null
+++ b/src/ZipX/ItemTemplates/Class/Class.vstemplate
@@ -0,0 +1,23 @@
+<VSTemplate Version="2.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Script Class</Name>
+    <Description>A class that will be compiled into script.</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4515" />
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>10</SortOrder>
+    <DefaultName>Class.cs</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem ReplaceParameters="true">Class.cs</ProjectItem>
+  </TemplateContent>
+  <WizardExtension>
+    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+  </WizardExtension>
+  <WizardData>
+    <packages repository="extension" repositoryId="ScriptSharp.Extension.Templates">
+      <package id="ScriptSharp" version="0.7.6" />
+      <package id="ScriptSharp.Lib.HTML" version="0.7.6" />
+    </packages>
+  </WizardData>
+</VSTemplate>
diff --git a/src/ZipX/ItemTemplates/Page/Page.cs b/src/ZipX/ItemTemplates/Page/Page.cs
new file mode 100644
index 000000000..280d9c34c
--- /dev/null
+++ b/src/ZipX/ItemTemplates/Page/Page.cs
@@ -0,0 +1,20 @@
+// $safeitemrootname$.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+namespace $rootnamespace$
+{
+    [GlobalMethods]
+    internal static class $safeitemrootname$
+    {
+        static $safeitemrootname$()
+        {
+            // Add script that runs on startup as the script is loaded into
+            // the page
+        }
+    }
+}
diff --git a/src/ZipX/ItemTemplates/Page/Page.vstemplate b/src/ZipX/ItemTemplates/Page/Page.vstemplate
new file mode 100644
index 000000000..2453c27dd
--- /dev/null
+++ b/src/ZipX/ItemTemplates/Page/Page.vstemplate
@@ -0,0 +1,23 @@
+<VSTemplate Version="2.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Page Script</Name>
+    <Description>A new script within a web application project associated with a specific page.</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4515" />
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>20</SortOrder>
+    <DefaultName>Page.cs</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem ReplaceParameters="true">Page.cs</ProjectItem>
+  </TemplateContent>
+  <WizardExtension>
+    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+  </WizardExtension>
+  <WizardData>
+    <packages repository="extension" repositoryId="ScriptSharp.Extension.Templates">
+      <package id="ScriptSharp" version="0.7.6" />
+      <package id="ScriptSharp.Lib.HTML" version="0.7.6" />
+    </packages>
+  </WizardData>
+</VSTemplate>
diff --git a/src/ZipX/ItemTemplates/Resource/Resource.resx b/src/ZipX/ItemTemplates/Resource/Resource.resx
new file mode 100644
index 000000000..32ea94d6f
--- /dev/null
+++ b/src/ZipX/ItemTemplates/Resource/Resource.resx
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+	-->
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+</root>
diff --git a/src/ZipX/ItemTemplates/Resource/Resource.vstemplate b/src/ZipX/ItemTemplates/Resource/Resource.vstemplate
new file mode 100644
index 000000000..85348ed33
--- /dev/null
+++ b/src/ZipX/ItemTemplates/Resource/Resource.vstemplate
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VSTemplate Version="2.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Resource File</Name>
+    <Description>A resource file containing strings that will be used to generate localized scripts.</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4565" />
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>60</SortOrder>
+    <DefaultName>Resource.resx</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem>Resource.resx</ProjectItem>
+    <CustomParameters>
+      <CustomParameter Name="$itemproperties$" Value="CustomTool" />
+      <CustomParameter Name="$CustomTool$" Value="" />
+    </CustomParameters>
+  </TemplateContent>
+  <WizardExtension>
+    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+  </WizardExtension>
+  <WizardData>
+    <packages repository="extension" repositoryId="ScriptSharp.Extension.Templates">
+      <package id="ScriptSharp" version="0.7.6" />
+    </packages>
+  </WizardData>
+</VSTemplate>
diff --git a/src/ZipX/ItemTemplates/TestClass/TestClass.cs b/src/ZipX/ItemTemplates/TestClass/TestClass.cs
new file mode 100644
index 000000000..dbb82df03
--- /dev/null
+++ b/src/ZipX/ItemTemplates/TestClass/TestClass.cs
@@ -0,0 +1,37 @@
+// $safeitemrootname$.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Html;
+using System.Testing;
+
+namespace $rootnamespace$
+{
+    [SuppressMessage("Microsoft.Performance", "CA1812",
+                     Justification = "Tests don't have internal consumers. They're only compiled into .test.js scripts.")]
+    internal sealed class $safeitemrootname$ : TestClass
+    {
+        public void TestMethod1()
+        {
+            // TODO: Uncomment and specify n to indicate the number of
+            //       asserts that will be invoked.
+            // Assert.ExpectAsserts(n);
+        }
+
+        public void TestMethod2()
+        {
+            // TODO: Uncomment and specify n to indicate the number of
+            //       asserts that will be invoked.
+            // Assert.ExpectAsserts(n);
+
+            // TODO: Start async work
+
+            TestEngine.WaitForAsyncCompletion();
+
+            // TODO: From within the async callback
+            // TestEngine.ResumeOnAsyncCompleted();
+        }
+    }
+}
diff --git a/src/ZipX/ItemTemplates/TestClass/TestClass.vstemplate b/src/ZipX/ItemTemplates/TestClass/TestClass.vstemplate
new file mode 100644
index 000000000..857f9edeb
--- /dev/null
+++ b/src/ZipX/ItemTemplates/TestClass/TestClass.vstemplate
@@ -0,0 +1,23 @@
+<VSTemplate Version="2.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Test Class</Name>
+    <Description>A test class that will be compiled into the test build of the script.</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4515" />
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>50</SortOrder>
+    <DefaultName>TestClass.cs</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem ReplaceParameters="true">TestClass.cs</ProjectItem>
+  </TemplateContent>
+  <WizardExtension>
+    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+  </WizardExtension>
+  <WizardData>
+    <packages repository="extension" repositoryId="ScriptSharp.Extension.Templates">
+      <package id="ScriptSharp" version="0.7.6" />
+      <package id="ScriptSharp.Lib.HTML" version="0.7.6" />
+    </packages>
+  </WizardData>
+</VSTemplate>
diff --git a/src/ZipX/ItemTemplates/jQueryPage/Page.cs b/src/ZipX/ItemTemplates/jQueryPage/Page.cs
new file mode 100644
index 000000000..4857fa966
--- /dev/null
+++ b/src/ZipX/ItemTemplates/jQueryPage/Page.cs
@@ -0,0 +1,23 @@
+// $safeitemrootname$.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Html;
+using System.Runtime.CompilerServices;
+using jQueryApi;
+
+namespace $rootnamespace$
+{
+    [GlobalMethods]
+    internal static class $safeitemrootname$
+    {
+        static $safeitemrootname$()
+        {
+            jQuery.OnDocumentReady(delegate() {
+                // Add script that runs once the document is ready for being
+                // consumed by script.
+            });
+        }
+    }
+}
diff --git a/src/ZipX/ItemTemplates/jQueryPage/jQueryPage.vstemplate b/src/ZipX/ItemTemplates/jQueryPage/jQueryPage.vstemplate
new file mode 100644
index 000000000..3b15dc4c7
--- /dev/null
+++ b/src/ZipX/ItemTemplates/jQueryPage/jQueryPage.vstemplate
@@ -0,0 +1,24 @@
+<VSTemplate Version="2.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>jQuery Page Script</Name>
+    <Description>A new jQuery-based script within a web application project associated with a specific page.</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4515" />
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>20</SortOrder>
+    <DefaultName>Page.cs</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem ReplaceParameters="true">Page.cs</ProjectItem>
+  </TemplateContent>
+  <WizardExtension>
+    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+  </WizardExtension>
+  <WizardData>
+    <packages repository="extension" repositoryId="ScriptSharp.Extension.Templates">
+      <package id="ScriptSharp" version="0.7.6" />
+      <package id="ScriptSharp.Lib.HTML" version="0.7.6" />
+      <package id="ScriptSharp.Lib.jQuery" version="0.7.6" />
+    </packages>
+  </WizardData>
+</VSTemplate>
diff --git a/src/ZipX/ItemTemplates/jQueryPlugin/Plugin.cs b/src/ZipX/ItemTemplates/jQueryPlugin/Plugin.cs
new file mode 100644
index 000000000..20f79ceb4
--- /dev/null
+++ b/src/ZipX/ItemTemplates/jQueryPlugin/Plugin.cs
@@ -0,0 +1,54 @@
+// $safeitemrootname$.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Html;
+using System.Runtime.CompilerServices;
+using jQueryApi;
+
+[Mixin("$.fn")]
+public static class $safeitemrootname$Plugin
+{
+    public static jQueryObject $safeitemrootname$($safeitemrootname$Options customOptions)
+    {
+        $safeitemrootname$Options defaultOptions =
+            new $safeitemrootname$Options("myOption", 0
+                                          /* name/value pairs corresponding to default options */);
+                                          
+        $safeitemrootname$Options options =
+            jQuery.ExtendObject<$safeitemrootname$Options>(new $safeitemrootname$Options(), defaultOptions, customOptions);
+
+        return jQuery.Current.Each(delegate (int i, Element element) {
+            // TODO: Consume the matched elements
+        });
+    }
+}
+
+[Imported]
+[ScriptName("Object")]
+public sealed class $safeitemrootname$Options
+{
+    // TODO: Replace with fields corresponding to options for the plugin
+    public int myOption;
+
+    public $safeitemrootname$Options() {
+    }
+
+    public $safeitemrootname$Options(params object[] nameValuePairs) {
+    }
+}
+
+#region Script# Support
+[Imported]
+public sealed class $safeitemrootname$Object : jQueryObject
+{
+    public jQueryObject $safeitemrootname$() {
+        return null;
+    }
+
+    public jQueryObject $safeitemrootname$($safeitemrootname$Options options) {
+        return null;
+    }
+}
+#endregion
diff --git a/src/ZipX/ItemTemplates/jQueryPlugin/jQueryPlugin.vstemplate b/src/ZipX/ItemTemplates/jQueryPlugin/jQueryPlugin.vstemplate
new file mode 100644
index 000000000..d68b576b1
--- /dev/null
+++ b/src/ZipX/ItemTemplates/jQueryPlugin/jQueryPlugin.vstemplate
@@ -0,0 +1,24 @@
+<VSTemplate Version="2.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>jQuery Plugin Class</Name>
+    <Description>A jQuery plugin that will be compiled into script.</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4515" />
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>20</SortOrder>
+    <DefaultName>Plugin.cs</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <ProjectItem ReplaceParameters="true">Plugin.cs</ProjectItem>
+  </TemplateContent>
+  <WizardExtension>
+    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+  </WizardExtension>
+  <WizardData>
+    <packages repository="extension" repositoryId="ScriptSharp.Extension.Templates">
+      <package id="ScriptSharp" version="0.7.6" />
+      <package id="ScriptSharp.Lib.HTML" version="0.7.6" />
+      <package id="ScriptSharp.Lib.jQuery" version="0.7.6" />
+    </packages>
+  </WizardData>
+</VSTemplate>
diff --git a/src/ZipX/Packages/Core.nuspec b/src/ZipX/Packages/Core.nuspec
new file mode 100644
index 000000000..781ae76ef
--- /dev/null
+++ b/src/ZipX/Packages/Core.nuspec
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ScriptSharp</id>
+    <version>0.7.6.0</version>
+    <title>Script#</title>
+    <authors>Nikhil Kothari</authors>
+    <copyright>Copyright (c) 2012, Nikhil Kothari</copyright>
+    <projectUrl>http://scriptsharp.com</projectUrl>
+    <iconUrl>http://scriptsharp.com/nuget/Package.png</iconUrl>
+    <licenseUrl>http://scriptsharp.com/nuget/License.txt</licenseUrl>
+    <summary>Script# lets you author your HTML5 apps in C# and compile them into JavaScript.</summary>
+    <description>
+      This package contains the Script# compiler and the associated mscorlib.dll assembly that all Script# projects reference.
+      It also includes msbuild support for easily using Script# within Visual Studio.
+    </description>
+    <tags>script javascript ajax html html5 mobile scriptsharp compiler tool thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\mscorlib.dll" target="tools" />
+    <file src="..\..\..\bin\Release\mscorlib.xml" target="tools" />
+    <file src="..\..\..\bin\Release\mscorlib.js" target="tools" />
+    <file src="..\..\..\bin\Release\mscorlib.debug.js" target="tools" />
+    <file src="..\..\..\bin\Release\ScriptSharp.dll" target="tools" />
+    <file src="..\..\..\bin\Release\ScriptSharp.Build.dll" target="tools" />
+    <file src="..\..\..\bin\Release\ScriptSharp.targets" target="tools" />
+    <file src="..\..\..\bin\Release\ssc.exe" target="tools" />
+    <file src="Core\Install.ps1" target="tools" />
+    <file src="Core\Uninstall.ps1" target="tools" />
+    <file src="Core\Reset.psm1" target="tools" />
+    <file src="Core\ScriptSharp.PlaceHolder.txt" target="content" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/Core/Install.ps1 b/src/ZipX/Packages/Core/Install.ps1
new file mode 100644
index 000000000..ab8bb1d8a
--- /dev/null
+++ b/src/ZipX/Packages/Core/Install.ps1
@@ -0,0 +1,34 @@
+param($installPath, $toolsPath, $package, $project)
+
+Import-Module (Join-Path $toolsPath "Reset.psm1")
+
+function Compute-RelativePath ($basePath, $referencePath) {
+  $baseUri = New-Object -typename System.Uri -argumentlist $basePath
+  $referenceUri = New-Object -typename System.Uri -argumentlist $referencePath
+
+  $relativeUri = $baseUri.MakeRelativeUri($referenceUri)
+  $relativePath = [System.Uri]::UnescapeDataString($relativeUri.ToString()).Replace('/', '\')
+  return $relativePath
+}
+
+# remove placeholder file
+$placeholder = "ScriptSharp.PlaceHolder.txt"
+$project.ProjectItems.Item($placeholder).Remove()
+Split-Path $project.FullName -parent | Join-Path -ChildPath $placeholder | Remove-Item
+
+# Get the msbuild object associated with the project
+Add-Type -AssemblyName "Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+$msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName) | Select-Object -First 1
+
+# first remove any existing import reference
+Reset-Project $msbuild
+
+# get a relative reference to the targets file in the package's tools directory
+# and add it to the project
+$targetsAbsolutePath = Join-Path $toolsPath "ScriptSharp.targets"
+$targetsRelativePath = Compute-RelativePath $project.FullName $targetsAbsolutePath
+$import = $msbuild.Xml.AddImport($targetsRelativePath)
+$import.Condition = "Exists('" + $targetsRelativePath + "')"
+
+# finally save the project
+$project.Save()
diff --git a/src/ZipX/Packages/Core/Reset.psm1 b/src/ZipX/Packages/Core/Reset.psm1
new file mode 100644
index 000000000..4a578b813
--- /dev/null
+++ b/src/ZipX/Packages/Core/Reset.psm1
@@ -0,0 +1,11 @@
+function Reset-Project($msbuild) {
+  $imports = $msbuild.Xml.Imports
+
+  if ($imports.Count -gt 0) {
+    foreach ($import in $imports) {
+      if ($import.Project.IndexOf("ScriptSharp.targets") -gt 0) {
+        $msbuild.Xml.RemoveChild($import)
+      }
+    }
+  }
+}
diff --git a/src/ZipX/Packages/Core/ScriptSharp.PlaceHolder.txt b/src/ZipX/Packages/Core/ScriptSharp.PlaceHolder.txt
new file mode 100644
index 000000000..8699ad21a
--- /dev/null
+++ b/src/ZipX/Packages/Core/ScriptSharp.PlaceHolder.txt
@@ -0,0 +1 @@
+Script# Project PlaceHolder File
diff --git a/src/ZipX/Packages/Core/Uninstall.ps1 b/src/ZipX/Packages/Core/Uninstall.ps1
new file mode 100644
index 000000000..4453cf626
--- /dev/null
+++ b/src/ZipX/Packages/Core/Uninstall.ps1
@@ -0,0 +1,13 @@
+param($installPath, $toolsPath, $package, $project)
+
+Import-Module (Join-Path $toolsPath "Reset.psm1")
+
+# Get the msbuild object associated with the project and add an import
+Add-Type -AssemblyName "Microsoft.Build, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
+$msbuild = [Microsoft.Build.Evaluation.ProjectCollection]::GlobalProjectCollection.GetLoadedProjects($project.FullName)[0]
+
+# remove import reference
+Reset-Project $msbuild
+
+# and then save the project
+$project.Save()
diff --git a/src/ZipX/Packages/FxCop.nuspec b/src/ZipX/Packages/FxCop.nuspec
new file mode 100644
index 000000000..f9a74b0dd
--- /dev/null
+++ b/src/ZipX/Packages/FxCop.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ScriptSharp.FxCop</id>
+    <version>0.7.6.0</version>
+    <title>Script# FxCop Rules</title>
+    <authors>Nikhil Kothari</authors>
+    <copyright>Copyright (c) 2012, Nikhil Kothari</copyright>
+    <projectUrl>http://scriptsharp.com</projectUrl>
+    <iconUrl>http://scriptsharp.com/nuget/Package.png</iconUrl>
+    <licenseUrl>http://scriptsharp.com/nuget/License.txt</licenseUrl>
+    <summary>FxCop rules specific to scripting scenarios for use with Script# code.</summary>
+    <description>
+      This package provides additional rules specifically implemented for Script# code and scripting scenarios.
+    </description>
+    <tags>script javascript ajax html html5 scriptsharp fxcop static analysis tool thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\ScriptSharp.FxCop.dll" target="tools" />
+    <file src="FxCop\Install.ps1" target="tools" />
+    <file src="FxCop\ScriptSharp.PlaceHolder.txt" target="content" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/FxCop/Install.ps1 b/src/ZipX/Packages/FxCop/Install.ps1
new file mode 100644
index 000000000..d4953df97
--- /dev/null
+++ b/src/ZipX/Packages/FxCop/Install.ps1
@@ -0,0 +1,54 @@
+param($installPath, $toolsPath, $package, $project)
+
+function Compute-RelativePath ($basePath, $referencePath) {
+  $baseUri = New-Object -typename System.Uri -argumentlist $basePath
+  $referenceUri = New-Object -typename System.Uri -argumentlist $referencePath
+
+  $relativeUri = $baseUri.MakeRelativeUri($referenceUri)
+  $relativePath = [System.Uri]::UnescapeDataString($relativeUri.ToString()).Replace('/', '\')
+  return $relativePath
+}
+
+function Create-RuleElement ($doc, $id) {
+  $ruleNode = $doc.CreateElement('Rule')
+  $ruleNode.SetAttribute('Id', $id)
+  $ruleNode.SetAttribute('Action', 'Warning')
+  return $ruleNode
+}
+
+# remove placeholder file
+$placeholder = "ScriptSharp.PlaceHolder.txt"
+$project.ProjectItems.Item($placeholder).Remove()
+Split-Path $project.FullName -parent | Join-Path -ChildPath $placeholder | Remove-Item
+
+# compute the relative path to the tools folder we'll be adding to the ruleset
+$ruleSetFilePath = Split-Path $project.FullName -parent | Join-Path -ChildPath 'Properties\FxCop.ruleset'
+$rulePath = Compute-RelativePath $ruleSetFilePath $toolsPath
+
+# get the ruleset file associated with the project
+$ruleSetDoc = New-Object xml
+$ruleSetDoc.Load($ruleSetFilePath)
+$ruleSetNode = $ruleSetDoc.RuleSet
+$ruleHintPathsNode = $ruleSetNode.SelectSingleNode('RuleHintPaths')
+if ($ruleHintPathsNode -eq $null) {
+  $ruleHintPathsNode = $ruleSetDoc.CreateElement('RuleHintPaths')
+  $ruleSetNode.InsertAfter($ruleHintPathsNode, $null)
+}
+
+# add a path for the where the fxcop rules assembly exists
+$pathNode = $ruleSetDoc.CreateElement('Path')
+$pathNode.AppendChild($ruleSetDoc.CreateTextNode($rulePath))
+$ruleHintPathsNode.AppendChild($pathNode)
+
+# add the rules
+$rule1 = Create-RuleElement $ruleSetDoc 'SS0001'
+$rule2 = Create-RuleElement $ruleSetDoc 'SS0002'
+$rule3 = Create-RuleElement $ruleSetDoc 'SS0003'
+$rulesNode = $ruleSetNode.Rules
+$rulesNode.AppendChild($rule1)
+$rulesNode.AppendChild($rule2)
+$rulesNode.AppendChild($rule3)
+
+
+# finally save the ruleset file
+$ruleSetDoc.Save($ruleSetFilePath)
diff --git a/src/ZipX/Packages/FxCop/ScriptSharp.PlaceHolder.txt b/src/ZipX/Packages/FxCop/ScriptSharp.PlaceHolder.txt
new file mode 100644
index 000000000..8699ad21a
--- /dev/null
+++ b/src/ZipX/Packages/FxCop/ScriptSharp.PlaceHolder.txt
@@ -0,0 +1 @@
+Script# Project PlaceHolder File
diff --git a/src/ZipX/Packages/Lib.BingMaps.nuspec b/src/ZipX/Packages/Lib.BingMaps.nuspec
new file mode 100644
index 000000000..00c18e54d
--- /dev/null
+++ b/src/ZipX/Packages/Lib.BingMaps.nuspec
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ScriptSharp.Lib.BingMaps</id>
+    <version>0.7.6.0</version>
+    <title>Script# Bing Maps Reference Assembly</title>
+    <authors>Nikhil Kothari</authors>
+    <copyright>Copyright (c) 2012, Nikhil Kothari</copyright>
+    <projectUrl>http://scriptsharp.com</projectUrl>
+    <iconUrl>http://scriptsharp.com/nuget/PackageLib.png</iconUrl>
+    <licenseUrl>http://scriptsharp.com/nuget/License.txt</licenseUrl>
+    <summary>Allows you to reference and use Bing Maps control and APIs in Script# projects.</summary>
+    <description>
+      This package contains contains the Script.Microsoft.BingMaps assembly that allows you to reference and program against Bing Maps control and mapping APIs when creating HTML5/browser-based applications with Script#.
+    </description>
+    <tags>script knockout javascript ajax html html5 scriptsharp bing maps thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="ScriptSharp" version="0.7.6.0" />
+      <dependency id="ScriptSharp.Lib.HTML" version="0.7.6.0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\Script.Microsoft.BingMaps.dll" target="lib" />
+    <file src="..\..\..\bin\Release\Script.Microsoft.BingMaps.xml" target="lib" />
+    <file src="..\..\..\bin\Release\Script.Microsoft.BingMaps.txt" target="lib" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/Lib.HTML.nuspec b/src/ZipX/Packages/Lib.HTML.nuspec
new file mode 100644
index 000000000..580b659e3
--- /dev/null
+++ b/src/ZipX/Packages/Lib.HTML.nuspec
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ScriptSharp.Lib.HTML</id>
+    <version>0.7.6.0</version>
+    <title>Script# HTML5 Reference Assembly</title>
+    <authors>Nikhil Kothari</authors>
+    <copyright>Copyright (c) 2012, Nikhil Kothari</copyright>
+    <projectUrl>http://scriptsharp.com</projectUrl>
+    <iconUrl>http://scriptsharp.com/nuget/PackageLib.png</iconUrl>
+    <licenseUrl>http://scriptsharp.com/nuget/License.txt</licenseUrl>
+    <summary>Allows you to reference HTML DOM and related APIs to create browser-based Script# applications.</summary>
+    <description>
+      This package contains contains the Script.Web assembly that allows you to reference and program against DOM and related APIs when creating HTML5/browser-based applications with Script#.
+    </description>
+    <tags>script javascript ajax html html5 scriptsharp thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="ScriptSharp" version="0.7.6.0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\Script.Web.dll" target="lib" />
+    <file src="..\..\..\bin\Release\Script.Web.xml" target="lib" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/Lib.Knockout.nuspec b/src/ZipX/Packages/Lib.Knockout.nuspec
new file mode 100644
index 000000000..ec231c09c
--- /dev/null
+++ b/src/ZipX/Packages/Lib.Knockout.nuspec
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ScriptSharp.Lib.Knockout</id>
+    <version>0.7.6.0</version>
+    <title>Script# Knockout Reference Assembly</title>
+    <authors>Nikhil Kothari</authors>
+    <copyright>Copyright (c) 2012, Nikhil Kothari</copyright>
+    <projectUrl>http://scriptsharp.com</projectUrl>
+    <iconUrl>http://scriptsharp.com/nuget/PackageLib.png</iconUrl>
+    <licenseUrl>http://scriptsharp.com/nuget/License.txt</licenseUrl>
+    <summary>Allows you to reference and use Knockout in Script# projects.</summary>
+    <description>
+      This package contains contains the Script.Knockout assembly that allows you to reference and program against the Knockout APIs when creating MVVM-style HTML5/browser-based applications with Script#.
+    </description>
+    <tags>script knockout mvvm javascript ajax html html5 scriptsharp thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="ScriptSharp" version="0.7.6.0" />
+      <dependency id="ScriptSharp.Lib.HTML" version="0.7.6.0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\Script.Knockout.dll" target="lib" />
+    <file src="..\..\..\bin\Release\Script.Knockout.xml" target="lib" />
+    <file src="..\..\..\bin\Release\Script.Knockout.txt" target="lib" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/Lib.jQuery.History.nuspec b/src/ZipX/Packages/Lib.jQuery.History.nuspec
new file mode 100644
index 000000000..dc5d86e0a
--- /dev/null
+++ b/src/ZipX/Packages/Lib.jQuery.History.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ScriptSharp.Lib.jQuery.History</id>
+    <version>0.7.6.0</version>
+    <title>Script# jQuery History (BBQ plugin) Reference Assembly</title>
+    <authors>Nikhil Kothari</authors>
+    <copyright>Copyright (c) 2012, Nikhil Kothari</copyright>
+    <projectUrl>http://scriptsharp.com</projectUrl>
+    <iconUrl>http://scriptsharp.com/nuget/PackageLib.png</iconUrl>
+    <licenseUrl>http://scriptsharp.com/nuget/License.txt</licenseUrl>
+    <summary>Allows you to reference and use the jQuery History BBQ plugin in Script# projects.</summary>
+    <description>
+      This package contains contains the Script.jQuery.History assembly that allows you to reference and program against the jQuery History (BBQ) plugin when creating HTML5/browser-based applications with Script#.
+    </description>
+    <tags>script jquery validation plugin javascript ajax html html5 scriptsharp thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="ScriptSharp" version="0.7.6.0" />
+      <dependency id="ScriptSharp.Lib.HTML" version="0.7.6.0" />
+      <dependency id="ScriptSharp.Lib.jQuery" version="0.7.6.0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\Script.jQuery.History.dll" target="lib" />
+    <file src="..\..\..\bin\Release\Script.jQuery.History.xml" target="lib" />
+    <file src="..\..\..\bin\Release\Script.jQuery.History.txt" target="lib" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/Lib.jQuery.Templating.nuspec b/src/ZipX/Packages/Lib.jQuery.Templating.nuspec
new file mode 100644
index 000000000..61299e3cf
--- /dev/null
+++ b/src/ZipX/Packages/Lib.jQuery.Templating.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ScriptSharp.Lib.jQuery.Templating</id>
+    <version>0.7.6.0</version>
+    <title>Script# jQuery Templating Reference Assembly</title>
+    <authors>Nikhil Kothari</authors>
+    <copyright>Copyright (c) 2012, Nikhil Kothari</copyright>
+    <projectUrl>http://scriptsharp.com</projectUrl>
+    <iconUrl>http://scriptsharp.com/nuget/PackageLib.png</iconUrl>
+    <licenseUrl>http://scriptsharp.com/nuget/License.txt</licenseUrl>
+    <summary>Allows you to reference and use the jQuery Templating plugin in Script# projects.</summary>
+    <description>
+      This package contains contains the Script.jQuery.Templating assembly that allows you to reference and program against the jQuery Templating plugin when creating HTML5/browser-based applications with Script#.
+    </description>
+    <tags>script jquery validation plugin javascript ajax html html5 scriptsharp thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="ScriptSharp" version="0.7.6.0" />
+      <dependency id="ScriptSharp.Lib.HTML" version="0.7.6.0" />
+      <dependency id="ScriptSharp.Lib.jQuery" version="0.7.6.0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\Script.jQuery.Templating.dll" target="lib" />
+    <file src="..\..\..\bin\Release\Script.jQuery.Templating.xml" target="lib" />
+    <file src="..\..\..\bin\Release\Script.jQuery.Templating.txt" target="lib" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/Lib.jQuery.UI.nuspec b/src/ZipX/Packages/Lib.jQuery.UI.nuspec
new file mode 100644
index 000000000..0f2fd1b61
--- /dev/null
+++ b/src/ZipX/Packages/Lib.jQuery.UI.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ScriptSharp.Lib.jQuery.UI</id>
+    <version>0.7.6.0</version>
+    <title>Script# jQueryUI Reference Assembly</title>
+    <authors>Nikhil Kothari</authors>
+    <copyright>Copyright (c) 2012, Nikhil Kothari</copyright>
+    <projectUrl>http://scriptsharp.com</projectUrl>
+    <iconUrl>http://scriptsharp.com/nuget/PackageLib.png</iconUrl>
+    <licenseUrl>http://scriptsharp.com/nuget/License.txt</licenseUrl>
+    <summary>Allows you to reference and use jQueryUI in Script# projects.</summary>
+    <description>
+      This package contains contains the Script.jQuery.UI assembly that allows you to reference and program against the jQueryUI APIs and widgets when creating HTML5/browser-based applications with Script#.
+    </description>
+    <tags>script jquery jqueryui javascript ajax html html5 mobile scriptsharp thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="ScriptSharp" version="0.7.6.0" />
+      <dependency id="ScriptSharp.Lib.HTML" version="0.7.6.0" />
+      <dependency id="ScriptSharp.Lib.jQuery" version="0.7.6.0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\Script.jQuery.UI.dll" target="lib" />
+    <file src="..\..\..\bin\Release\Script.jQuery.UI.xml" target="lib" />
+    <file src="..\..\..\bin\Release\Script.jQuery.UI.txt" target="lib" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/Lib.jQuery.Validation.nuspec b/src/ZipX/Packages/Lib.jQuery.Validation.nuspec
new file mode 100644
index 000000000..542b8c95b
--- /dev/null
+++ b/src/ZipX/Packages/Lib.jQuery.Validation.nuspec
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ScriptSharp.Lib.jQuery.Validation</id>
+    <version>0.7.6.0</version>
+    <title>Script# jQuery Validation Reference Assembly</title>
+    <authors>Nikhil Kothari</authors>
+    <copyright>Copyright (c) 2012, Nikhil Kothari</copyright>
+    <projectUrl>http://scriptsharp.com</projectUrl>
+    <iconUrl>http://scriptsharp.com/nuget/PackageLib.png</iconUrl>
+    <licenseUrl>http://scriptsharp.com/nuget/License.txt</licenseUrl>
+    <summary>Allows you to reference and use the jQuery Validation plugin in Script# projects.</summary>
+    <description>
+      This package contains contains the Script.jQuery.Validation assembly that allows you to reference and program against the jQuery Validation plugin when creating HTML5/browser-based applications with Script#.
+    </description>
+    <tags>script jquery validation plugin javascript ajax html html5 scriptsharp thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="ScriptSharp" version="0.7.6.0" />
+      <dependency id="ScriptSharp.Lib.HTML" version="0.7.6.0" />
+      <dependency id="ScriptSharp.Lib.jQuery" version="0.7.6.0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\Script.jQuery.Validation.dll" target="lib" />
+    <file src="..\..\..\bin\Release\Script.jQuery.Validation.xml" target="lib" />
+    <file src="..\..\..\bin\Release\Script.jQuery.Validation.txt" target="lib" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/Lib.jQuery.nuspec b/src/ZipX/Packages/Lib.jQuery.nuspec
new file mode 100644
index 000000000..d4a995ce5
--- /dev/null
+++ b/src/ZipX/Packages/Lib.jQuery.nuspec
@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ScriptSharp.Lib.jQuery</id>
+    <version>0.7.6.0</version>
+    <title>Script# jQuery Reference Assembly</title>
+    <authors>Nikhil Kothari</authors>
+    <copyright>Copyright (c) 2012, Nikhil Kothari</copyright>
+    <projectUrl>http://scriptsharp.com</projectUrl>
+    <iconUrl>http://scriptsharp.com/nuget/PackageLib.png</iconUrl>
+    <licenseUrl>http://scriptsharp.com/nuget/License.txt</licenseUrl>
+    <summary>Allows you to reference and use jQuery in Script# projects.</summary>
+    <description>
+      This package contains contains the Script.jQuery assembly that allows you to reference and program against the rich set of jQuery APIs when creating HTML5/browser-based applications with Script#.
+    </description>
+    <tags>script jquery jqueryui javascript ajax html html5 mobile scriptsharp thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <dependencies>
+      <dependency id="ScriptSharp" version="0.7.6.0" />
+      <dependency id="ScriptSharp.Lib.HTML" version="0.7.6.0" />
+    </dependencies>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\Script.jQuery.dll" target="lib" />
+    <file src="..\..\..\bin\Release\Script.jQuery.xml" target="lib" />
+    <file src="..\..\..\bin\Release\Script.jQuery.txt" target="lib" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/Runtime.nuspec b/src/ZipX/Packages/Runtime.nuspec
new file mode 100644
index 000000000..8d32c3382
--- /dev/null
+++ b/src/ZipX/Packages/Runtime.nuspec
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ScriptSharp.Runtime</id>
+    <version>0.7.6.0</version>
+    <title>Script# Runtime Scripts</title>
+    <authors>Nikhil Kothari</authors>
+    <copyright>Copyright (c) 2012, Nikhil Kothari</copyright>
+    <projectUrl>http://scriptsharp.com</projectUrl>
+    <iconUrl>http://scriptsharp.com/nuget/Package.png</iconUrl>
+    <licenseUrl>http://scriptsharp.com/nuget/License.txt</licenseUrl>
+    <summary>Provides the core javascript runtime for Script#-based scripts for use in Web projects.</summary>
+    <description>
+      This package contains scripts like mscorlib.js which provides the runtime script implementations of a type system and core APIs available to scripts generated using Script# for deployment within web applications (such as asp.net mvc projects).
+    </description>
+    <tags>script scriptsharp javascript html aspnet mvc thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\mscorlib.js" target="content\Scripts" />
+    <file src="..\..\..\bin\Release\mscorlib.debug.js" target="content\Scripts" />
+    <file src="..\..\..\bin\Release\ssloader.js" target="content\Scripts" />
+    <file src="..\..\..\bin\Release\ssloader.debug.js" target="content\Scripts" />
+  </files>
+</package>
diff --git a/src/ZipX/Packages/Testing.nuspec b/src/ZipX/Packages/Testing.nuspec
new file mode 100644
index 000000000..de55e079e
--- /dev/null
+++ b/src/ZipX/Packages/Testing.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <id>ScriptSharp.Testing</id>
+    <version>0.7.6.0</version>
+    <title>Script# Unit Testing Helpers</title>
+    <authors>Nikhil Kothari</authors>
+    <copyright>Copyright (c) 2012, Nikhil Kothari</copyright>
+    <projectUrl>http://scriptsharp.com</projectUrl>
+    <iconUrl>http://scriptsharp.com/nuget/Package.png</iconUrl>
+    <licenseUrl>http://scriptsharp.com/nuget/License.txt</licenseUrl>
+    <summary>Allows running QUnit-based tests generated by Script# within Visual Studio.</summary>
+    <description>
+      This package contains the ScriptSharp.Testing assembly which allows you to launch browsers and load pages using the QUnit testing framework while integrating with Visual Studio unit testing features in the IDE.
+      In particular, Script# generates unit test classes and methods within a Script Library project into QUnit-based tests within a Test flavor of generated script.
+    </description>
+    <tags>script javascript qunit ajax html html5 scriptsharp unit testing tdd thescriptsharp</tags>
+    <language>en-US</language>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+  </metadata>
+  <files>
+    <file src="..\..\..\bin\Release\ScriptSharp.Testing.dll" target="lib" />
+    <file src="..\..\..\bin\Release\ScriptSharp.Testing.xml" target="lib" />
+  </files>
+</package>
diff --git a/src/ZipX/ProjectTemplates/ClassLibrary/AssemblyInfo.cs b/src/ZipX/ProjectTemplates/ClassLibrary/AssemblyInfo.cs
new file mode 100644
index 000000000..53d3c0162
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/ClassLibrary/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("$projectname$")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("$registeredorganization$")]
+[assembly: AssemblyProduct("$projectname$")]
+[assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("$safeprojectname$")]
diff --git a/src/ZipX/ProjectTemplates/ClassLibrary/Class1.cs b/src/ZipX/ProjectTemplates/ClassLibrary/Class1.cs
new file mode 100644
index 000000000..6cddf6f6e
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/ClassLibrary/Class1.cs
@@ -0,0 +1,12 @@
+// Class1.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Html;
+
+namespace $safeprojectname$ {
+
+    public class Class1 {
+    }
+}
diff --git a/src/ZipX/ProjectTemplates/ClassLibrary/ClassLibrary.csproj b/src/ZipX/ProjectTemplates/ClassLibrary/ClassLibrary.csproj
new file mode 100644
index 000000000..b75466071
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/ClassLibrary/ClassLibrary.csproj
@@ -0,0 +1,40 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>$guid1$</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>$safeprojectname$</RootNamespace>
+    <AssemblyName>$safeprojectname$</AssemblyName>
+    <ScriptTemplate>Properties\Script.template</ScriptTemplate>
+    <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateScript>True</GenerateScript>
+    <GenerateResources>True</GenerateResources>
+   </PropertyGroup>
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Debug\$safeprojectname$.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Release\$safeprojectname$.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="Properties\FxCop.ruleset" />
+    <None Include="Properties\Script.template" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Class1.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/src/ZipX/ProjectTemplates/ClassLibrary/ClassLibrary.vstemplate b/src/ZipX/ProjectTemplates/ClassLibrary/ClassLibrary.vstemplate
new file mode 100644
index 000000000..f4fcb7b34
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/ClassLibrary/ClassLibrary.vstemplate
@@ -0,0 +1,30 @@
+<VSTemplate Version="2.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Script Library</Name>
+    <Description>A script file.</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4547" />
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>10</SortOrder>
+    <CreateNewFolder>true</CreateNewFolder>
+    <DefaultName>ScriptLibrary</DefaultName>
+    <ProvideDefaultName>true</ProvideDefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <Project File="ClassLibrary.csproj" ReplaceParameters="true">
+      <ProjectItem TargetFileName="Properties\FxCop.ruleset">FxCop.ruleset</ProjectItem>
+      <ProjectItem TargetFileName="Properties\Script.template">Script.template</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="Properties\AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" OpenInEditor="true">Class1.cs</ProjectItem>
+    </Project>
+  </TemplateContent>
+  <WizardExtension>
+    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+  </WizardExtension>
+  <WizardData>
+    <packages repository="extension" repositoryId="ScriptSharp.Extension.Templates">
+      <package id="ScriptSharp" version="0.7.6" />
+      <package id="ScriptSharp.Lib.HTML" version="0.7.6" />
+    </packages>
+  </WizardData>
+</VSTemplate>
diff --git a/src/ZipX/ProjectTemplates/ClassLibrary/FxCop.ruleset b/src/ZipX/ProjectTemplates/ClassLibrary/FxCop.ruleset
new file mode 100644
index 000000000..47c160f61
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/ClassLibrary/FxCop.ruleset
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Script# Rules" Description="General Script Rules" ToolsVersion="10.0">
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1000" Action="Warning" />
+    <Rule Id="CA1001" Action="Warning" />
+    <Rule Id="CA1008" Action="Warning" />
+    <Rule Id="CA1009" Action="Warning" />
+    <Rule Id="CA1010" Action="Warning" />
+    <Rule Id="CA1011" Action="Warning" />
+    <Rule Id="CA1012" Action="Warning" />
+    <Rule Id="CA1013" Action="Warning" />
+    <Rule Id="CA1016" Action="Warning" />
+    <Rule Id="CA1018" Action="Warning" />
+    <Rule Id="CA1019" Action="Warning" />
+    <Rule Id="CA1020" Action="Warning" />
+    <Rule Id="CA1021" Action="Warning" />
+    <Rule Id="CA1023" Action="Warning" />
+    <Rule Id="CA1024" Action="Warning" />
+    <Rule Id="CA1026" Action="Warning" />
+    <Rule Id="CA1027" Action="Warning" />
+    <Rule Id="CA1028" Action="Warning" />
+    <Rule Id="CA1030" Action="Warning" />
+    <Rule Id="CA1032" Action="Warning" />
+    <Rule Id="CA1033" Action="Warning" />
+    <Rule Id="CA1034" Action="Warning" />
+    <Rule Id="CA1036" Action="Warning" />
+    <Rule Id="CA1040" Action="Warning" />
+    <Rule Id="CA1041" Action="Warning" />
+    <Rule Id="CA1043" Action="Warning" />
+    <Rule Id="CA1044" Action="Warning" />
+    <Rule Id="CA1045" Action="Warning" />
+    <Rule Id="CA1046" Action="Warning" />
+    <Rule Id="CA1047" Action="Warning" />
+    <Rule Id="CA1048" Action="Warning" />
+    <Rule Id="CA1052" Action="Warning" />
+    <Rule Id="CA1053" Action="Warning" />
+    <Rule Id="CA1058" Action="Warning" />
+    <Rule Id="CA1059" Action="Warning" />
+    <Rule Id="CA1061" Action="Warning" />
+    <Rule Id="CA1065" Action="Warning" />
+    <Rule Id="CA1500" Action="Warning" />
+    <Rule Id="CA1501" Action="Warning" />
+    <Rule Id="CA1502" Action="Warning" />
+    <Rule Id="CA1504" Action="Warning" />
+    <Rule Id="CA1505" Action="Warning" />
+    <Rule Id="CA1506" Action="Warning" />
+    <Rule Id="CA1700" Action="Warning" />
+    <Rule Id="CA1701" Action="Warning" />
+    <Rule Id="CA1702" Action="Warning" />
+    <Rule Id="CA1703" Action="Warning" />
+    <Rule Id="CA1704" Action="Warning" />
+    <Rule Id="CA1707" Action="Warning" />
+    <Rule Id="CA1708" Action="Warning" />
+    <Rule Id="CA1709" Action="Warning" />
+    <Rule Id="CA1710" Action="Warning" />
+    <Rule Id="CA1711" Action="Warning" />
+    <Rule Id="CA1712" Action="Warning" />
+    <Rule Id="CA1713" Action="Warning" />
+    <Rule Id="CA1714" Action="Warning" />
+    <Rule Id="CA1715" Action="Warning" />
+    <Rule Id="CA1716" Action="Warning" />
+    <Rule Id="CA1717" Action="Warning" />
+    <Rule Id="CA1719" Action="Warning" />
+    <Rule Id="CA1720" Action="Warning" />
+    <Rule Id="CA1721" Action="Warning" />
+    <Rule Id="CA1722" Action="Warning" />
+    <Rule Id="CA1724" Action="Warning" />
+    <Rule Id="CA1725" Action="Warning" />
+    <Rule Id="CA1726" Action="Warning" />
+    <Rule Id="CA1800" Action="Warning" />
+    <Rule Id="CA1801" Action="Warning" />
+    <Rule Id="CA1802" Action="Warning" />
+    <Rule Id="CA1804" Action="Warning" />
+    <Rule Id="CA1806" Action="Warning" />
+    <Rule Id="CA1809" Action="Warning" />
+    <Rule Id="CA1811" Action="Warning" />
+    <Rule Id="CA1812" Action="Warning" />
+    <Rule Id="CA1813" Action="Warning" />
+    <Rule Id="CA1814" Action="Warning" />
+    <Rule Id="CA1815" Action="Warning" />
+    <Rule Id="CA1819" Action="Warning" />
+    <Rule Id="CA1820" Action="Warning" />
+    <Rule Id="CA1821" Action="Warning" />
+    <Rule Id="CA2201" Action="Warning" />
+    <Rule Id="CA2202" Action="Warning" />
+    <Rule Id="CA2204" Action="Warning" />
+    <Rule Id="CA2207" Action="Warning" />
+    <Rule Id="CA2213" Action="Warning" />
+    <Rule Id="CA2214" Action="Warning" />
+    <Rule Id="CA2215" Action="Warning" />
+    <Rule Id="CA2217" Action="Warning" />
+    <Rule Id="CA2218" Action="Warning" />
+    <Rule Id="CA2219" Action="Warning" />
+    <Rule Id="CA2222" Action="Warning" />
+    <Rule Id="CA2223" Action="Warning" />
+    <Rule Id="CA2224" Action="Warning" />
+    <Rule Id="CA2226" Action="Warning" />
+    <Rule Id="CA2227" Action="Warning" />
+    <Rule Id="CA2233" Action="Warning" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/src/ZipX/ProjectTemplates/ClassLibrary/Script.template b/src/ZipX/ProjectTemplates/ClassLibrary/Script.template
new file mode 100644
index 000000000..d0fad56de
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/ClassLibrary/Script.template
@@ -0,0 +1,8 @@
+//! #= ScriptFile ##
+//
+
+(function() {
+#include[as-is] "%code%"
+})();
+
+//! This script was generated using Script# v#= CompilerVersion ##
diff --git a/src/ZipX/ProjectTemplates/ImportLibrary/AssemblyInfo.cs b/src/ZipX/ProjectTemplates/ImportLibrary/AssemblyInfo.cs
new file mode 100644
index 000000000..53d3c0162
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/ImportLibrary/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("$projectname$")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("$registeredorganization$")]
+[assembly: AssemblyProduct("$projectname$")]
+[assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("$safeprojectname$")]
diff --git a/src/ZipX/ProjectTemplates/ImportLibrary/Class1.cs b/src/ZipX/ProjectTemplates/ImportLibrary/Class1.cs
new file mode 100644
index 000000000..4f872e9ca
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/ImportLibrary/Class1.cs
@@ -0,0 +1,12 @@
+// Class1.cs
+//
+
+using System;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+namespace $safeprojectname$ {
+
+    public class Class1 {
+    }
+}
diff --git a/src/ZipX/ProjectTemplates/ImportLibrary/ImportLibrary.csproj b/src/ZipX/ProjectTemplates/ImportLibrary/ImportLibrary.csproj
new file mode 100644
index 000000000..e89235e47
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/ImportLibrary/ImportLibrary.csproj
@@ -0,0 +1,39 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>$guid1$</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <FileAlignment>512</FileAlignment>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>$safeprojectname$</RootNamespace>
+    <AssemblyName>$safeprojectname$</AssemblyName>
+   </PropertyGroup>
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <DocumentationFile>bin\Debug\$safeprojectname$.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants></DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>1591, 0661, 0660, 1684</NoWarn>
+    <DocumentationFile>bin\Release\$safeprojectname$.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <ScriptInfo Include="Properties\ScriptInfo.txt" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Class1.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(ScriptInfo)" DestinationFiles="$(OutputPath)$(AssemblyName).txt" />
+  </Target>
+</Project>
diff --git a/src/ZipX/ProjectTemplates/ImportLibrary/ImportLibrary.vstemplate b/src/ZipX/ProjectTemplates/ImportLibrary/ImportLibrary.vstemplate
new file mode 100644
index 000000000..bf9b55f62
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/ImportLibrary/ImportLibrary.vstemplate
@@ -0,0 +1,29 @@
+<VSTemplate Version="2.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Import Library</Name>
+    <Description>An assembly defining existing script APIs to import for use in Script#.</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4547" />
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>100</SortOrder>
+    <CreateNewFolder>true</CreateNewFolder>
+    <DefaultName>ImportLibrary</DefaultName>
+    <ProvideDefaultName>true</ProvideDefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <Project File="ImportLibrary.csproj" ReplaceParameters="true">
+      <ProjectItem TargetFileName="Properties\ScriptInfo.txt">ScriptInfo.txt</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="Properties\AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" OpenInEditor="true">Class1.cs</ProjectItem>
+    </Project>
+  </TemplateContent>
+  <WizardExtension>
+    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+  </WizardExtension>
+  <WizardData>
+    <packages repository="extension" repositoryId="ScriptSharp.Extension.Templates">
+      <package id="ScriptSharp" version="0.7.6" />
+      <package id="ScriptSharp.Lib.HTML" version="0.7.6" />
+    </packages>
+  </WizardData>
+</VSTemplate>
diff --git a/src/ZipX/ProjectTemplates/ImportLibrary/ScriptInfo.txt b/src/ZipX/ProjectTemplates/ImportLibrary/ScriptInfo.txt
new file mode 100644
index 000000000..802afb692
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/ImportLibrary/ScriptInfo.txt
@@ -0,0 +1,12 @@
+Script Information
+===============================================================================
+
+This assembly provides access to script APIs. This is only meant for use at
+development time, so you can reference and compile your c# code against the
+script APIs. You must include the appropriate scripts in your page for
+runtime functionality.
+
+# TODO: You can use this file to describe which version of the script
+#       your import library is based on, the URLs of associated scripts
+#       or any particular usage information for including those scripts
+#       into the application.
diff --git a/src/ZipX/ProjectTemplates/UnitTest/AssemblyInfo.cs b/src/ZipX/ProjectTemplates/UnitTest/AssemblyInfo.cs
new file mode 100644
index 000000000..0151e08ad
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/UnitTest/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("$projectname$")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("$registeredorganization$")]
+[assembly: AssemblyProduct("$projectname$")]
+[assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/src/ZipX/ProjectTemplates/UnitTest/QUnit.css b/src/ZipX/ProjectTemplates/UnitTest/QUnit.css
new file mode 100644
index 000000000..a9b4f5903
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/UnitTest/QUnit.css
@@ -0,0 +1,112 @@
+ol#qunit-tests {
+	font-family:Calibri, Helvetica, Arial;
+	margin:0;
+	padding:0;
+	list-style-position:inside;
+	font-size: smaller;
+}
+ol#qunit-tests li{
+	padding:0.4em 0.5em 0.4em 2.5em;
+	border-bottom:1px solid #fff;
+	font-size:small;
+	list-style-position:inside;
+}
+ol#qunit-tests li ol{
+	box-shadow: inset 0px 2px 13px #999;
+	-moz-box-shadow: inset 0px 2px 13px #999;
+	-webkit-box-shadow: inset 0px 2px 13px #999;
+	margin-top:0.5em;
+	margin-left:0;
+	padding:0.5em;
+	background-color:#fff;
+}
+ol#qunit-tests li li{
+	border-bottom:none;
+	margin:0.5em;
+	background-color:#fff;
+	list-style-position: inside;
+	padding:0.4em 0.5em 0.4em 0.5em;
+}
+ol#qunit-tests li li.pass{
+	border-left:26px solid #C6E746;
+	background-color:#fff;
+	color:#5E740B;
+}
+ol#qunit-tests li li.fail{
+	border-left:26px solid #EE5757;
+	background-color:#fff;
+	color:#710909;
+}
+ol#qunit-tests li.pass{
+	background-color:#D2E0E6;
+	color:#528CE0;
+}
+ol#qunit-tests li.fail{
+	background-color:#EE5757;
+	color:#000;
+}
+ol#qunit-tests li strong {
+	cursor:pointer;
+}
+h1#qunit-header{
+	background-color:#0d3349;
+	margin:0;
+	padding:0.5em 0 0.5em 1em;
+	color:#fff;
+	font-family:Calibri, Helvetica, Arial;
+	border-top-right-radius:15px;
+	border-top-left-radius:15px;
+	-moz-border-radius-topright:15px;
+	-moz-border-radius-topleft:15px;
+	-webkit-border-top-right-radius:15px;
+	-webkit-border-top-left-radius:15px;
+	text-shadow: rgba(0, 0, 0, 0.5) 4px 4px 1px;
+}
+h2#qunit-banner{
+	font-family:Calibri, Helvetica, Arial;
+	height:5px;
+	margin:0;
+	padding:0;
+}
+h2#qunit-banner.qunit-pass{
+	background-color:#C6E746;
+}
+h2#qunit-banner.qunit-fail, #qunit-testrunner-toolbar {
+	background-color:#EE5757;
+}
+#qunit-testrunner-toolbar {
+	font-family:Calibri, Helvetica, Arial;
+	padding:0;
+	padding:0em 0 0.5em 2em;
+	font-size: small;
+}
+h2#qunit-userAgent {
+	font-family:Calibri, Helvetica, Arial;
+	background-color:#2b81af;
+	margin:0;
+	padding:0;
+	color:#fff;
+	font-size: small;
+	padding:0.5em 0 0.5em 2.5em;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+p#qunit-testresult{
+	font-family:Calibri, Helvetica, Arial;
+	margin:0;
+	font-size: small;
+	color:#2b81af;
+	border-bottom-right-radius:15px;
+	border-bottom-left-radius:15px;
+	-moz-border-radius-bottomright:15px;
+	-moz-border-radius-bottomleft:15px;
+	-webkit-border-bottom-right-radius:15px;
+	-webkit-border-bottom-left-radius:15px;
+	background-color:#D2E0E6;
+	padding:0.5em 0.5em 0.5em 2.5em;
+}
+strong b.fail{
+	color:#710909;
+}
+strong b.pass{
+	color:#5E740B;
+}
diff --git a/src/ZipX/ProjectTemplates/UnitTest/QUnit.js b/src/ZipX/ProjectTemplates/UnitTest/QUnit.js
new file mode 100644
index 000000000..f2704148e
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/UnitTest/QUnit.js
@@ -0,0 +1,1043 @@
+/*
+ * QUnit - A JavaScript Unit Testing Framework
+ * 
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2009 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ */
+
+(function(window) {
+
+var QUnit = {
+
+	// Initialize the configuration options
+	init: function() {
+		config = {
+			stats: { all: 0, bad: 0 },
+			moduleStats: { all: 0, bad: 0 },
+			started: +new Date,
+			blocking: false,
+			autorun: false,
+			assertions: [],
+			filters: [],
+			queue: []
+		};
+
+		var tests = id("qunit-tests"),
+			banner = id("qunit-banner"),
+			result = id("qunit-testresult");
+
+		if ( tests ) {
+			tests.innerHTML = "";
+		}
+
+		if ( banner ) {
+			banner.className = "";
+		}
+
+		if ( result ) {
+			result.parentNode.removeChild( result );
+		}
+	},
+	
+	// call on start of module test to prepend name to all tests
+	module: function(name, testEnvironment) {
+		config.currentModule = name;
+
+		synchronize(function() {
+			if ( config.currentModule ) {
+				QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all );
+			}
+
+			config.currentModule = name;
+			config.moduleTestEnvironment = testEnvironment;
+			config.moduleStats = { all: 0, bad: 0 };
+
+			QUnit.moduleStart( name, testEnvironment );
+		});
+	},
+
+	asyncTest: function(testName, expected, callback) {
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = 0;
+		}
+
+		QUnit.test(testName, expected, callback, true);
+	},
+	
+	test: function(testName, expected, callback, async) {
+		var name = testName, testEnvironment, testEnvironmentArg;
+
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = null;
+		}
+		// is 2nd argument a testEnvironment?
+		if ( expected && typeof expected === 'object') {
+			testEnvironmentArg =  expected;
+			expected = null;
+		}
+
+		if ( config.currentModule ) {
+			name = config.currentModule + " module: " + name;
+		}
+
+		if ( !validTest(name) ) {
+			return;
+		}
+
+		synchronize(function() {
+			QUnit.testStart( testName );
+
+			testEnvironment = extend({
+				setup: function() {},
+				teardown: function() {}
+			}, config.moduleTestEnvironment);
+			if (testEnvironmentArg) {
+				extend(testEnvironment,testEnvironmentArg);
+			}
+
+			// allow utility functions to access the current test environment
+			QUnit.current_testEnvironment = testEnvironment;
+			
+			config.assertions = [];
+			config.expected = expected;
+
+			try {
+				if ( !config.pollution ) {
+					saveGlobal();
+				}
+
+				testEnvironment.setup.call(testEnvironment);
+			} catch(e) {
+				QUnit.ok( false, "Setup failed on " + name + ": " + e.message );
+			}
+
+			if ( async ) {
+				QUnit.stop();
+			}
+
+			try {
+				callback.call(testEnvironment);
+			} catch(e) {
+				fail("Test " + name + " died, exception and test follows", e, callback);
+				QUnit.ok( false, "Died on test #" + (config.assertions.length + 1) + ": " + e.message );
+				// else next test will carry the responsibility
+				saveGlobal();
+
+				// Restart the tests if they're blocking
+				if ( config.blocking ) {
+					start();
+				}
+			}
+		});
+
+		synchronize(function() {
+			try {
+				checkPollution();
+				testEnvironment.teardown.call(testEnvironment);
+			} catch(e) {
+				QUnit.ok( false, "Teardown failed on " + name + ": " + e.message );
+			}
+
+			try {
+				QUnit.reset();
+			} catch(e) {
+				fail("reset() failed, following Test " + name + ", exception and reset fn follows", e, reset);
+			}
+
+			if ( config.expected && config.expected != config.assertions.length ) {
+				QUnit.ok( false, "Expected " + config.expected + " assertions, but " + config.assertions.length + " were run" );
+			}
+
+			var good = 0, bad = 0,
+				tests = id("qunit-tests");
+
+			config.stats.all += config.assertions.length;
+			config.moduleStats.all += config.assertions.length;
+
+			if ( tests ) {
+				var ol  = document.createElement("ol");
+				ol.style.display = "none";
+
+				for ( var i = 0; i < config.assertions.length; i++ ) {
+					var assertion = config.assertions[i];
+
+					var li = document.createElement("li");
+					li.className = assertion.result ? "pass" : "fail";
+					li.appendChild(document.createTextNode(assertion.message || "(no message)"));
+					ol.appendChild( li );
+
+					if ( assertion.result ) {
+						good++;
+					} else {
+						bad++;
+						config.stats.bad++;
+						config.moduleStats.bad++;
+					}
+				}
+
+				var b = document.createElement("strong");
+				b.innerHTML = name + " <b style='color:black;'>(<b class='fail'>" + bad + "</b>, <b class='pass'>" + good + "</b>, " + config.assertions.length + ")</b>";
+				
+				addEvent(b, "click", function() {
+					var next = b.nextSibling, display = next.style.display;
+					next.style.display = display === "none" ? "block" : "none";
+				});
+				
+				addEvent(b, "dblclick", function(e) {
+					var target = e && e.target ? e.target : window.event.srcElement;
+					if ( target.nodeName.toLowerCase() === "strong" ) {
+						var text = "", node = target.firstChild;
+
+						while ( node.nodeType === 3 ) {
+							text += node.nodeValue;
+							node = node.nextSibling;
+						}
+
+						text = text.replace(/(^\s*|\s*$)/g, "");
+
+						if ( window.location ) {
+							window.location.href = window.location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent(text);
+						}
+					}
+				});
+
+				var li = document.createElement("li");
+				li.className = bad ? "fail" : "pass";
+				li.appendChild( b );
+				li.appendChild( ol );
+				tests.appendChild( li );
+
+				if ( bad ) {
+					var toolbar = id("qunit-testrunner-toolbar");
+					if ( toolbar ) {
+						toolbar.style.display = "block";
+						id("qunit-filter-pass").disabled = null;
+						id("qunit-filter-missing").disabled = null;
+					}
+				}
+
+			} else {
+				for ( var i = 0; i < config.assertions.length; i++ ) {
+					if ( !config.assertions[i].result ) {
+						bad++;
+						config.stats.bad++;
+						config.moduleStats.bad++;
+					}
+				}
+			}
+
+			QUnit.testDone( testName, bad, config.assertions.length );
+
+			if ( !window.setTimeout && !config.queue.length ) {
+				done();
+			}
+		});
+
+		if ( window.setTimeout && !config.doneTimer ) {
+			config.doneTimer = window.setTimeout(function(){
+				if ( !config.queue.length ) {
+					done();
+				} else {
+					synchronize( done );
+				}
+			}, 13);
+		}
+	},
+	
+	/**
+	 * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+	 */
+	expect: function(asserts) {
+		config.expected = asserts;
+	},
+
+	/**
+	 * Asserts true.
+	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
+	 */
+	ok: function(a, msg) {
+		QUnit.log(a, msg);
+
+		config.assertions.push({
+			result: !!a,
+			message: msg
+		});
+	},
+
+	/**
+	 * Checks that the first two arguments are equal, with an optional message.
+	 * Prints out both actual and expected values.
+	 *
+	 * Prefered to ok( actual == expected, message )
+	 *
+	 * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." );
+	 *
+	 * @param Object actual
+	 * @param Object expected
+	 * @param String message (optional)
+	 */
+	equal: function(actual, expected, message) {
+		push(expected == actual, actual, expected, message);
+	},
+
+	notEqual: function(actual, expected, message) {
+		push(expected != actual, actual, expected, message);
+	},
+	
+	deepEqual: function(a, b, message) {
+		push(QUnit.equiv(a, b), a, b, message);
+	},
+
+	notDeepEqual: function(a, b, message) {
+		push(!QUnit.equiv(a, b), a, b, message);
+	},
+
+	strictEqual: function(actual, expected, message) {
+		push(expected === actual, actual, expected, message);
+	},
+
+	notStrictEqual: function(actual, expected, message) {
+		push(expected !== actual, actual, expected, message);
+	},
+	
+	start: function() {
+		// A slight delay, to avoid any current callbacks
+		if ( window.setTimeout ) {
+			window.setTimeout(function() {
+				if ( config.timeout ) {
+					clearTimeout(config.timeout);
+				}
+
+				config.blocking = false;
+				process();
+			}, 13);
+		} else {
+			config.blocking = false;
+			process();
+		}
+	},
+	
+	stop: function(timeout) {
+		config.blocking = true;
+
+		if ( timeout && window.setTimeout ) {
+			config.timeout = window.setTimeout(function() {
+				QUnit.ok( false, "Test timed out" );
+				QUnit.start();
+			}, timeout);
+		}
+	},
+	
+	/**
+	 * Resets the test setup. Useful for tests that modify the DOM.
+	 */
+	reset: function() {
+		if ( window.jQuery ) {
+			jQuery("#main").html( config.fixture );
+			jQuery.event.global = {};
+			jQuery.ajaxSettings = extend({}, config.ajaxSettings);
+		}
+	},
+	
+	/**
+	 * Trigger an event on an element.
+	 *
+	 * @example triggerEvent( document.body, "click" );
+	 *
+	 * @param DOMElement elem
+	 * @param String type
+	 */
+	triggerEvent: function( elem, type, event ) {
+		if ( document.createEvent ) {
+			event = document.createEvent("MouseEvents");
+			event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
+				0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			elem.dispatchEvent( event );
+
+		} else if ( elem.fireEvent ) {
+			elem.fireEvent("on"+type);
+		}
+	},
+	
+	// Safe object type checking
+	is: function( type, obj ) {
+		return Object.prototype.toString.call( obj ) === "[object "+ type +"]";
+	},
+	
+	// Logging callbacks
+	done: function(failures, total) {},
+	log: function(result, message) {},
+	testStart: function(name) {},
+	testDone: function(name, failures, total) {},
+	moduleStart: function(name, testEnvironment) {},
+	moduleDone: function(name, failures, total) {}
+};
+
+// Backwards compatibility, deprecated
+QUnit.equals = QUnit.equal;
+QUnit.same = QUnit.deepEqual;
+
+// Maintain internal state
+var config = {
+	// The queue of tests to run
+	queue: [],
+
+	// block until document ready
+	blocking: true
+};
+
+// Load paramaters
+(function() {
+	var location = window.location || { search: "", protocol: "file:" },
+		GETParams = location.search.slice(1).split('&');
+
+	for ( var i = 0; i < GETParams.length; i++ ) {
+		GETParams[i] = decodeURIComponent( GETParams[i] );
+		if ( GETParams[i] === "noglobals" ) {
+			GETParams.splice( i, 1 );
+			i--;
+			config.noglobals = true;
+		} else if ( GETParams[i].search('=') > -1 ) {
+			GETParams.splice( i, 1 );
+			i--;
+		}
+	}
+	
+	// restrict modules/tests by get parameters
+	config.filters = GETParams;
+	
+	// Figure out if we're running the tests from a server or not
+	QUnit.isLocal = !!(location.protocol === 'file:');
+})();
+
+// Expose the API as global variables, unless an 'exports'
+// object exists, in that case we assume we're in CommonJS
+if ( typeof exports === "undefined" || typeof require === "undefined" ) {
+	extend(window, QUnit);
+	window.QUnit = QUnit;
+} else {
+	extend(exports, QUnit);
+	exports.QUnit = QUnit;
+}
+
+if ( typeof document === "undefined" || document.readyState === "complete" ) {
+	config.autorun = true;
+}
+
+addEvent(window, "load", function() {
+	// Initialize the config, saving the execution queue
+	var oldconfig = extend({}, config);
+	QUnit.init();
+	extend(config, oldconfig);
+
+	config.blocking = false;
+
+	var userAgent = id("qunit-userAgent");
+	if ( userAgent ) {
+		userAgent.innerHTML = navigator.userAgent;
+	}
+	
+	var toolbar = id("qunit-testrunner-toolbar");
+	if ( toolbar ) {
+		toolbar.style.display = "none";
+		
+		var filter = document.createElement("input");
+		filter.type = "checkbox";
+		filter.id = "qunit-filter-pass";
+		filter.disabled = true;
+		addEvent( filter, "click", function() {
+			var li = document.getElementsByTagName("li");
+			for ( var i = 0; i < li.length; i++ ) {
+				if ( li[i].className.indexOf("pass") > -1 ) {
+					li[i].style.display = filter.checked ? "none" : "";
+				}
+			}
+		});
+		toolbar.appendChild( filter );
+
+		var label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-pass");
+		label.innerHTML = "Hide passed tests";
+		toolbar.appendChild( label );
+
+		var missing = document.createElement("input");
+		missing.type = "checkbox";
+		missing.id = "qunit-filter-missing";
+		missing.disabled = true;
+		addEvent( missing, "click", function() {
+			var li = document.getElementsByTagName("li");
+			for ( var i = 0; i < li.length; i++ ) {
+				if ( li[i].className.indexOf("fail") > -1 && li[i].innerHTML.indexOf('missing test - untested code is broken code') > - 1 ) {
+					li[i].parentNode.parentNode.style.display = missing.checked ? "none" : "block";
+				}
+			}
+		});
+		toolbar.appendChild( missing );
+
+		label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-missing");
+		label.innerHTML = "Hide missing tests (untested code is broken code)";
+		toolbar.appendChild( label );
+	}
+
+	var main = id('main');
+	if ( main ) {
+		config.fixture = main.innerHTML;
+	}
+
+	if ( window.jQuery ) {
+		config.ajaxSettings = window.jQuery.ajaxSettings;
+	}
+
+	QUnit.start();
+});
+
+function done() {
+	if ( config.doneTimer && window.clearTimeout ) {
+		window.clearTimeout( config.doneTimer );
+		config.doneTimer = null;
+	}
+
+	if ( config.queue.length ) {
+		config.doneTimer = window.setTimeout(function(){
+			if ( !config.queue.length ) {
+				done();
+			} else {
+				synchronize( done );
+			}
+		}, 13);
+
+		return;
+	}
+
+	config.autorun = true;
+
+	// Log the last module results
+	if ( config.currentModule ) {
+		QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all );
+	}
+
+	var banner = id("qunit-banner"),
+		tests = id("qunit-tests"),
+		html = ['Tests completed in ',
+		+new Date - config.started, ' milliseconds.<br/>',
+		'<span class="passed">', config.stats.all - config.stats.bad, '</span> tests of <span class="total">', config.stats.all, '</span> passed, <span class="failed">', config.stats.bad,'</span> failed.'].join('');
+
+	if ( banner ) {
+		banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass");
+	}
+
+	if ( tests ) {	
+		var result = id("qunit-testresult");
+
+		if ( !result ) {
+			result = document.createElement("p");
+			result.id = "qunit-testresult";
+			result.className = "result";
+			tests.parentNode.insertBefore( result, tests.nextSibling );
+		}
+
+		result.innerHTML = html;
+	}
+
+	QUnit.done( config.stats.bad, config.stats.all );
+}
+
+function validTest( name ) {
+	var i = config.filters.length,
+		run = false;
+
+	if ( !i ) {
+		return true;
+	}
+	
+	while ( i-- ) {
+		var filter = config.filters[i],
+			not = filter.charAt(0) == '!';
+
+		if ( not ) {
+			filter = filter.slice(1);
+		}
+
+		if ( name.indexOf(filter) !== -1 ) {
+			return !not;
+		}
+
+		if ( not ) {
+			run = true;
+		}
+	}
+
+	return run;
+}
+
+function push(result, actual, expected, message) {
+	message = message || (result ? "okay" : "failed");
+	QUnit.ok( result, result ? message + ": " + expected : message + ", expected: " + QUnit.jsDump.parse(expected) + " result: " + QUnit.jsDump.parse(actual) );
+}
+
+function synchronize( callback ) {
+	config.queue.push( callback );
+
+	if ( config.autorun && !config.blocking ) {
+		process();
+	}
+}
+
+function process() {
+	while ( config.queue.length && !config.blocking ) {
+		config.queue.shift()();
+	}
+}
+
+function saveGlobal() {
+	config.pollution = [];
+	
+	if ( config.noglobals ) {
+		for ( var key in window ) {
+			config.pollution.push( key );
+		}
+	}
+}
+
+function checkPollution( name ) {
+	var old = config.pollution;
+	saveGlobal();
+	
+	var newGlobals = diff( old, config.pollution );
+	if ( newGlobals.length > 0 ) {
+		ok( false, "Introduced global variable(s): " + newGlobals.join(", ") );
+		config.expected++;
+	}
+
+	var deletedGlobals = diff( config.pollution, old );
+	if ( deletedGlobals.length > 0 ) {
+		ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") );
+		config.expected++;
+	}
+}
+
+// returns a new Array with the elements that are in a but not in b
+function diff( a, b ) {
+	var result = a.slice();
+	for ( var i = 0; i < result.length; i++ ) {
+		for ( var j = 0; j < b.length; j++ ) {
+			if ( result[i] === b[j] ) {
+				result.splice(i, 1);
+				i--;
+				break;
+			}
+		}
+	}
+	return result;
+}
+
+function fail(message, exception, callback) {
+	if ( typeof console !== "undefined" && console.error && console.warn ) {
+		console.error(message);
+		console.error(exception);
+		console.warn(callback.toString());
+
+	} else if ( window.opera && opera.postError ) {
+		opera.postError(message, exception, callback.toString);
+	}
+}
+
+function extend(a, b) {
+	for ( var prop in b ) {
+		a[prop] = b[prop];
+	}
+
+	return a;
+}
+
+function addEvent(elem, type, fn) {
+	if ( elem.addEventListener ) {
+		elem.addEventListener( type, fn, false );
+	} else if ( elem.attachEvent ) {
+		elem.attachEvent( "on" + type, fn );
+	} else {
+		fn();
+	}
+}
+
+function id(name) {
+	return !!(typeof document !== "undefined" && document && document.getElementById) &&
+		document.getElementById( name );
+}
+
+// Test for equality any JavaScript type.
+// Discussions and reference: http://philrathe.com/articles/equiv
+// Test suites: http://philrathe.com/tests/equiv
+// Author: Philippe Rathé <prathe@gmail.com>
+QUnit.equiv = function () {
+
+    var innerEquiv; // the real equiv function
+    var callers = []; // stack to decide between skip/abort functions
+
+
+    // Determine what is o.
+    function hoozit(o) {
+        if (QUnit.is("String", o)) {
+            return "string";
+            
+        } else if (QUnit.is("Boolean", o)) {
+            return "boolean";
+
+        } else if (QUnit.is("Number", o)) {
+
+            if (isNaN(o)) {
+                return "nan";
+            } else {
+                return "number";
+            }
+
+        } else if (typeof o === "undefined") {
+            return "undefined";
+
+        // consider: typeof null === object
+        } else if (o === null) {
+            return "null";
+
+        // consider: typeof [] === object
+        } else if (QUnit.is( "Array", o)) {
+            return "array";
+        
+        // consider: typeof new Date() === object
+        } else if (QUnit.is( "Date", o)) {
+            return "date";
+
+        // consider: /./ instanceof Object;
+        //           /./ instanceof RegExp;
+        //          typeof /./ === "function"; // => false in IE and Opera,
+        //                                          true in FF and Safari
+        } else if (QUnit.is( "RegExp", o)) {
+            return "regexp";
+
+        } else if (typeof o === "object") {
+            return "object";
+
+        } else if (QUnit.is( "Function", o)) {
+            return "function";
+        } else {
+            return undefined;
+        }
+    }
+
+    // Call the o related callback with the given arguments.
+    function bindCallbacks(o, callbacks, args) {
+        var prop = hoozit(o);
+        if (prop) {
+            if (hoozit(callbacks[prop]) === "function") {
+                return callbacks[prop].apply(callbacks, args);
+            } else {
+                return callbacks[prop]; // or undefined
+            }
+        }
+    }
+    
+    var callbacks = function () {
+
+        // for string, boolean, number and null
+        function useStrictEquality(b, a) {
+            if (b instanceof a.constructor || a instanceof b.constructor) {
+                // to catch short annotaion VS 'new' annotation of a declaration
+                // e.g. var i = 1;
+                //      var j = new Number(1);
+                return a == b;
+            } else {
+                return a === b;
+            }
+        }
+
+        return {
+            "string": useStrictEquality,
+            "boolean": useStrictEquality,
+            "number": useStrictEquality,
+            "null": useStrictEquality,
+            "undefined": useStrictEquality,
+
+            "nan": function (b) {
+                return isNaN(b);
+            },
+
+            "date": function (b, a) {
+                return hoozit(b) === "date" && a.valueOf() === b.valueOf();
+            },
+
+            "regexp": function (b, a) {
+                return hoozit(b) === "regexp" &&
+                    a.source === b.source && // the regex itself
+                    a.global === b.global && // and its modifers (gmi) ...
+                    a.ignoreCase === b.ignoreCase &&
+                    a.multiline === b.multiline;
+            },
+
+            // - skip when the property is a method of an instance (OOP)
+            // - abort otherwise,
+            //   initial === would have catch identical references anyway
+            "function": function () {
+                var caller = callers[callers.length - 1];
+                return caller !== Object &&
+                        typeof caller !== "undefined";
+            },
+
+            "array": function (b, a) {
+                var i;
+                var len;
+
+                // b could be an object literal here
+                if ( ! (hoozit(b) === "array")) {
+                    return false;
+                }
+
+                len = a.length;
+                if (len !== b.length) { // safe and faster
+                    return false;
+                }
+                for (i = 0; i < len; i++) {
+                    if ( ! innerEquiv(a[i], b[i])) {
+                        return false;
+                    }
+                }
+                return true;
+            },
+
+            "object": function (b, a) {
+                var i;
+                var eq = true; // unless we can proove it
+                var aProperties = [], bProperties = []; // collection of strings
+
+                // comparing constructors is more strict than using instanceof
+                if ( a.constructor !== b.constructor) {
+                    return false;
+                }
+
+                // stack constructor before traversing properties
+                callers.push(a.constructor);
+
+                for (i in a) { // be strict: don't ensures hasOwnProperty and go deep
+
+                    aProperties.push(i); // collect a's properties
+
+                    if ( ! innerEquiv(a[i], b[i])) {
+                        eq = false;
+                        break;
+                    }
+                }
+
+                callers.pop(); // unstack, we are done
+
+                for (i in b) {
+                    bProperties.push(i); // collect b's properties
+                }
+
+                // Ensures identical properties name
+                return eq && innerEquiv(aProperties.sort(), bProperties.sort());
+            }
+        };
+    }();
+
+    innerEquiv = function () { // can take multiple arguments
+        var args = Array.prototype.slice.apply(arguments);
+        if (args.length < 2) {
+            return true; // end transition
+        }
+
+        return (function (a, b) {
+            if (a === b) {
+                return true; // catch the most you can
+            } else if (a === null || b === null || typeof a === "undefined" || typeof b === "undefined" || hoozit(a) !== hoozit(b)) {
+                return false; // don't lose time with error prone cases
+            } else {
+                return bindCallbacks(a, callbacks, [b, a]);
+            }
+
+        // apply transition with (1..n) arguments
+        })(args[0], args[1]) && arguments.callee.apply(this, args.splice(1, args.length -1));
+    };
+
+    return innerEquiv;
+
+}();
+
+/**
+ * jsDump
+ * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
+ * Date: 5/15/2008
+ * @projectDescription Advanced and extensible data dumping for Javascript.
+ * @version 1.0.0
+ * @author Ariel Flesler
+ * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
+ */
+QUnit.jsDump = (function() {
+	function quote( str ) {
+		return '"' + str.toString().replace(/"/g, '\\"') + '"';
+	};
+	function literal( o ) {
+		return o + '';	
+	};
+	function join( pre, arr, post ) {
+		var s = jsDump.separator(),
+			base = jsDump.indent(),
+			inner = jsDump.indent(1);
+		if ( arr.join )
+			arr = arr.join( ',' + s + inner );
+		if ( !arr )
+			return pre + post;
+		return [ pre, inner + arr, base + post ].join(s);
+	};
+	function array( arr ) {
+		var i = arr.length,	ret = Array(i);					
+		this.up();
+		while ( i-- )
+			ret[i] = this.parse( arr[i] );				
+		this.down();
+		return join( '[', ret, ']' );
+	};
+	
+	var reName = /^function (\w+)/;
+	
+	var jsDump = {
+		parse:function( obj, type ) { //type is used mostly internally, you can fix a (custom)type in advance
+			var	parser = this.parsers[ type || this.typeOf(obj) ];
+			type = typeof parser;			
+			
+			return type == 'function' ? parser.call( this, obj ) :
+				   type == 'string' ? parser :
+				   this.parsers.error;
+		},
+		typeOf:function( obj ) {
+			var type;
+			if ( obj === null ) {
+				type = "null";
+			} else if (typeof obj === "undefined") {
+				type = "undefined";
+			} else if (QUnit.is("RegExp", obj)) {
+				type = "regexp";
+			} else if (QUnit.is("Date", obj)) {
+				type = "date";
+			} else if (QUnit.is("Function", obj)) {
+				type = "function";
+			} else if (QUnit.is("Array", obj)) {
+				type = "array";
+			} else if (QUnit.is("Window", obj) || QUnit.is("global", obj)) {
+				type = "window";
+			} else if (QUnit.is("HTMLDocument", obj)) {
+				type = "document";
+			} else if (QUnit.is("HTMLCollection", obj) || QUnit.is("NodeList", obj)) {
+				type = "nodelist";
+			} else if (/^\[object HTML/.test(Object.prototype.toString.call( obj ))) {
+				type = "node";
+			} else {
+				type = typeof obj;
+			}
+			return type;
+		},
+		separator:function() {
+			return this.multiline ?	this.HTML ? '<br />' : '\n' : this.HTML ? '&nbsp;' : ' ';
+		},
+		indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing
+			if ( !this.multiline )
+				return '';
+			var chr = this.indentChar;
+			if ( this.HTML )
+				chr = chr.replace(/\t/g,'   ').replace(/ /g,'&nbsp;');
+			return Array( this._depth_ + (extra||0) ).join(chr);
+		},
+		up:function( a ) {
+			this._depth_ += a || 1;
+		},
+		down:function( a ) {
+			this._depth_ -= a || 1;
+		},
+		setParser:function( name, parser ) {
+			this.parsers[name] = parser;
+		},
+		// The next 3 are exposed so you can use them
+		quote:quote, 
+		literal:literal,
+		join:join,
+		//
+		_depth_: 1,
+		// This is the list of parsers, to modify them, use jsDump.setParser
+		parsers:{
+			window: '[Window]',
+			document: '[Document]',
+			error:'[ERROR]', //when no parser is found, shouldn't happen
+			unknown: '[Unknown]',
+			'null':'null',
+			undefined:'undefined',
+			'function':function( fn ) {
+				var ret = 'function',
+					name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE
+				if ( name )
+					ret += ' ' + name;
+				ret += '(';
+				
+				ret = [ ret, this.parse( fn, 'functionArgs' ), '){'].join('');
+				return join( ret, this.parse(fn,'functionCode'), '}' );
+			},
+			array: array,
+			nodelist: array,
+			arguments: array,
+			object:function( map ) {
+				var ret = [ ];
+				this.up();
+				for ( var key in map )
+					ret.push( this.parse(key,'key') + ': ' + this.parse(map[key]) );
+				this.down();
+				return join( '{', ret, '}' );
+			},
+			node:function( node ) {
+				var open = this.HTML ? '&lt;' : '<',
+					close = this.HTML ? '&gt;' : '>';
+					
+				var tag = node.nodeName.toLowerCase(),
+					ret = open + tag;
+					
+				for ( var a in this.DOMAttrs ) {
+					var val = node[this.DOMAttrs[a]];
+					if ( val )
+						ret += ' ' + a + '=' + this.parse( val, 'attribute' );
+				}
+				return ret + close + open + '/' + tag + close;
+			},
+			functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function
+				var l = fn.length;
+				if ( !l ) return '';				
+				
+				var args = Array(l);
+				while ( l-- )
+					args[l] = String.fromCharCode(97+l);//97 is 'a'
+				return ' ' + args.join(', ') + ' ';
+			},
+			key:quote, //object calls it internally, the key part of an item in a map
+			functionCode:'[code]', //function calls it internally, it's the content of the function
+			attribute:quote, //node calls it internally, it's an html attribute value
+			string:quote,
+			date:quote,
+			regexp:literal, //regex
+			number:literal,
+			'boolean':literal
+		},
+		DOMAttrs:{//attributes to dump from nodes, name=>realName
+			id:'id',
+			name:'name',
+			'class':'className'
+		},
+		HTML:true,//if true, entities are escaped ( <, >, \t, space and \n )
+		indentChar:'   ',//indentation unit
+		multiline:true //if true, items in a collection, are separated by a \n, else just a space.
+	};
+
+	return jsDump;
+})();
+
+})(this);
diff --git a/src/ZipX/ProjectTemplates/UnitTest/QUnitExt.js b/src/ZipX/ProjectTemplates/UnitTest/QUnitExt.js
new file mode 100644
index 000000000..2e268d688
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/UnitTest/QUnitExt.js
@@ -0,0 +1,59 @@
+(function() {
+  var currentModule = null;
+  var logData = '';
+  
+  function appendLog(logText) {
+    logData = logData + logText + '\r\n';
+
+    var logHolder = document.getElementById('qunit-log');
+    if (logHolder) {
+      logHolder.value = logData;
+    }
+  }
+  
+  QUnit.log = function(result, message) {
+    if (arguments.length === 1) {
+      message = arguments[0];
+    }
+    appendLog('    ' + message);
+  }
+
+  QUnit.done = function(failures, total) {
+      appendLog('\r\nCompleted; ' + 'failures = ' + failures + '; total = ' + total);
+
+      var logUrl = '/log/' + ((failures === 0) ? 'success' : 'failure');
+      var xhr = new XMLHttpRequest();
+      xhr.onreadystatechange = function() {
+        if (xhr.readyState == 4) {
+          window.open('', '_self', '');
+          window.close();
+        }
+      };
+      xhr.open('POST', logUrl, /* async */ false);
+      xhr.setRequestHeader('Content-Type', 'text/plain');
+      xhr.send(logData);
+  }
+
+  QUnit.testStart = function(name) {
+    appendLog('  Test Started: ' + name);
+  }
+  
+  QUnit.testDone = function(name, failures, total) {
+    appendLog('  Test Done: ' + name + '; failures = ' + failures + '; total = ' + total);
+    appendLog('');
+  }
+
+  QUnit.moduleStart = function(name, testEnv) {
+    currentModule = name;
+    appendLog('Module Started: ' + name);
+  }
+
+  QUnit.moduleDone = function(name, failures, total) {
+    if (name === currentModule) {
+      appendLog('Module Done: ' + name + '; failures = ' + failures + '; total = ' + total + '\r\n');
+      appendLog('');
+      appendLog('');
+    }
+    currentModule = null;
+  }
+})();
diff --git a/src/ZipX/ProjectTemplates/UnitTest/TestClass1.cs b/src/ZipX/ProjectTemplates/UnitTest/TestClass1.cs
new file mode 100644
index 000000000..34265524f
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/UnitTest/TestClass1.cs
@@ -0,0 +1,80 @@
+// TestClass1.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using ScriptSharp.Testing;
+
+namespace $safeprojectname$ {
+
+    [TestClass]
+    [DeploymentItem("$projectname$\\Web", "Web")]
+    // TODO: Add other deployment items that are needed for the test, to be
+    //       placed within the web site created for the test.
+    //       For example, mscorlib scripts, test scripts and dependencies
+    //       The first parameter to DeploymentItem is a solution-relative
+    //       path to the file, and the 2nd parameter is to deployment directory
+    //       relative to the test output directory.
+    public class TestClass1 {
+
+        private static WebTest _webTest;
+
+        public TestContext TestContext {
+            get;
+            set;
+        }
+
+        [ClassInitialize()]
+        public static void OnInitialize(TestContext testContext) {
+            // This starts the web server rooted at the specified directory
+            // on http://localhost:<port>
+
+            string webRoot = Path.Combine(testContext.DeploymentDirectory, "Web");
+            int port = 3976;
+
+            _webTest = new WebTest();
+            _webTest.StartWebServer(webRoot, port);
+        }
+
+        [ClassCleanup()]
+        public static void OnCleanup() {
+            _webTest.StopWebServer();
+        }
+
+        #region Per-test Initialization/Cleanup
+        // Use TestInitialize to run code before running each test 
+        // [TestInitialize()]
+        // public void OnTestInitialize() {
+        // }
+        //
+        // Use TestCleanup to run code after each test has run
+        // [TestCleanup()]
+        // public void OnTestCleanup() {
+        // }
+        //
+        #endregion
+
+        [TestMethod]
+        public void TestMethod1() {
+            // TestClass1.htm is in the Web directory, and gets deployed along with all
+            // content of the Web directory per the metadata on the class.
+            // You need to edit it to include HTML content and scripts you need to run
+            // the test.
+            Uri testUri = _webTest.GetTestUri("/TestClass1.htm");
+
+            // Alternatively you can also use _webTest.CreatePage to register some
+            // content you create dynamically in the test for serving from the web server.
+
+            WebTestResult ieResult = _webTest.RunTest(testUri, WebBrowser.InternetExplorer);
+            Assert.IsTrue(ieResult.Succeeded, "Internet Explorer:\r\n" + ieResult.Log);
+
+            WebTestResult chromeResult = _webTest.RunTest(testUri, WebBrowser.Chrome);
+            Assert.IsTrue(chromeResult.Succeeded, "Chrome:\r\n" + chromeResult.Log);
+
+            WebTestResult ffResult = _webTest.RunTest(testUri, WebBrowser.Firefox);
+            Assert.IsTrue(ffResult.Succeeded, "Firefox:\r\n" + ffResult.Log);
+        }
+    }
+}
diff --git a/src/ZipX/ProjectTemplates/UnitTest/TestClass1.htm b/src/ZipX/ProjectTemplates/UnitTest/TestClass1.htm
new file mode 100644
index 000000000..ae8d9394b
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/UnitTest/TestClass1.htm
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>$safeprojectname$ - TestClass1</title>
+  <link rel="stylesheet" href="/QUnit.css" type="text/css"/>
+</head>
+<body>
+  <!-- Include any markup you need in the page for use in the test -->
+
+  <div>
+    <h1 id="qunit-header">$safeprojectname$ - TestClass1 Results</h1>
+    <h2 id="qunit-banner"></h2>
+    <h2 id="qunit-userAgent"></h2>
+    <ol id="qunit-tests"></ol>
+    <br />
+    <textarea id="qunit-log" rows="10" cols="100"></textarea>
+  </div>
+
+  <script type="text/javascript" src="/QUnit.js"></script>
+  <script type="text/javascript" src="/QUnitExt.js"></script>
+  <!-- 
+    Include the test flavor of the scripts you need to test (eg. Foo.test.js),
+    after including its dependencies (eg. mscorlib.js).
+  -->
+</body>
+</html>
diff --git a/src/ZipX/ProjectTemplates/UnitTest/UnitTest.csproj b/src/ZipX/ProjectTemplates/UnitTest/UnitTest.csproj
new file mode 100644
index 000000000..c7a0d60fc
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/UnitTest/UnitTest.csproj
@@ -0,0 +1,54 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.0</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>$guid1$</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>$safeprojectname$</RootNamespace>
+    <AssemblyName>$safeprojectname$</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+     <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Content Include="Web\TestClass1.htm" />
+    <Content Include="Web\QUnit.css" />
+    <Content Include="Web\QUnit.js" />
+    <Content Include="Web\QUnitExt.js" />
+    <Compile Include="TestClass1.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/src/ZipX/ProjectTemplates/UnitTest/UnitTest.vstemplate b/src/ZipX/ProjectTemplates/UnitTest/UnitTest.vstemplate
new file mode 100644
index 000000000..492f200ff
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/UnitTest/UnitTest.vstemplate
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VSTemplate Version="3.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>Unit Test</Name>
+    <Description>A unit test project for testing script projects.</Description>
+    <Icon Package="{52CBD135-1F97-2580-011F-C7CD052E44DE}" ID="531"/>
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>50</SortOrder>
+    <CreateNewFolder>true</CreateNewFolder>
+    <PromptForSaveOnCreation>true</PromptForSaveOnCreation>
+    <DefaultName>UnitTests</DefaultName>
+    <ProvideDefaultName>true</ProvideDefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <Project File="UnitTest.csproj" ReplaceParameters="true">
+      <ProjectItem ReplaceParameters="true" TargetFileName="Properties\AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="Web\TestClass1.htm">TestClass1.htm</ProjectItem>
+      <ProjectItem TargetFileName="Web\QUnit.css">QUnit.css</ProjectItem>
+      <ProjectItem TargetFileName="Web\QUnit.js">QUnit.js</ProjectItem>
+      <ProjectItem TargetFileName="Web\QUnitExt.js">QUnitExt.js</ProjectItem>
+      <ProjectItem ReplaceParameters="true" OpenInEditor="true">TestClass1.cs</ProjectItem>
+    </Project>
+  </TemplateContent>
+  <WizardExtension>
+    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+  </WizardExtension>
+  <WizardData>
+    <packages repository="extension" repositoryId="ScriptSharp.Extension.Templates">
+      <package id="ScriptSharp.Testing" version="0.7.5" />
+    </packages>
+  </WizardData>
+</VSTemplate>
diff --git a/src/ZipX/ProjectTemplates/jQueryClassLibrary/AssemblyInfo.cs b/src/ZipX/ProjectTemplates/jQueryClassLibrary/AssemblyInfo.cs
new file mode 100644
index 000000000..53d3c0162
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/jQueryClassLibrary/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("$projectname$")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("$registeredorganization$")]
+[assembly: AssemblyProduct("$projectname$")]
+[assembly: AssemblyCopyright("Copyright © $registeredorganization$ $year$")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
+
+[assembly: ScriptAssembly("$safeprojectname$")]
diff --git a/src/ZipX/ProjectTemplates/jQueryClassLibrary/Class1.cs b/src/ZipX/ProjectTemplates/jQueryClassLibrary/Class1.cs
new file mode 100644
index 000000000..d7449cfe3
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/jQueryClassLibrary/Class1.cs
@@ -0,0 +1,13 @@
+// Class1.cs
+//
+
+using System;
+using System.Collections.Generic;
+using System.Html;
+using jQueryApi;
+
+namespace $safeprojectname$ {
+
+    public class Class1 {
+    }
+}
diff --git a/src/ZipX/ProjectTemplates/jQueryClassLibrary/ClassLibrary.csproj b/src/ZipX/ProjectTemplates/jQueryClassLibrary/ClassLibrary.csproj
new file mode 100644
index 000000000..b75466071
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/jQueryClassLibrary/ClassLibrary.csproj
@@ -0,0 +1,40 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>$guid1$</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>$safeprojectname$</RootNamespace>
+    <AssemblyName>$safeprojectname$</AssemblyName>
+    <ScriptTemplate>Properties\Script.template</ScriptTemplate>
+    <CodeAnalysisRuleSet>Properties\FxCop.ruleset</CodeAnalysisRuleSet>
+    <GenerateScript>True</GenerateScript>
+    <GenerateResources>True</GenerateResources>
+   </PropertyGroup>
+   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Debug\$safeprojectname$.xml</DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>CODE_ANALYSIS;SCRIPTSHARP</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>0028, 1591, 1684</NoWarn>
+    <DocumentationFile>bin\Release\$safeprojectname$.xml</DocumentationFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="Properties\FxCop.ruleset" />
+    <None Include="Properties\Script.template" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Class1.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>
diff --git a/src/ZipX/ProjectTemplates/jQueryClassLibrary/FxCop.ruleset b/src/ZipX/ProjectTemplates/jQueryClassLibrary/FxCop.ruleset
new file mode 100644
index 000000000..47c160f61
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/jQueryClassLibrary/FxCop.ruleset
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Script# Rules" Description="General Script Rules" ToolsVersion="10.0">
+  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
+    <Rule Id="CA1000" Action="Warning" />
+    <Rule Id="CA1001" Action="Warning" />
+    <Rule Id="CA1008" Action="Warning" />
+    <Rule Id="CA1009" Action="Warning" />
+    <Rule Id="CA1010" Action="Warning" />
+    <Rule Id="CA1011" Action="Warning" />
+    <Rule Id="CA1012" Action="Warning" />
+    <Rule Id="CA1013" Action="Warning" />
+    <Rule Id="CA1016" Action="Warning" />
+    <Rule Id="CA1018" Action="Warning" />
+    <Rule Id="CA1019" Action="Warning" />
+    <Rule Id="CA1020" Action="Warning" />
+    <Rule Id="CA1021" Action="Warning" />
+    <Rule Id="CA1023" Action="Warning" />
+    <Rule Id="CA1024" Action="Warning" />
+    <Rule Id="CA1026" Action="Warning" />
+    <Rule Id="CA1027" Action="Warning" />
+    <Rule Id="CA1028" Action="Warning" />
+    <Rule Id="CA1030" Action="Warning" />
+    <Rule Id="CA1032" Action="Warning" />
+    <Rule Id="CA1033" Action="Warning" />
+    <Rule Id="CA1034" Action="Warning" />
+    <Rule Id="CA1036" Action="Warning" />
+    <Rule Id="CA1040" Action="Warning" />
+    <Rule Id="CA1041" Action="Warning" />
+    <Rule Id="CA1043" Action="Warning" />
+    <Rule Id="CA1044" Action="Warning" />
+    <Rule Id="CA1045" Action="Warning" />
+    <Rule Id="CA1046" Action="Warning" />
+    <Rule Id="CA1047" Action="Warning" />
+    <Rule Id="CA1048" Action="Warning" />
+    <Rule Id="CA1052" Action="Warning" />
+    <Rule Id="CA1053" Action="Warning" />
+    <Rule Id="CA1058" Action="Warning" />
+    <Rule Id="CA1059" Action="Warning" />
+    <Rule Id="CA1061" Action="Warning" />
+    <Rule Id="CA1065" Action="Warning" />
+    <Rule Id="CA1500" Action="Warning" />
+    <Rule Id="CA1501" Action="Warning" />
+    <Rule Id="CA1502" Action="Warning" />
+    <Rule Id="CA1504" Action="Warning" />
+    <Rule Id="CA1505" Action="Warning" />
+    <Rule Id="CA1506" Action="Warning" />
+    <Rule Id="CA1700" Action="Warning" />
+    <Rule Id="CA1701" Action="Warning" />
+    <Rule Id="CA1702" Action="Warning" />
+    <Rule Id="CA1703" Action="Warning" />
+    <Rule Id="CA1704" Action="Warning" />
+    <Rule Id="CA1707" Action="Warning" />
+    <Rule Id="CA1708" Action="Warning" />
+    <Rule Id="CA1709" Action="Warning" />
+    <Rule Id="CA1710" Action="Warning" />
+    <Rule Id="CA1711" Action="Warning" />
+    <Rule Id="CA1712" Action="Warning" />
+    <Rule Id="CA1713" Action="Warning" />
+    <Rule Id="CA1714" Action="Warning" />
+    <Rule Id="CA1715" Action="Warning" />
+    <Rule Id="CA1716" Action="Warning" />
+    <Rule Id="CA1717" Action="Warning" />
+    <Rule Id="CA1719" Action="Warning" />
+    <Rule Id="CA1720" Action="Warning" />
+    <Rule Id="CA1721" Action="Warning" />
+    <Rule Id="CA1722" Action="Warning" />
+    <Rule Id="CA1724" Action="Warning" />
+    <Rule Id="CA1725" Action="Warning" />
+    <Rule Id="CA1726" Action="Warning" />
+    <Rule Id="CA1800" Action="Warning" />
+    <Rule Id="CA1801" Action="Warning" />
+    <Rule Id="CA1802" Action="Warning" />
+    <Rule Id="CA1804" Action="Warning" />
+    <Rule Id="CA1806" Action="Warning" />
+    <Rule Id="CA1809" Action="Warning" />
+    <Rule Id="CA1811" Action="Warning" />
+    <Rule Id="CA1812" Action="Warning" />
+    <Rule Id="CA1813" Action="Warning" />
+    <Rule Id="CA1814" Action="Warning" />
+    <Rule Id="CA1815" Action="Warning" />
+    <Rule Id="CA1819" Action="Warning" />
+    <Rule Id="CA1820" Action="Warning" />
+    <Rule Id="CA1821" Action="Warning" />
+    <Rule Id="CA2201" Action="Warning" />
+    <Rule Id="CA2202" Action="Warning" />
+    <Rule Id="CA2204" Action="Warning" />
+    <Rule Id="CA2207" Action="Warning" />
+    <Rule Id="CA2213" Action="Warning" />
+    <Rule Id="CA2214" Action="Warning" />
+    <Rule Id="CA2215" Action="Warning" />
+    <Rule Id="CA2217" Action="Warning" />
+    <Rule Id="CA2218" Action="Warning" />
+    <Rule Id="CA2219" Action="Warning" />
+    <Rule Id="CA2222" Action="Warning" />
+    <Rule Id="CA2223" Action="Warning" />
+    <Rule Id="CA2224" Action="Warning" />
+    <Rule Id="CA2226" Action="Warning" />
+    <Rule Id="CA2227" Action="Warning" />
+    <Rule Id="CA2233" Action="Warning" />
+  </Rules>
+</RuleSet>
\ No newline at end of file
diff --git a/src/ZipX/ProjectTemplates/jQueryClassLibrary/Script.template b/src/ZipX/ProjectTemplates/jQueryClassLibrary/Script.template
new file mode 100644
index 000000000..8fcd90176
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/jQueryClassLibrary/Script.template
@@ -0,0 +1,8 @@
+//! #= ScriptFile ##
+//
+
+(function($) {
+#include[as-is] "%code%"
+})(jQuery);
+
+//! This script was generated using Script# v#= CompilerVersion ##
diff --git a/src/ZipX/ProjectTemplates/jQueryClassLibrary/jQueryClassLibrary.vstemplate b/src/ZipX/ProjectTemplates/jQueryClassLibrary/jQueryClassLibrary.vstemplate
new file mode 100644
index 000000000..94dd8e96f
--- /dev/null
+++ b/src/ZipX/ProjectTemplates/jQueryClassLibrary/jQueryClassLibrary.vstemplate
@@ -0,0 +1,31 @@
+<VSTemplate Version="2.0.0" Type="Project" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005">
+  <TemplateData>
+    <Name>jQuery Script Library</Name>
+    <Description>A jQuery-based script file.</Description>
+    <Icon Package="{FAE04EC1-301F-11d3-BF4B-00C04F79EFBC}" ID="4547" />
+    <ProjectType>CSharp</ProjectType>
+    <SortOrder>10</SortOrder>
+    <CreateNewFolder>true</CreateNewFolder>
+    <DefaultName>ScriptLibrary</DefaultName>
+    <ProvideDefaultName>true</ProvideDefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <Project File="ClassLibrary.csproj" ReplaceParameters="true">
+      <ProjectItem TargetFileName="Properties\FxCop.ruleset">FxCop.ruleset</ProjectItem>
+      <ProjectItem TargetFileName="Properties\Script.template">Script.template</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="Properties\AssemblyInfo.cs">AssemblyInfo.cs</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="Class1.cs" OpenInEditor="true">Class1.cs</ProjectItem>
+    </Project>
+  </TemplateContent>
+  <WizardExtension>
+    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</Assembly>
+    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+  </WizardExtension>
+  <WizardData>
+    <packages repository="extension" repositoryId="ScriptSharp.Extension.Templates">
+      <package id="ScriptSharp" version="0.7.6" />
+      <package id="ScriptSharp.Lib.HTML" version="0.7.6" />
+      <package id="ScriptSharp.Lib.jQuery" version="0.7.6" />
+    </packages>
+  </WizardData>
+</VSTemplate>
diff --git a/src/ZipX/VSIX/Extension.vsixmanifest b/src/ZipX/VSIX/Extension.vsixmanifest
new file mode 100644
index 000000000..6f5e5e6ab
--- /dev/null
+++ b/src/ZipX/VSIX/Extension.vsixmanifest
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Vsix
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010"
+  Version="1.0.0">
+  <Identifier Id="ScriptSharp.Extension.Templates">
+    <Name>Script#</Name>
+    <Author>Nikhil Kothari</Author>
+    <Version>0.7.6</Version>
+    <Description xml:space="preserve">Script# lets you author your HTML5 apps in C# and compile them into JavaScript.</Description>
+    <Locale>1033</Locale>
+    <MoreInfoUrl>http://www.scriptsharp.com/</MoreInfoUrl>
+    <License>License.txt</License>
+    <Icon>Logo.png</Icon>
+    <PreviewImage>Logo.png</PreviewImage>
+    <SupportedProducts>
+      <VisualStudio Version="10.0">
+        <Edition>Ultimate</Edition>
+        <Edition>Premium</Edition>
+        <Edition>Pro</Edition>
+        <Edition>VCSExpress</Edition>
+        <Edition>VWDExpress</Edition>
+      </VisualStudio>
+      <VisualStudio Version="11.0">
+        <Edition>Ultimate</Edition>
+        <Edition>Premium</Edition>
+        <Edition>Pro</Edition>
+        <Edition>VCSExpress</Edition>
+        <Edition>VWDExpress</Edition>
+      </VisualStudio>
+    </SupportedProducts>
+    <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" />
+  </Identifier>
+  <References />
+  <Content>
+    <ProjectTemplate>ProjectTemplates</ProjectTemplate>
+    <ItemTemplate>ItemTemplates</ItemTemplate>
+  </Content>
+</Vsix>
diff --git a/src/ZipX/VSIX/Logo.png b/src/ZipX/VSIX/Logo.png
new file mode 100644
index 000000000..28ff06555
Binary files /dev/null and b/src/ZipX/VSIX/Logo.png differ
diff --git a/src/ZipX/VSIX/[Content_Types].xml b/src/ZipX/VSIX/[Content_Types].xml
new file mode 100644
index 000000000..4e2f46d59
--- /dev/null
+++ b/src/ZipX/VSIX/[Content_Types].xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+  <Default Extension="vsixmanifest" ContentType="text/xml" />
+  <Default Extension="zip" ContentType="application/zip" />
+  <Default Extension="txt" ContentType="text/plain" />
+  <Default Extension="png" ContentType="application/octet-stream" />
+  <Default Extension="nupkg" ContentType="application/octet-stream" />
+</Types>
diff --git a/src/ZipX/ZipX.csproj b/src/ZipX/ZipX.csproj
new file mode 100644
index 000000000..e57a97731
--- /dev/null
+++ b/src/ZipX/ZipX.csproj
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <UsingTask TaskName="Zip" AssemblyFile="..\..\tools\bin\ScriptSharp.Internal.ZipBuilder.dll" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{4123C976-739E-42A2-87FB-E04D163BC99C}</ProjectGuid>
+    <OutputPath>..\..\bin\Zip\</OutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Include="Packages\Core.nuspec" />
+    <None Include="Packages\Core\Install.ps1" />
+    <None Include="Packages\Core\Reset.psm1" />
+    <None Include="Packages\Core\Uninstall.ps1" />
+    <None Include="Packages\Core\ScriptSharp.PlaceHolder.txt" />
+    <None Include="Packages\FxCop.nuspec" />
+    <None Include="Packages\FxCop\Install.ps1" />
+    <None Include="Packages\FxCop\ScriptSharp.PlaceHolder.txt" />
+    <None Include="Packages\Lib.BingMaps.nuspec" />
+    <None Include="Packages\Lib.HTML.nuspec" />
+    <None Include="Packages\Lib.jQuery.nuspec" />
+    <None Include="Packages\Lib.jQuery.UI.nuspec" />
+    <None Include="Packages\Lib.jQuery.History.nuspec" />
+    <None Include="Packages\Lib.jQuery.Templating.nuspec" />
+    <None Include="Packages\Lib.jQuery.Validation.nuspec" />
+    <None Include="Packages\Lib.Knockout.nuspec" />
+    <None Include="Packages\Testing.nuspec" />
+    <None Include="Packages\Runtime.nuspec" />
+  </ItemGroup>
+  <ItemGroup>
+    <ItemClass Include="ItemTemplates\Class\*" />
+    <ItemPage Include="ItemTemplates\Page\*" />
+    <ItemJQueryPage Include="ItemTemplates\jQueryPage\*" />
+    <ItemJQueryPlugin Include="ItemTemplates\jQueryPlugin\*" />
+    <ItemResource Include="ItemTemplates\Resource\*" />
+    <ItemTestClass Include="ItemTemplates\TestClass\*" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectClassLibrary Include="ProjectTemplates\ClassLibrary\*" />
+    <ProjectJQueryClassLibrary Include="ProjectTemplates\jQueryClassLibrary\*" />
+    <ProjectUnitTest Include="ProjectTemplates\UnitTest\*" />
+    <ProjectImportLibrary Include="ProjectTemplates\ImportLibrary\*" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="VSIX\Extension.vsixmanifest">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="VSIX\[Content_Types].xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="VSIX\Logo.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\License.txt">
+      <Link>VSIX\License.txt</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <Target Name="Build">
+    <MakeDir Directories="$(OutputPath)Packages" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Core.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Testing.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\FxCop.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Lib.HTML.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Lib.jQuery.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Lib.jQuery.UI.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Lib.jQuery.History.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Lib.jQuery.Templating.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Lib.jQuery.Validation.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Lib.Knockout.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Lib.BingMaps.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Exec Command="$(ProjectDir)..\..\tools\bin\nuget pack $(ProjectDir)Packages\Runtime.nuspec -OutputDirectory $(OutputPath)Packages -NoPackageAnalysis" />
+    <Zip ZipLevel="9" Files="@(ItemClass)" ZipFileName="$(OutputPath)ItemTemplates\Script%2523\Class.zip" WorkingDirectory="ItemTemplates\Class" />
+    <Zip ZipLevel="9" Files="@(ItemPage)" ZipFileName="$(OutputPath)ItemTemplates\Script%2523\Page.zip" WorkingDirectory="ItemTemplates\Page" />
+    <Zip ZipLevel="9" Files="@(ItemJQueryPage)" ZipFileName="$(OutputPath)ItemTemplates\Script%2523\jQueryPage.zip" WorkingDirectory="ItemTemplates\jQueryPage" />
+    <Zip ZipLevel="9" Files="@(ItemJQueryPlugin)" ZipFileName="$(OutputPath)ItemTemplates\Script%2523\jQueryPlugin.zip" WorkingDirectory="ItemTemplates\jQueryPlugin" />
+    <Zip ZipLevel="9" Files="@(ItemResource)" ZipFileName="$(OutputPath)ItemTemplates\Script%2523\Resource.zip" WorkingDirectory="ItemTemplates\Resource" />
+    <Zip ZipLevel="9" Files="@(ItemTestClass)" ZipFileName="$(OutputPath)ItemTemplates\Script%2523\TestClass.zip" WorkingDirectory="ItemTemplates\TestClass" />
+    <Zip ZipLevel="9" Files="@(ProjectClassLibrary)" ZipFileName="$(OutputPath)ProjectTemplates\Script%2523\ClassLibrary.zip" WorkingDirectory="ProjectTemplates\ClassLibrary" />
+    <Zip ZipLevel="9" Files="@(ProjectJQueryClassLibrary)" ZipFileName="$(OutputPath)ProjectTemplates\Script%2523\jQueryClassLibrary.zip" WorkingDirectory="ProjectTemplates\jQueryClassLibrary" />
+    <Zip ZipLevel="9" Files="@(ProjectUnitTest)" ZipFileName="$(OutputPath)ProjectTemplates\Script%2523\UnitTest.zip" WorkingDirectory="ProjectTemplates\UnitTest" />
+    <Zip ZipLevel="9" Files="@(ProjectImportLibrary)" ZipFileName="$(OutputPath)ProjectTemplates\Script%2523\ImportLibrary.zip" WorkingDirectory="ProjectTemplates\ImportLibrary" />
+    <Copy SourceFiles="@(Content)" DestinationFolder="$(OutputPath)" />
+    <ItemGroup>
+      <VsixFiles Include="$(OutputPath)**\*.*" Exclude="*.vsix" />
+    </ItemGroup>
+    <Zip ZipLevel="9" Files="@(VsixFiles)" WorkingDirectory="$(OutputPath)" ZipFileName="$(OutputPath)..\ScriptSharp.vsix" />
+  </Target>
+  <Target Name="Clean">
+    <Delete Files="$(OutputPath)..\ScriptSharp.vsix" />
+    <RemoveDir Directories="$(OutputPath)" />
+  </Target>
+  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
+</Project>
\ No newline at end of file
diff --git a/tests/CoreLib/QUnit.css b/tests/CoreLib/QUnit.css
new file mode 100644
index 000000000..a9b4f5903
--- /dev/null
+++ b/tests/CoreLib/QUnit.css
@@ -0,0 +1,112 @@
+ol#qunit-tests {
+	font-family:Calibri, Helvetica, Arial;
+	margin:0;
+	padding:0;
+	list-style-position:inside;
+	font-size: smaller;
+}
+ol#qunit-tests li{
+	padding:0.4em 0.5em 0.4em 2.5em;
+	border-bottom:1px solid #fff;
+	font-size:small;
+	list-style-position:inside;
+}
+ol#qunit-tests li ol{
+	box-shadow: inset 0px 2px 13px #999;
+	-moz-box-shadow: inset 0px 2px 13px #999;
+	-webkit-box-shadow: inset 0px 2px 13px #999;
+	margin-top:0.5em;
+	margin-left:0;
+	padding:0.5em;
+	background-color:#fff;
+}
+ol#qunit-tests li li{
+	border-bottom:none;
+	margin:0.5em;
+	background-color:#fff;
+	list-style-position: inside;
+	padding:0.4em 0.5em 0.4em 0.5em;
+}
+ol#qunit-tests li li.pass{
+	border-left:26px solid #C6E746;
+	background-color:#fff;
+	color:#5E740B;
+}
+ol#qunit-tests li li.fail{
+	border-left:26px solid #EE5757;
+	background-color:#fff;
+	color:#710909;
+}
+ol#qunit-tests li.pass{
+	background-color:#D2E0E6;
+	color:#528CE0;
+}
+ol#qunit-tests li.fail{
+	background-color:#EE5757;
+	color:#000;
+}
+ol#qunit-tests li strong {
+	cursor:pointer;
+}
+h1#qunit-header{
+	background-color:#0d3349;
+	margin:0;
+	padding:0.5em 0 0.5em 1em;
+	color:#fff;
+	font-family:Calibri, Helvetica, Arial;
+	border-top-right-radius:15px;
+	border-top-left-radius:15px;
+	-moz-border-radius-topright:15px;
+	-moz-border-radius-topleft:15px;
+	-webkit-border-top-right-radius:15px;
+	-webkit-border-top-left-radius:15px;
+	text-shadow: rgba(0, 0, 0, 0.5) 4px 4px 1px;
+}
+h2#qunit-banner{
+	font-family:Calibri, Helvetica, Arial;
+	height:5px;
+	margin:0;
+	padding:0;
+}
+h2#qunit-banner.qunit-pass{
+	background-color:#C6E746;
+}
+h2#qunit-banner.qunit-fail, #qunit-testrunner-toolbar {
+	background-color:#EE5757;
+}
+#qunit-testrunner-toolbar {
+	font-family:Calibri, Helvetica, Arial;
+	padding:0;
+	padding:0em 0 0.5em 2em;
+	font-size: small;
+}
+h2#qunit-userAgent {
+	font-family:Calibri, Helvetica, Arial;
+	background-color:#2b81af;
+	margin:0;
+	padding:0;
+	color:#fff;
+	font-size: small;
+	padding:0.5em 0 0.5em 2.5em;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+p#qunit-testresult{
+	font-family:Calibri, Helvetica, Arial;
+	margin:0;
+	font-size: small;
+	color:#2b81af;
+	border-bottom-right-radius:15px;
+	border-bottom-left-radius:15px;
+	-moz-border-radius-bottomright:15px;
+	-moz-border-radius-bottomleft:15px;
+	-webkit-border-bottom-right-radius:15px;
+	-webkit-border-bottom-left-radius:15px;
+	background-color:#D2E0E6;
+	padding:0.5em 0.5em 0.5em 2.5em;
+}
+strong b.fail{
+	color:#710909;
+}
+strong b.pass{
+	color:#5E740B;
+}
diff --git a/tests/CoreLib/QUnit.js b/tests/CoreLib/QUnit.js
new file mode 100644
index 000000000..f2704148e
--- /dev/null
+++ b/tests/CoreLib/QUnit.js
@@ -0,0 +1,1043 @@
+/*
+ * QUnit - A JavaScript Unit Testing Framework
+ * 
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2009 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ */
+
+(function(window) {
+
+var QUnit = {
+
+	// Initialize the configuration options
+	init: function() {
+		config = {
+			stats: { all: 0, bad: 0 },
+			moduleStats: { all: 0, bad: 0 },
+			started: +new Date,
+			blocking: false,
+			autorun: false,
+			assertions: [],
+			filters: [],
+			queue: []
+		};
+
+		var tests = id("qunit-tests"),
+			banner = id("qunit-banner"),
+			result = id("qunit-testresult");
+
+		if ( tests ) {
+			tests.innerHTML = "";
+		}
+
+		if ( banner ) {
+			banner.className = "";
+		}
+
+		if ( result ) {
+			result.parentNode.removeChild( result );
+		}
+	},
+	
+	// call on start of module test to prepend name to all tests
+	module: function(name, testEnvironment) {
+		config.currentModule = name;
+
+		synchronize(function() {
+			if ( config.currentModule ) {
+				QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all );
+			}
+
+			config.currentModule = name;
+			config.moduleTestEnvironment = testEnvironment;
+			config.moduleStats = { all: 0, bad: 0 };
+
+			QUnit.moduleStart( name, testEnvironment );
+		});
+	},
+
+	asyncTest: function(testName, expected, callback) {
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = 0;
+		}
+
+		QUnit.test(testName, expected, callback, true);
+	},
+	
+	test: function(testName, expected, callback, async) {
+		var name = testName, testEnvironment, testEnvironmentArg;
+
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = null;
+		}
+		// is 2nd argument a testEnvironment?
+		if ( expected && typeof expected === 'object') {
+			testEnvironmentArg =  expected;
+			expected = null;
+		}
+
+		if ( config.currentModule ) {
+			name = config.currentModule + " module: " + name;
+		}
+
+		if ( !validTest(name) ) {
+			return;
+		}
+
+		synchronize(function() {
+			QUnit.testStart( testName );
+
+			testEnvironment = extend({
+				setup: function() {},
+				teardown: function() {}
+			}, config.moduleTestEnvironment);
+			if (testEnvironmentArg) {
+				extend(testEnvironment,testEnvironmentArg);
+			}
+
+			// allow utility functions to access the current test environment
+			QUnit.current_testEnvironment = testEnvironment;
+			
+			config.assertions = [];
+			config.expected = expected;
+
+			try {
+				if ( !config.pollution ) {
+					saveGlobal();
+				}
+
+				testEnvironment.setup.call(testEnvironment);
+			} catch(e) {
+				QUnit.ok( false, "Setup failed on " + name + ": " + e.message );
+			}
+
+			if ( async ) {
+				QUnit.stop();
+			}
+
+			try {
+				callback.call(testEnvironment);
+			} catch(e) {
+				fail("Test " + name + " died, exception and test follows", e, callback);
+				QUnit.ok( false, "Died on test #" + (config.assertions.length + 1) + ": " + e.message );
+				// else next test will carry the responsibility
+				saveGlobal();
+
+				// Restart the tests if they're blocking
+				if ( config.blocking ) {
+					start();
+				}
+			}
+		});
+
+		synchronize(function() {
+			try {
+				checkPollution();
+				testEnvironment.teardown.call(testEnvironment);
+			} catch(e) {
+				QUnit.ok( false, "Teardown failed on " + name + ": " + e.message );
+			}
+
+			try {
+				QUnit.reset();
+			} catch(e) {
+				fail("reset() failed, following Test " + name + ", exception and reset fn follows", e, reset);
+			}
+
+			if ( config.expected && config.expected != config.assertions.length ) {
+				QUnit.ok( false, "Expected " + config.expected + " assertions, but " + config.assertions.length + " were run" );
+			}
+
+			var good = 0, bad = 0,
+				tests = id("qunit-tests");
+
+			config.stats.all += config.assertions.length;
+			config.moduleStats.all += config.assertions.length;
+
+			if ( tests ) {
+				var ol  = document.createElement("ol");
+				ol.style.display = "none";
+
+				for ( var i = 0; i < config.assertions.length; i++ ) {
+					var assertion = config.assertions[i];
+
+					var li = document.createElement("li");
+					li.className = assertion.result ? "pass" : "fail";
+					li.appendChild(document.createTextNode(assertion.message || "(no message)"));
+					ol.appendChild( li );
+
+					if ( assertion.result ) {
+						good++;
+					} else {
+						bad++;
+						config.stats.bad++;
+						config.moduleStats.bad++;
+					}
+				}
+
+				var b = document.createElement("strong");
+				b.innerHTML = name + " <b style='color:black;'>(<b class='fail'>" + bad + "</b>, <b class='pass'>" + good + "</b>, " + config.assertions.length + ")</b>";
+				
+				addEvent(b, "click", function() {
+					var next = b.nextSibling, display = next.style.display;
+					next.style.display = display === "none" ? "block" : "none";
+				});
+				
+				addEvent(b, "dblclick", function(e) {
+					var target = e && e.target ? e.target : window.event.srcElement;
+					if ( target.nodeName.toLowerCase() === "strong" ) {
+						var text = "", node = target.firstChild;
+
+						while ( node.nodeType === 3 ) {
+							text += node.nodeValue;
+							node = node.nextSibling;
+						}
+
+						text = text.replace(/(^\s*|\s*$)/g, "");
+
+						if ( window.location ) {
+							window.location.href = window.location.href.match(/^(.+?)(\?.*)?$/)[1] + "?" + encodeURIComponent(text);
+						}
+					}
+				});
+
+				var li = document.createElement("li");
+				li.className = bad ? "fail" : "pass";
+				li.appendChild( b );
+				li.appendChild( ol );
+				tests.appendChild( li );
+
+				if ( bad ) {
+					var toolbar = id("qunit-testrunner-toolbar");
+					if ( toolbar ) {
+						toolbar.style.display = "block";
+						id("qunit-filter-pass").disabled = null;
+						id("qunit-filter-missing").disabled = null;
+					}
+				}
+
+			} else {
+				for ( var i = 0; i < config.assertions.length; i++ ) {
+					if ( !config.assertions[i].result ) {
+						bad++;
+						config.stats.bad++;
+						config.moduleStats.bad++;
+					}
+				}
+			}
+
+			QUnit.testDone( testName, bad, config.assertions.length );
+
+			if ( !window.setTimeout && !config.queue.length ) {
+				done();
+			}
+		});
+
+		if ( window.setTimeout && !config.doneTimer ) {
+			config.doneTimer = window.setTimeout(function(){
+				if ( !config.queue.length ) {
+					done();
+				} else {
+					synchronize( done );
+				}
+			}, 13);
+		}
+	},
+	
+	/**
+	 * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+	 */
+	expect: function(asserts) {
+		config.expected = asserts;
+	},
+
+	/**
+	 * Asserts true.
+	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
+	 */
+	ok: function(a, msg) {
+		QUnit.log(a, msg);
+
+		config.assertions.push({
+			result: !!a,
+			message: msg
+		});
+	},
+
+	/**
+	 * Checks that the first two arguments are equal, with an optional message.
+	 * Prints out both actual and expected values.
+	 *
+	 * Prefered to ok( actual == expected, message )
+	 *
+	 * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." );
+	 *
+	 * @param Object actual
+	 * @param Object expected
+	 * @param String message (optional)
+	 */
+	equal: function(actual, expected, message) {
+		push(expected == actual, actual, expected, message);
+	},
+
+	notEqual: function(actual, expected, message) {
+		push(expected != actual, actual, expected, message);
+	},
+	
+	deepEqual: function(a, b, message) {
+		push(QUnit.equiv(a, b), a, b, message);
+	},
+
+	notDeepEqual: function(a, b, message) {
+		push(!QUnit.equiv(a, b), a, b, message);
+	},
+
+	strictEqual: function(actual, expected, message) {
+		push(expected === actual, actual, expected, message);
+	},
+
+	notStrictEqual: function(actual, expected, message) {
+		push(expected !== actual, actual, expected, message);
+	},
+	
+	start: function() {
+		// A slight delay, to avoid any current callbacks
+		if ( window.setTimeout ) {
+			window.setTimeout(function() {
+				if ( config.timeout ) {
+					clearTimeout(config.timeout);
+				}
+
+				config.blocking = false;
+				process();
+			}, 13);
+		} else {
+			config.blocking = false;
+			process();
+		}
+	},
+	
+	stop: function(timeout) {
+		config.blocking = true;
+
+		if ( timeout && window.setTimeout ) {
+			config.timeout = window.setTimeout(function() {
+				QUnit.ok( false, "Test timed out" );
+				QUnit.start();
+			}, timeout);
+		}
+	},
+	
+	/**
+	 * Resets the test setup. Useful for tests that modify the DOM.
+	 */
+	reset: function() {
+		if ( window.jQuery ) {
+			jQuery("#main").html( config.fixture );
+			jQuery.event.global = {};
+			jQuery.ajaxSettings = extend({}, config.ajaxSettings);
+		}
+	},
+	
+	/**
+	 * Trigger an event on an element.
+	 *
+	 * @example triggerEvent( document.body, "click" );
+	 *
+	 * @param DOMElement elem
+	 * @param String type
+	 */
+	triggerEvent: function( elem, type, event ) {
+		if ( document.createEvent ) {
+			event = document.createEvent("MouseEvents");
+			event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
+				0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			elem.dispatchEvent( event );
+
+		} else if ( elem.fireEvent ) {
+			elem.fireEvent("on"+type);
+		}
+	},
+	
+	// Safe object type checking
+	is: function( type, obj ) {
+		return Object.prototype.toString.call( obj ) === "[object "+ type +"]";
+	},
+	
+	// Logging callbacks
+	done: function(failures, total) {},
+	log: function(result, message) {},
+	testStart: function(name) {},
+	testDone: function(name, failures, total) {},
+	moduleStart: function(name, testEnvironment) {},
+	moduleDone: function(name, failures, total) {}
+};
+
+// Backwards compatibility, deprecated
+QUnit.equals = QUnit.equal;
+QUnit.same = QUnit.deepEqual;
+
+// Maintain internal state
+var config = {
+	// The queue of tests to run
+	queue: [],
+
+	// block until document ready
+	blocking: true
+};
+
+// Load paramaters
+(function() {
+	var location = window.location || { search: "", protocol: "file:" },
+		GETParams = location.search.slice(1).split('&');
+
+	for ( var i = 0; i < GETParams.length; i++ ) {
+		GETParams[i] = decodeURIComponent( GETParams[i] );
+		if ( GETParams[i] === "noglobals" ) {
+			GETParams.splice( i, 1 );
+			i--;
+			config.noglobals = true;
+		} else if ( GETParams[i].search('=') > -1 ) {
+			GETParams.splice( i, 1 );
+			i--;
+		}
+	}
+	
+	// restrict modules/tests by get parameters
+	config.filters = GETParams;
+	
+	// Figure out if we're running the tests from a server or not
+	QUnit.isLocal = !!(location.protocol === 'file:');
+})();
+
+// Expose the API as global variables, unless an 'exports'
+// object exists, in that case we assume we're in CommonJS
+if ( typeof exports === "undefined" || typeof require === "undefined" ) {
+	extend(window, QUnit);
+	window.QUnit = QUnit;
+} else {
+	extend(exports, QUnit);
+	exports.QUnit = QUnit;
+}
+
+if ( typeof document === "undefined" || document.readyState === "complete" ) {
+	config.autorun = true;
+}
+
+addEvent(window, "load", function() {
+	// Initialize the config, saving the execution queue
+	var oldconfig = extend({}, config);
+	QUnit.init();
+	extend(config, oldconfig);
+
+	config.blocking = false;
+
+	var userAgent = id("qunit-userAgent");
+	if ( userAgent ) {
+		userAgent.innerHTML = navigator.userAgent;
+	}
+	
+	var toolbar = id("qunit-testrunner-toolbar");
+	if ( toolbar ) {
+		toolbar.style.display = "none";
+		
+		var filter = document.createElement("input");
+		filter.type = "checkbox";
+		filter.id = "qunit-filter-pass";
+		filter.disabled = true;
+		addEvent( filter, "click", function() {
+			var li = document.getElementsByTagName("li");
+			for ( var i = 0; i < li.length; i++ ) {
+				if ( li[i].className.indexOf("pass") > -1 ) {
+					li[i].style.display = filter.checked ? "none" : "";
+				}
+			}
+		});
+		toolbar.appendChild( filter );
+
+		var label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-pass");
+		label.innerHTML = "Hide passed tests";
+		toolbar.appendChild( label );
+
+		var missing = document.createElement("input");
+		missing.type = "checkbox";
+		missing.id = "qunit-filter-missing";
+		missing.disabled = true;
+		addEvent( missing, "click", function() {
+			var li = document.getElementsByTagName("li");
+			for ( var i = 0; i < li.length; i++ ) {
+				if ( li[i].className.indexOf("fail") > -1 && li[i].innerHTML.indexOf('missing test - untested code is broken code') > - 1 ) {
+					li[i].parentNode.parentNode.style.display = missing.checked ? "none" : "block";
+				}
+			}
+		});
+		toolbar.appendChild( missing );
+
+		label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-missing");
+		label.innerHTML = "Hide missing tests (untested code is broken code)";
+		toolbar.appendChild( label );
+	}
+
+	var main = id('main');
+	if ( main ) {
+		config.fixture = main.innerHTML;
+	}
+
+	if ( window.jQuery ) {
+		config.ajaxSettings = window.jQuery.ajaxSettings;
+	}
+
+	QUnit.start();
+});
+
+function done() {
+	if ( config.doneTimer && window.clearTimeout ) {
+		window.clearTimeout( config.doneTimer );
+		config.doneTimer = null;
+	}
+
+	if ( config.queue.length ) {
+		config.doneTimer = window.setTimeout(function(){
+			if ( !config.queue.length ) {
+				done();
+			} else {
+				synchronize( done );
+			}
+		}, 13);
+
+		return;
+	}
+
+	config.autorun = true;
+
+	// Log the last module results
+	if ( config.currentModule ) {
+		QUnit.moduleDone( config.currentModule, config.moduleStats.bad, config.moduleStats.all );
+	}
+
+	var banner = id("qunit-banner"),
+		tests = id("qunit-tests"),
+		html = ['Tests completed in ',
+		+new Date - config.started, ' milliseconds.<br/>',
+		'<span class="passed">', config.stats.all - config.stats.bad, '</span> tests of <span class="total">', config.stats.all, '</span> passed, <span class="failed">', config.stats.bad,'</span> failed.'].join('');
+
+	if ( banner ) {
+		banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass");
+	}
+
+	if ( tests ) {	
+		var result = id("qunit-testresult");
+
+		if ( !result ) {
+			result = document.createElement("p");
+			result.id = "qunit-testresult";
+			result.className = "result";
+			tests.parentNode.insertBefore( result, tests.nextSibling );
+		}
+
+		result.innerHTML = html;
+	}
+
+	QUnit.done( config.stats.bad, config.stats.all );
+}
+
+function validTest( name ) {
+	var i = config.filters.length,
+		run = false;
+
+	if ( !i ) {
+		return true;
+	}
+	
+	while ( i-- ) {
+		var filter = config.filters[i],
+			not = filter.charAt(0) == '!';
+
+		if ( not ) {
+			filter = filter.slice(1);
+		}
+
+		if ( name.indexOf(filter) !== -1 ) {
+			return !not;
+		}
+
+		if ( not ) {
+			run = true;
+		}
+	}
+
+	return run;
+}
+
+function push(result, actual, expected, message) {
+	message = message || (result ? "okay" : "failed");
+	QUnit.ok( result, result ? message + ": " + expected : message + ", expected: " + QUnit.jsDump.parse(expected) + " result: " + QUnit.jsDump.parse(actual) );
+}
+
+function synchronize( callback ) {
+	config.queue.push( callback );
+
+	if ( config.autorun && !config.blocking ) {
+		process();
+	}
+}
+
+function process() {
+	while ( config.queue.length && !config.blocking ) {
+		config.queue.shift()();
+	}
+}
+
+function saveGlobal() {
+	config.pollution = [];
+	
+	if ( config.noglobals ) {
+		for ( var key in window ) {
+			config.pollution.push( key );
+		}
+	}
+}
+
+function checkPollution( name ) {
+	var old = config.pollution;
+	saveGlobal();
+	
+	var newGlobals = diff( old, config.pollution );
+	if ( newGlobals.length > 0 ) {
+		ok( false, "Introduced global variable(s): " + newGlobals.join(", ") );
+		config.expected++;
+	}
+
+	var deletedGlobals = diff( config.pollution, old );
+	if ( deletedGlobals.length > 0 ) {
+		ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") );
+		config.expected++;
+	}
+}
+
+// returns a new Array with the elements that are in a but not in b
+function diff( a, b ) {
+	var result = a.slice();
+	for ( var i = 0; i < result.length; i++ ) {
+		for ( var j = 0; j < b.length; j++ ) {
+			if ( result[i] === b[j] ) {
+				result.splice(i, 1);
+				i--;
+				break;
+			}
+		}
+	}
+	return result;
+}
+
+function fail(message, exception, callback) {
+	if ( typeof console !== "undefined" && console.error && console.warn ) {
+		console.error(message);
+		console.error(exception);
+		console.warn(callback.toString());
+
+	} else if ( window.opera && opera.postError ) {
+		opera.postError(message, exception, callback.toString);
+	}
+}
+
+function extend(a, b) {
+	for ( var prop in b ) {
+		a[prop] = b[prop];
+	}
+
+	return a;
+}
+
+function addEvent(elem, type, fn) {
+	if ( elem.addEventListener ) {
+		elem.addEventListener( type, fn, false );
+	} else if ( elem.attachEvent ) {
+		elem.attachEvent( "on" + type, fn );
+	} else {
+		fn();
+	}
+}
+
+function id(name) {
+	return !!(typeof document !== "undefined" && document && document.getElementById) &&
+		document.getElementById( name );
+}
+
+// Test for equality any JavaScript type.
+// Discussions and reference: http://philrathe.com/articles/equiv
+// Test suites: http://philrathe.com/tests/equiv
+// Author: Philippe Rathé <prathe@gmail.com>
+QUnit.equiv = function () {
+
+    var innerEquiv; // the real equiv function
+    var callers = []; // stack to decide between skip/abort functions
+
+
+    // Determine what is o.
+    function hoozit(o) {
+        if (QUnit.is("String", o)) {
+            return "string";
+            
+        } else if (QUnit.is("Boolean", o)) {
+            return "boolean";
+
+        } else if (QUnit.is("Number", o)) {
+
+            if (isNaN(o)) {
+                return "nan";
+            } else {
+                return "number";
+            }
+
+        } else if (typeof o === "undefined") {
+            return "undefined";
+
+        // consider: typeof null === object
+        } else if (o === null) {
+            return "null";
+
+        // consider: typeof [] === object
+        } else if (QUnit.is( "Array", o)) {
+            return "array";
+        
+        // consider: typeof new Date() === object
+        } else if (QUnit.is( "Date", o)) {
+            return "date";
+
+        // consider: /./ instanceof Object;
+        //           /./ instanceof RegExp;
+        //          typeof /./ === "function"; // => false in IE and Opera,
+        //                                          true in FF and Safari
+        } else if (QUnit.is( "RegExp", o)) {
+            return "regexp";
+
+        } else if (typeof o === "object") {
+            return "object";
+
+        } else if (QUnit.is( "Function", o)) {
+            return "function";
+        } else {
+            return undefined;
+        }
+    }
+
+    // Call the o related callback with the given arguments.
+    function bindCallbacks(o, callbacks, args) {
+        var prop = hoozit(o);
+        if (prop) {
+            if (hoozit(callbacks[prop]) === "function") {
+                return callbacks[prop].apply(callbacks, args);
+            } else {
+                return callbacks[prop]; // or undefined
+            }
+        }
+    }
+    
+    var callbacks = function () {
+
+        // for string, boolean, number and null
+        function useStrictEquality(b, a) {
+            if (b instanceof a.constructor || a instanceof b.constructor) {
+                // to catch short annotaion VS 'new' annotation of a declaration
+                // e.g. var i = 1;
+                //      var j = new Number(1);
+                return a == b;
+            } else {
+                return a === b;
+            }
+        }
+
+        return {
+            "string": useStrictEquality,
+            "boolean": useStrictEquality,
+            "number": useStrictEquality,
+            "null": useStrictEquality,
+            "undefined": useStrictEquality,
+
+            "nan": function (b) {
+                return isNaN(b);
+            },
+
+            "date": function (b, a) {
+                return hoozit(b) === "date" && a.valueOf() === b.valueOf();
+            },
+
+            "regexp": function (b, a) {
+                return hoozit(b) === "regexp" &&
+                    a.source === b.source && // the regex itself
+                    a.global === b.global && // and its modifers (gmi) ...
+                    a.ignoreCase === b.ignoreCase &&
+                    a.multiline === b.multiline;
+            },
+
+            // - skip when the property is a method of an instance (OOP)
+            // - abort otherwise,
+            //   initial === would have catch identical references anyway
+            "function": function () {
+                var caller = callers[callers.length - 1];
+                return caller !== Object &&
+                        typeof caller !== "undefined";
+            },
+
+            "array": function (b, a) {
+                var i;
+                var len;
+
+                // b could be an object literal here
+                if ( ! (hoozit(b) === "array")) {
+                    return false;
+                }
+
+                len = a.length;
+                if (len !== b.length) { // safe and faster
+                    return false;
+                }
+                for (i = 0; i < len; i++) {
+                    if ( ! innerEquiv(a[i], b[i])) {
+                        return false;
+                    }
+                }
+                return true;
+            },
+
+            "object": function (b, a) {
+                var i;
+                var eq = true; // unless we can proove it
+                var aProperties = [], bProperties = []; // collection of strings
+
+                // comparing constructors is more strict than using instanceof
+                if ( a.constructor !== b.constructor) {
+                    return false;
+                }
+
+                // stack constructor before traversing properties
+                callers.push(a.constructor);
+
+                for (i in a) { // be strict: don't ensures hasOwnProperty and go deep
+
+                    aProperties.push(i); // collect a's properties
+
+                    if ( ! innerEquiv(a[i], b[i])) {
+                        eq = false;
+                        break;
+                    }
+                }
+
+                callers.pop(); // unstack, we are done
+
+                for (i in b) {
+                    bProperties.push(i); // collect b's properties
+                }
+
+                // Ensures identical properties name
+                return eq && innerEquiv(aProperties.sort(), bProperties.sort());
+            }
+        };
+    }();
+
+    innerEquiv = function () { // can take multiple arguments
+        var args = Array.prototype.slice.apply(arguments);
+        if (args.length < 2) {
+            return true; // end transition
+        }
+
+        return (function (a, b) {
+            if (a === b) {
+                return true; // catch the most you can
+            } else if (a === null || b === null || typeof a === "undefined" || typeof b === "undefined" || hoozit(a) !== hoozit(b)) {
+                return false; // don't lose time with error prone cases
+            } else {
+                return bindCallbacks(a, callbacks, [b, a]);
+            }
+
+        // apply transition with (1..n) arguments
+        })(args[0], args[1]) && arguments.callee.apply(this, args.splice(1, args.length -1));
+    };
+
+    return innerEquiv;
+
+}();
+
+/**
+ * jsDump
+ * Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Licensed under BSD (http://www.opensource.org/licenses/bsd-license.php)
+ * Date: 5/15/2008
+ * @projectDescription Advanced and extensible data dumping for Javascript.
+ * @version 1.0.0
+ * @author Ariel Flesler
+ * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
+ */
+QUnit.jsDump = (function() {
+	function quote( str ) {
+		return '"' + str.toString().replace(/"/g, '\\"') + '"';
+	};
+	function literal( o ) {
+		return o + '';	
+	};
+	function join( pre, arr, post ) {
+		var s = jsDump.separator(),
+			base = jsDump.indent(),
+			inner = jsDump.indent(1);
+		if ( arr.join )
+			arr = arr.join( ',' + s + inner );
+		if ( !arr )
+			return pre + post;
+		return [ pre, inner + arr, base + post ].join(s);
+	};
+	function array( arr ) {
+		var i = arr.length,	ret = Array(i);					
+		this.up();
+		while ( i-- )
+			ret[i] = this.parse( arr[i] );				
+		this.down();
+		return join( '[', ret, ']' );
+	};
+	
+	var reName = /^function (\w+)/;
+	
+	var jsDump = {
+		parse:function( obj, type ) { //type is used mostly internally, you can fix a (custom)type in advance
+			var	parser = this.parsers[ type || this.typeOf(obj) ];
+			type = typeof parser;			
+			
+			return type == 'function' ? parser.call( this, obj ) :
+				   type == 'string' ? parser :
+				   this.parsers.error;
+		},
+		typeOf:function( obj ) {
+			var type;
+			if ( obj === null ) {
+				type = "null";
+			} else if (typeof obj === "undefined") {
+				type = "undefined";
+			} else if (QUnit.is("RegExp", obj)) {
+				type = "regexp";
+			} else if (QUnit.is("Date", obj)) {
+				type = "date";
+			} else if (QUnit.is("Function", obj)) {
+				type = "function";
+			} else if (QUnit.is("Array", obj)) {
+				type = "array";
+			} else if (QUnit.is("Window", obj) || QUnit.is("global", obj)) {
+				type = "window";
+			} else if (QUnit.is("HTMLDocument", obj)) {
+				type = "document";
+			} else if (QUnit.is("HTMLCollection", obj) || QUnit.is("NodeList", obj)) {
+				type = "nodelist";
+			} else if (/^\[object HTML/.test(Object.prototype.toString.call( obj ))) {
+				type = "node";
+			} else {
+				type = typeof obj;
+			}
+			return type;
+		},
+		separator:function() {
+			return this.multiline ?	this.HTML ? '<br />' : '\n' : this.HTML ? '&nbsp;' : ' ';
+		},
+		indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing
+			if ( !this.multiline )
+				return '';
+			var chr = this.indentChar;
+			if ( this.HTML )
+				chr = chr.replace(/\t/g,'   ').replace(/ /g,'&nbsp;');
+			return Array( this._depth_ + (extra||0) ).join(chr);
+		},
+		up:function( a ) {
+			this._depth_ += a || 1;
+		},
+		down:function( a ) {
+			this._depth_ -= a || 1;
+		},
+		setParser:function( name, parser ) {
+			this.parsers[name] = parser;
+		},
+		// The next 3 are exposed so you can use them
+		quote:quote, 
+		literal:literal,
+		join:join,
+		//
+		_depth_: 1,
+		// This is the list of parsers, to modify them, use jsDump.setParser
+		parsers:{
+			window: '[Window]',
+			document: '[Document]',
+			error:'[ERROR]', //when no parser is found, shouldn't happen
+			unknown: '[Unknown]',
+			'null':'null',
+			undefined:'undefined',
+			'function':function( fn ) {
+				var ret = 'function',
+					name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE
+				if ( name )
+					ret += ' ' + name;
+				ret += '(';
+				
+				ret = [ ret, this.parse( fn, 'functionArgs' ), '){'].join('');
+				return join( ret, this.parse(fn,'functionCode'), '}' );
+			},
+			array: array,
+			nodelist: array,
+			arguments: array,
+			object:function( map ) {
+				var ret = [ ];
+				this.up();
+				for ( var key in map )
+					ret.push( this.parse(key,'key') + ': ' + this.parse(map[key]) );
+				this.down();
+				return join( '{', ret, '}' );
+			},
+			node:function( node ) {
+				var open = this.HTML ? '&lt;' : '<',
+					close = this.HTML ? '&gt;' : '>';
+					
+				var tag = node.nodeName.toLowerCase(),
+					ret = open + tag;
+					
+				for ( var a in this.DOMAttrs ) {
+					var val = node[this.DOMAttrs[a]];
+					if ( val )
+						ret += ' ' + a + '=' + this.parse( val, 'attribute' );
+				}
+				return ret + close + open + '/' + tag + close;
+			},
+			functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function
+				var l = fn.length;
+				if ( !l ) return '';				
+				
+				var args = Array(l);
+				while ( l-- )
+					args[l] = String.fromCharCode(97+l);//97 is 'a'
+				return ' ' + args.join(', ') + ' ';
+			},
+			key:quote, //object calls it internally, the key part of an item in a map
+			functionCode:'[code]', //function calls it internally, it's the content of the function
+			attribute:quote, //node calls it internally, it's an html attribute value
+			string:quote,
+			date:quote,
+			regexp:literal, //regex
+			number:literal,
+			'boolean':literal
+		},
+		DOMAttrs:{//attributes to dump from nodes, name=>realName
+			id:'id',
+			name:'name',
+			'class':'className'
+		},
+		HTML:true,//if true, entities are escaped ( <, >, \t, space and \n )
+		indentChar:'   ',//indentation unit
+		multiline:true //if true, items in a collection, are separated by a \n, else just a space.
+	};
+
+	return jsDump;
+})();
+
+})(this);
diff --git a/tests/CoreLib/QUnitExt.js b/tests/CoreLib/QUnitExt.js
new file mode 100644
index 000000000..fa1d73b9a
--- /dev/null
+++ b/tests/CoreLib/QUnitExt.js
@@ -0,0 +1,44 @@
+(function() {
+  var currentModule = null;
+  var logData = '';
+  
+  function appendLog(logText) {
+    logData = logData + logText + '\r\n';
+
+    var logHolder = document.getElementById('qunit-log');
+    if (logHolder) {
+      logHolder.value = logData;
+    }
+  }
+  
+  QUnit.log = function(result, message) {
+    if (arguments.length === 1) {
+      message = arguments[0];
+    }
+    appendLog('    ' + message);
+  }
+
+  QUnit.done = function(failures, total) {
+      appendLog('\r\nCompleted; ' + 'failures = ' + failures + '; total = ' + total);
+  }
+
+  QUnit.testStart = function(name) {
+    appendLog('  Test Started: ' + name);
+  }
+  
+  QUnit.testDone = function(name, failures, total) {
+    appendLog('  Test Done: ' + name + '; failures = ' + failures + '; total = ' + total);
+  }
+
+  QUnit.moduleStart = function(name, testEnv) {
+    currentModule = name;
+    appendLog('Module Started: ' + name);
+  }
+
+  QUnit.moduleDone = function(name, failures, total) {
+    if (name === currentModule) {
+      appendLog('Module Done: ' + name + '; failures = ' + failures + '; total = ' + total + '\r\n');
+    }
+    currentModule = null;
+  }
+})();
diff --git a/tests/CoreLib/TestArray.htm b/tests/CoreLib/TestArray.htm
new file mode 100644
index 000000000..6589857ba
--- /dev/null
+++ b/tests/CoreLib/TestArray.htm
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Test - Array</title>
+  <link rel="stylesheet" href="QUnit.css" type="text/css" />
+  <script type="text/javascript" src="QUnit.js"></script>
+  <script type="text/javascript" src="QUnitExt.js"></script>
+</head>
+<body>
+  <h1 id="qunit-header">Test Results</h1>
+  <h2 id="qunit-banner"></h2>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <br />
+  <textarea id="qunit-log" rows="10" cols="100"></textarea>
+</body>
+<script type="text/javascript" src="..\..\bin\Debug\mscorlib.debug.js"></script>
+<script type="text/javascript">
+module('Array');
+test('add', function() {
+  var a = ['abc', 'def'];
+  a.add('123');
+  
+  QUnit.equal(a.length, 3);
+  QUnit.equal(a[2], '123');
+});
+
+</script>
+</html>
diff --git a/tests/CoreLib/TestDelegate.htm b/tests/CoreLib/TestDelegate.htm
new file mode 100644
index 000000000..e369968fe
--- /dev/null
+++ b/tests/CoreLib/TestDelegate.htm
@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Test - Delegate</title>
+  <link rel="stylesheet" href="QUnit.css" type="text/css" />
+  <script type="text/javascript" src="QUnit.js"></script>
+  <script type="text/javascript" src="QUnitExt.js"></script>
+</head>
+<body>
+  <h1 id="qunit-header">Test Results</h1>
+  <h2 id="qunit-banner"></h2>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <br />
+  <textarea id="qunit-log" rows="10" cols="100"></textarea>
+</body>
+<script type="text/javascript" src="..\..\bin\Debug\mscorlib.debug.js"></script>
+<script type="text/javascript">
+var TargetClass = function() {
+}
+TargetClass.prototype.instanceCallback1 = function() {
+    log('Instance Callback1 invoked');
+}
+TargetClass.prototype.instanceCallback2 = function() {
+    log('Instance Callback2 invoked');
+}
+TargetClass.staticCallback1 = function() {
+    log('Static Callback1 invoked');
+}
+TargetClass.staticCallback2 = function(v) {
+    log('Static Callback2 invoked');
+    log('Value = ' + v);
+}
+TargetClass.complexCallback1 = function(delegate) {
+    log('ComplexCallback1 invoked');
+
+    var delegate2 = ss.Delegate.create(null, TargetClass.complexCallback2);
+    ss.Delegate.remove(delegate, delegate2);
+}
+TargetClass.complexCallback2 = function(delegate) {
+    log('ComplexCallback2 invoked');
+}
+TargetClass.complexCallback3 = function(delegate) {
+    log('ComplexCallback3 invoked');
+}
+
+function staticGlobalCallback(v) {
+    log('Static Global Callback invoked');
+    log('Value = ' + v);
+}
+
+function setupLog() {
+    var logs = [];
+    window.log = function(log) {
+        QUnit.log(log);
+        logs.push(log);
+    };
+    return logs;
+}
+
+module('Delegate');
+test('testCreateInvoke', function() {
+    var logs = setupLog();
+    var tc = new TargetClass();
+
+    var delegate = ss.Delegate.create(tc, tc.instanceCallback1);
+    delegate();
+    
+    QUnit.equal(logs.length, 1);
+});
+
+test('testEmpty', function() {
+    var tc = new TargetClass();
+    var delegate = ss.Delegate.create(tc, tc.instanceCallback1);
+    delegate = ss.Delegate.remove(delegate, ss.Delegate.create(tc, tc.instanceCallback1));
+
+    QUnit.equal(delegate, null);
+});
+
+test('testDuplicate', function() {
+    var logs = setupLog();
+    var tc = new TargetClass();
+
+    var delegate = ss.Delegate.create(tc, tc.instanceCallback1);
+    delegate = ss.Delegate.combine(delegate, ss.Delegate.create(tc, tc.instanceCallback1));
+    delegate();
+
+    QUnit.equal(logs.length, 2);
+});
+
+test('testCreateInvokeStatic', function() {
+    var logs = setupLog();
+    var tc = new TargetClass();
+
+    var delegate = ss.Delegate.create(null, TargetClass.staticCallback2);
+    delegate('abc');
+
+    var delegate2 = staticGlobalCallback;
+    delegate2('abc');
+
+    QUnit.equal(logs.length, 4);
+});
+
+test('testCreateInvokeMultiple', function() {
+    var logs = setupLog();
+    var tc = new TargetClass();
+
+    var delegate = ss.Delegate.create(tc, tc.instanceCallback1);
+    delegate = ss.Delegate.combine(delegate, ss.Delegate.create(tc, tc.instanceCallback2));
+    delegate = ss.Delegate.combine(delegate, ss.Delegate.create(null, TargetClass.staticCallback1));
+    delegate();
+
+    QUnit.equal(logs.length, 3);
+});
+
+test('testWithRemoval', function() {
+    var logs = setupLog();
+
+    var delegate1 = ss.Delegate.create(null, TargetClass.complexCallback1);
+    var delegate2 = ss.Delegate.create(null, TargetClass.complexCallback2);
+    var delegate3 = ss.Delegate.create(null, TargetClass.complexCallback3);
+
+    var delegate = ss.Delegate.combine(delegate1, ss.Delegate.combine(delegate2, delegate3));
+    delegate(delegate);
+
+    QUnit.equal(logs.length, 2);
+});
+
+test('testExports', function() {
+    var logs = setupLog();
+    
+    var delegate = ss.Delegate.create(null, function() { log('delegate invoked') });
+
+    var name = ss.Delegate.createExport(delegate, /* multiUse */ true, 'xyz');
+    QUnit.equal(window[name] !== null, true, 'Expected window member');
+    window[name]();
+    QUnit.equal(window[name] !== null, true, 'Expected window member since it was multiuse');
+    
+    ss.Delegate.deleteExport(name);
+    QUnit.equal(!window[name], true, 'Did not expect window member since it was deleted');
+
+    var name = ss.Delegate.createExport(delegate);
+    QUnit.equal(window[name] !== null, true, 'Expected window member');
+    window[name]();
+    QUnit.equal(!window[name], true, 'Did not expect window member since it was deleted');
+});
+</script>
+</html>
diff --git a/tests/CoreLib/TestEnum.htm b/tests/CoreLib/TestEnum.htm
new file mode 100644
index 000000000..f1d06eb24
--- /dev/null
+++ b/tests/CoreLib/TestEnum.htm
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Test - Enum</title>
+  <link rel="stylesheet" href="QUnit.css" type="text/css" />
+  <script type="text/javascript" src="QUnit.js"></script>
+  <script type="text/javascript" src="QUnitExt.js"></script>
+</head>
+<body>
+  <h1 id="qunit-header">Test Results</h1>
+  <h2 id="qunit-banner"></h2>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <br />
+  <textarea id="qunit-log" rows="10" cols="100"></textarea>
+</body>
+<script type="text/javascript" src="..\..\bin\Debug\mscorlib.debug.js"></script>
+<script type="text/javascript">
+Type.registerNamespace('Test');
+
+Test.Color = function() { };
+Test.Color.prototype = {
+  Red: 0,
+  Green: 1,
+  Blue: 2
+};
+Test.Color.registerEnum('Test.Color');
+
+Test.Modes = function() { };
+Test.Modes.prototype = {
+  A: 1,
+  B: 2,
+  C: 4
+};
+Test.Modes.registerEnum('Test.Modes', true);
+
+test('enum values', function() {
+    QUnit.equal(Test.Color.Green, 1, 'Green should be 1');
+});
+
+test('flags enum values', function() {
+    QUnit.equal(Test.Modes.B, 2, 'B should be 2');
+    QUnit.equal(Test.Modes.B | Test.Modes.C, 6, 'B | C should be 6');
+});
+</script>
+</html>
diff --git a/tests/CoreLib/TestOOP.htm b/tests/CoreLib/TestOOP.htm
new file mode 100644
index 000000000..a576bb95e
--- /dev/null
+++ b/tests/CoreLib/TestOOP.htm
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Test - OOP</title>
+  <link rel="stylesheet" href="QUnit.css" type="text/css" />
+  <script type="text/javascript" src="QUnit.js"></script>
+  <script type="text/javascript" src="QUnitExt.js"></script>
+</head>
+<body>
+  <h1 id="qunit-header">Test Results</h1>
+  <h2 id="qunit-banner"></h2>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <br />
+  <textarea id="qunit-log" rows="10" cols="100"></textarea>
+</body>
+<script type="text/javascript" src="..\..\bin\Debug\mscorlib.debug.js"></script>
+<script type="text/javascript" src="TestOOP.js"></script>
+<script type="text/javascript">
+module('OOP');
+test('isClass', function() {
+  QUnit.equal(Type.isClass(Test.Cat), true, 'Expected Cat to be a class');
+  QUnit.equal(Type.isClass(Test.IPet), false, 'Did not expect IPet to be a class');
+  QUnit.equal(Type.isClass(Test.More.Comic), true, 'Expectd Comic to be a class');
+});
+
+test('isInteface', function() {
+  QUnit.equal(Type.isInterface(Test.Cat), false, 'Did not expect Cat to be an interface');
+  QUnit.equal(Type.isInterface(Test.IPet), true, 'Expected IPet to be an interface');
+  QUnit.equal(Type.isInterface(Test.More.Comic), false, 'Did not expect Comic to be an interface');
+});
+
+test('isAssignableFrom', function() {
+  QUnit.equal(Test.Animal.isAssignableFrom(Test.Cat), true, 'Cat should be assignable to an Animal');
+  QUnit.equal(Test.IMammal.isAssignableFrom(Test.Cat), true, 'Cat should be assignable to an IMammal');
+  QUnit.equal(Test.IMammal.isAssignableFrom(Test.Garfield), true, 'Garfield should be assignable to an IMammal');
+  QUnit.equal(Test.IPet.isAssignableFrom(Test.Cat), false, 'Cat should not be assignable to an IPet');
+  QUnit.equal(Object.isAssignableFrom(Test.Cat), true, 'Cat should be assignable to an Object');
+});
+
+test('isInstance', function() {
+  var c = new Test.Cat();
+  var g = new Test.Garfield();
+
+  QUnit.equal(Test.Animal.isInstanceOfType(c), true, 'Cat instance should be an Animal instance');
+  QUnit.equal(Test.IMammal.isInstanceOfType(c), true, 'Cat instance should be an IMammal instance');
+  QUnit.equal(Test.IMammal.isInstanceOfType(g), true, 'Garfield instance should be an IMammal instance');
+  QUnit.equal(ss.StringBuilder.isInstanceOfType(c), false, 'Cat instance should not be a StringBuilder instance');
+  QUnit.equal(Test.IPet.isInstanceOfType(c), false, 'Cat instance should not be an IPet instance');
+  QUnit.equal(Object.isInstanceOfType(c), true, 'Cat instance should not be an Object instance');
+});
+
+test('get_baseType', function() {
+  QUnit.equal(Test.Cat.get_baseType().get_fullName(), 'Test.Animal', 'Cat\'s base type should be Test.Animal');
+  QUnit.equal(Test.Animal.get_baseType().get_fullName(), 'Object', 'Animal\'s base type should be Object');
+  QUnit.equal(Object.get_baseType(), null, 'Object\'s base type should be null');
+});
+
+test('canCast and safeCast', function() {
+  var g = new Test.Garfield();
+
+  QUnit.equal(Type.canCast(g, Test.IPet), true, 'Garfield instance should be castable to Test.IPet');
+  QUnit.equal(Type.canCast(g, Test.Animal), true, 'Garfield instance should be castable to Test.Animal');
+  QUnit.equal(Type.canCast(g, ss.IDisposable), false, 'Garfield instance should not be castable to IDisposable');
+  QUnit.equal(Type.safeCast(g, Test.IPet), g, 'Garfield instance should be castable to Test.IPet');
+  QUnit.equal(Type.safeCast(g, Test.Animal), g, 'Garfield instance should be castable to Test.Animal');
+  QUnit.equal(Type.safeCast(g, ss.IDisposable), null, 'Garfield instance should not be castable to IDisposable');
+});
+
+test('initializeBase', function() {
+  var c = new Test.Cat();
+  QUnit.equal(c.get_species(), 'Cat', 'Cat is of cat species');
+});
+
+test('callBaseMethod', function() {
+  var g = new Test.Garfield();
+  QUnit.equal(g.speak(), 'meow\r\nI am fat, lazy, and cynical, but still, a favorite cat...', 'Garfield meows and says something cute');
+});
+
+test('getInstanceType', function() {
+  var g = new Test.Garfield();
+  QUnit.equal(Type.getInstanceType(g), Test.Garfield, "Expected Test.Garfield instance.");
+
+  var c = new Test.More.Comic();
+  QUnit.equal(Type.getInstanceType(c), Test.More.Comic, "Expected Test.More.Comic instance.");
+});
+
+test('typeNames', function() {
+  var g = new Test.Garfield();
+  QUnit.equal(Type.getInstanceType(g).get_name(), 'Garfield', "Expected 'Garfield' for type name.");
+  QUnit.equal(Type.getInstanceType(g).get_fullName(), 'Test.Garfield', "Expected 'Test.Garfield' for type name.");
+
+  var c = new Test.More.Comic();
+  QUnit.equal(Type.getInstanceType(c).get_name(), 'Comic', "Expected 'Comic' for type name.");
+  QUnit.equal(Type.getInstanceType(c).get_fullName(), 'Test.More.Comic', "Expected 'Test.More.Comic' for type name.");
+});
+
+test('getType', function() {
+  var t1 = Type.getType('String');
+  var t2 = Type.getType('ss.StringBuilder');
+  var t3 = Type.getType('Test.Garfield');
+  var t4 = Type.getType('Test.More.Comic');
+  var t5 = Type.getType('Test.Foo');
+
+  QUnit.equal(t1, String, "Expected String type.");
+  QUnit.equal(t2, ss.StringBuilder, "Expected StringBuilder type.");
+  QUnit.equal(t3, Test.Garfield, "Expected Garfield type.");
+  QUnit.equal(t4, Test.More.Comic, "Expected Comic type.");
+  QUnit.equal(t5, null, "Expected null type.");
+});
+</script>
+</html>
diff --git a/tests/CoreLib/TestOOP.js b/tests/CoreLib/TestOOP.js
new file mode 100644
index 000000000..eb54a34de
--- /dev/null
+++ b/tests/CoreLib/TestOOP.js
@@ -0,0 +1,94 @@
+Type.registerNamespace('Test');
+Type.registerNamespace('Test.More');
+
+////////////////////////////////////////////////////////////////////////////////
+// Test.IMammal
+
+Test.IMammal = function() { };
+Test.IMammal.prototype = {
+
+}
+Test.IMammal.registerInterface('Test.IMammal');
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Test.IPet
+
+Test.IPet = function() { };
+Test.IPet.prototype = {
+    get_name : null,
+    get_owner : null
+}
+Test.IPet.registerInterface('Test.IPet');
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Test.Animal
+
+Test.Animal = function Test_Animal(species) {
+    this._species = species;
+}
+Test.Animal.prototype = {
+    _species: null,
+    
+    get_species: function Test_Animal$get_species() {
+        return this._species;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Test.Cat
+
+Test.Cat = function Test_Cat() {
+    Test.Cat.initializeBase(this, [ 'Cat' ]);
+}
+Test.Cat.prototype = {
+    
+    speak: function Test_Cat$speak() {
+        return 'meow';
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Test.Garfield
+
+Test.Garfield = function Test_Garfield() {
+    Test.Garfield.initializeBase(this);
+}
+Test.Garfield.prototype = {
+    
+    get_name: function Test_Garfield$get_name() {
+        return 'Garfield';
+    },
+    
+    get_owner: function Test_Garfield$get_owner() {
+        return 'Jon';
+    },
+    
+    speak: function Test_Garfield$speak() {
+        return Test.Garfield.callBaseMethod(this, 'speak') + '\r\n' + 'I am fat, lazy, and cynical, but still, a favorite cat...';
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Test.More.Comic
+
+Test.More.Comic = function(name) {
+  this._name = name;
+}
+Test.More.Comic.prototype = {
+
+    get_name: function() {
+        return this._name;
+    }
+}
+
+
+
+Test.Animal.registerClass('Test.Animal');
+Test.Cat.registerClass('Test.Cat', Test.Animal, Test.IMammal);
+Test.Garfield.registerClass('Test.Garfield', Test.Cat, Test.IPet);
+Test.More.Comic.registerClass('Test.More.Comic');
diff --git a/tests/CoreLib/TestObject.htm b/tests/CoreLib/TestObject.htm
new file mode 100644
index 000000000..1ad2fbab5
--- /dev/null
+++ b/tests/CoreLib/TestObject.htm
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Test - Object</title>
+  <link rel="stylesheet" href="QUnit.css" type="text/css" />
+  <script type="text/javascript" src="QUnit.js"></script>
+  <script type="text/javascript" src="QUnitExt.js"></script>
+</head>
+<body>
+  <h1 id="qunit-header">Test Results</h1>
+  <h2 id="qunit-banner"></h2>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <br />
+  <textarea id="qunit-log" rows="10" cols="100"></textarea>
+</body>
+<script type="text/javascript" src="..\..\bin\Debug\mscorlib.debug.js"></script>
+<script type="text/javascript">
+module('Object');
+test('clearKeys', function() {
+  var d = { 'abc': 123, 'def': 456 };
+  var d2 = { };
+
+  QUnit.equal(Object.getKeyCount(d), 2);
+  Object.clearKeys(d);
+  QUnit.equal(Object.getKeyCount(d), 0);
+  Object.clearKeys(d2);
+  QUnit.equal(Object.getKeyCount(d2), 0);
+});
+
+test('keys', function() {
+  var d = { 'abc': 123, 'def': 456 };
+  var d2 = { };
+
+  var keys = Object.keys(d);
+  var keys2 = Object.keys(d2);
+
+  QUnit.equal(keys.length, 2);
+  QUnit.equal(keys.contains('abc'), true);
+  QUnit.equal(keys.contains('def'), true);
+  QUnit.equal(keys2.length, 0);
+});
+
+test('keyExists', function() {
+  var d = { 'abc': 123, 'def': 456 };
+  var d2 = { };
+
+  QUnit.equal(Object.keyExists(d, 'abc'), true);
+  QUnit.equal(Object.keyExists(d, 'ghi'), false);
+  QUnit.equal(Object.keyExists(d2, 'abc'), false);
+});
+
+</script>
+</html>
diff --git a/tests/CoreLib/TestObservable.htm b/tests/CoreLib/TestObservable.htm
new file mode 100644
index 000000000..8ab72de5f
--- /dev/null
+++ b/tests/CoreLib/TestObservable.htm
@@ -0,0 +1,136 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Test - Observable</title>
+  <link rel="stylesheet" href="QUnit.css" type="text/css" />
+  <script type="text/javascript" src="QUnit.js"></script>
+  <script type="text/javascript" src="QUnitExt.js"></script>
+</head>
+<body>
+  <h1 id="qunit-header">Test Results</h1>
+  <h2 id="qunit-banner"></h2>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <br />
+  <textarea id="qunit-log" rows="10" cols="100"></textarea>
+</body>
+<script type="text/javascript" src="..\..\bin\Debug\mscorlib.debug.js"></script>
+<script type="text/javascript">
+function Binding(src, prop) {
+  this.src = src;
+  this.prop = prop;
+  this.invalidateCount = 0;
+}
+Binding.prototype.invalidateObserver = function() {
+  this.invalidateCount++;
+}
+Binding.prototype.updateTarget = function() {
+  var reg = ss.Observable.registerObserver(this);
+  this.value = this.src['get_' + this.prop]();
+  reg.dispose();
+}
+Binding.prototype.updateSource = function(v) {
+  this.src['set_' + this.prop](v);
+}
+
+function Model() {
+  this._name = new ss.Observable();
+}
+Model.prototype.get_name = function() {
+  return this._name.getValue();
+}
+Model.prototype.set_name = function(v) {
+  this._name.setValue(v);
+}
+
+module('Observable');
+test('observable', function() {
+  var num = new ss.Observable(10);
+
+  QUnit.equal(num.getValue(), 10);
+  num.setValue(100);
+
+  QUnit.equal(num.getValue(), 100);
+});
+
+test('singleObserver', function() {
+  var model = new Model();
+  model.set_name('Foo');
+  
+  var binding = new Binding(model, 'name');
+  
+  binding.updateTarget();
+  QUnit.equal(binding.value, 'Foo');
+  QUnit.equal(binding.invalidateCount, 0);
+
+  binding.updateSource('Bar');
+  binding.updateTarget();
+  QUnit.equal(binding.value, 'Bar');
+  QUnit.equal(binding.invalidateCount, 1);
+
+  binding.updateSource('Bar');
+  binding.updateTarget();
+  QUnit.equal(binding.value, 'Bar');
+  QUnit.equal(binding.invalidateCount, 1);
+
+  binding.updateSource('Baz');
+  binding.updateTarget();
+  QUnit.equal(binding.value, 'Baz');
+  QUnit.equal(binding.invalidateCount, 2);
+});
+
+test('multipleObservers', function() {
+  var model = new Model();
+  model.set_name('Foo');
+  
+  var binding = new Binding(model, 'name');
+  var binding2 = new Binding(model, 'name');
+  
+  binding.updateTarget();
+  binding2.updateTarget();
+  QUnit.equal(binding.value, 'Foo');
+  QUnit.equal(binding.invalidateCount, 0);
+  QUnit.equal(binding2.invalidateCount, 0);
+
+  binding.updateSource('Bar');
+  binding.updateTarget();
+  binding2.updateTarget();
+  QUnit.equal(binding.value, 'Bar');
+  QUnit.equal(binding.invalidateCount, 1);
+  QUnit.equal(binding2.invalidateCount, 1);
+
+  binding.updateSource('Bar');
+  binding.updateTarget();
+  binding2.updateTarget();
+  QUnit.equal(binding.value, 'Bar');
+  QUnit.equal(binding.invalidateCount, 1);
+  QUnit.equal(binding2.invalidateCount, 1);
+
+  model.set_name('Baz');
+  binding.updateTarget();
+  binding2.updateTarget();
+  QUnit.equal(binding2.value, 'Baz');
+  QUnit.equal(binding.invalidateCount, 2);
+  QUnit.equal(binding2.invalidateCount, 2);
+});
+
+test('observableCollection', function() {
+  var items = new ss.ObservableCollection();
+  var binding = new Binding(items, 'length');
+  
+  binding.updateTarget();
+  QUnit.equal(binding.value, 0);
+  QUnit.equal(binding.invalidateCount, 0);
+  
+  items.add('abc');
+  QUnit.equal(binding.invalidateCount, 1);
+  
+  items.add('def');
+  QUnit.equal(binding.invalidateCount, 1);
+
+  binding.updateTarget();
+  items.removeAt(1);
+  QUnit.equal(binding.invalidateCount, 2);
+});
+</script>
+</html>
diff --git a/tests/CoreLib/TestStartup.htm b/tests/CoreLib/TestStartup.htm
new file mode 100644
index 000000000..85c698ea2
--- /dev/null
+++ b/tests/CoreLib/TestStartup.htm
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Test - Startup</title>
+  <link rel="stylesheet" href="QUnit.css" type="text/css" />
+  <script type="text/javascript" src="QUnit.js"></script>
+  <script type="text/javascript" src="QUnitExt.js"></script>
+</head>
+<body>
+  <h1 id="qunit-header">Test Results</h1>
+  <h2 id="qunit-banner"></h2>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <br />
+  <textarea id="qunit-log" rows="10" cols="100"></textarea>
+  <script type="text/javascript">
+  var c_s1 = 'DOMContentLoaded handler';
+  var c_s2 = 'Ready Callback';
+  
+  var sequence = [];
+  document.addEventListener('DOMContentLoaded', function() {
+    sequence.push(c_s1);
+  }, false);
+  </script>
+  <script type="text/javascript" src="..\..\bin\Debug\ssloader.debug.js"></script>
+  <script type="text/javascript">
+  var bodyAccessible = false;
+
+  loader.ready(function() {
+    sequence.push(c_s2);
+    bodyAccessible = document.body != null;
+  });
+  
+  module('Startup');
+  test('ready', function() {
+    QUnit.expect(5);
+
+    QUnit.equal(sequence.length, 2, 'Expected two events to have been handled');
+    QUnit.equal(sequence[0], c_s1, 'Expected DOMContentLoaded event to be first event');
+    QUnit.equal(sequence[1], c_s2, 'Expected ready event to be second event');
+    QUnit.equal(bodyAccessible, true, 'Expected to be able to access document.body in ready callback');
+    loader.ready(function() {
+      QUnit.start();
+      QUnit.equal(document.readyState, 'complete', 'Document.readyState should be "complete"');
+    });
+    
+    QUnit.stop(2000);
+  });
+  </script>
+</body>
+
+</html>
diff --git a/tests/CoreLib/TestString.htm b/tests/CoreLib/TestString.htm
new file mode 100644
index 000000000..a7ff3ef1d
--- /dev/null
+++ b/tests/CoreLib/TestString.htm
@@ -0,0 +1,108 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Test - String</title>
+  <link rel="stylesheet" href="QUnit.css" type="text/css" />
+  <script type="text/javascript" src="QUnit.js"></script>
+  <script type="text/javascript" src="QUnitExt.js"></script>
+</head>
+<body>
+  <h1 id="qunit-header">Test Results</h1>
+  <h2 id="qunit-banner"></h2>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <br />
+  <textarea id="qunit-log" rows="10" cols="100"></textarea>
+</body>
+<script type="text/javascript" src="..\..\bin\Debug\mscorlib.debug.js"></script>
+<script type="text/javascript">
+module('String');
+test('trim', function() {
+  QUnit.equal('Hello'.trim(), 'Hello');
+  QUnit.equal('  Hello'.trim(), 'Hello');
+  QUnit.equal('Hello  '.trim(), 'Hello');
+  QUnit.equal('  Hello  '.trim(), 'Hello');
+  QUnit.equal('\tHello  '.trim(), 'Hello');
+});
+
+test('padLeft', function() {
+  QUnit.equal('Hello'.padLeft(5), 'Hello');
+  QUnit.equal('HelloWorld'.padLeft(5), 'HelloWorld');
+  QUnit.equal('Hey'.padLeft(5), '  Hey');
+  QUnit.equal('Hello'.padLeft(5), 'Hello');
+  QUnit.equal('HelloWorld'.padLeft(5), 'HelloWorld');
+  QUnit.equal('Hey'.padLeft(5, '.'), '..Hey');
+});
+
+test('padRight', function() {
+  QUnit.equal('Hello'.padRight(5), 'Hello');
+  QUnit.equal('HelloWorld'.padRight(5), 'HelloWorld');
+  QUnit.equal('Hey'.padRight(5), 'Hey  ');
+  QUnit.equal('Hello'.padRight(5), 'Hello');
+  QUnit.equal('HelloWorld'.padRight(5), 'HelloWorld');
+  QUnit.equal('Hey'.padRight(5, '.'), 'Hey..');
+});
+
+test('compare', function() {
+  QUnit.equal(String.compare(null, null), 0, 'null vs null should be 0');
+  QUnit.equal(String.compare(null, 'x'), -1, 'null vs x should be -1');
+  QUnit.equal(String.compare('a', null), 1, 'a vs null should be 1');
+  QUnit.equal(String.compare('b', 'b'), 0, 'b vs b should be 0');
+  QUnit.equal(String.compare('aab', 'aaa'), 1, 'aab vs aaa should be 1');
+  QUnit.equal(String.compare('B', 'A'), 1, 'B vs A should be 1');
+  QUnit.equal(String.compare('e', 'E'), 1, 'e vs E should be 1');
+
+  QUnit.equal(String.compare(null, null, true), 0, 'null vs null should be 0');
+  QUnit.equal(String.compare(null, 'x', true), -1, 'null vs x should be -1');
+  QUnit.equal(String.compare('a', null, true), 1, 'a vs null should be 1');
+  QUnit.equal(String.compare('b', 'b', true), 0, 'b vs b should be 0');
+  QUnit.equal(String.compare('aab', 'aaa', true), 1, 'aab vs aaa should be 1');
+  QUnit.equal(String.compare('B', 'A', true), 1, 'B vs A should be 1');
+  QUnit.equal(String.compare('e', 'E', true), 0, 'e vs E should be 1');
+});
+
+test('endsWith', function() {
+  QUnit.equal('aaa'.endsWith('a'), true, 'aaa does end with a');
+  QUnit.equal('aaa'.endsWith('b'), false, 'aaa does not end with b');
+  QUnit.equal('aaa'.endsWith('aaa'), true, 'aaa does end with aaa');
+  QUnit.equal('aaa'.endsWith('aaaa'), false, 'aaa does not end with aaaa');
+});
+
+test('startsWith', function() {
+  QUnit.equal('aaa'.startsWith('a'), true, 'aaa does start with a');
+  QUnit.equal('aaa'.startsWith('b'), false, 'aaa does not start with b');
+  QUnit.equal('aaa'.startsWith('aaa'), true, 'aaa does start with aaa');
+  QUnit.equal('aaa'.startsWith('aaaa'), false, 'aaa does not start with aaaa');
+});
+
+test('htmlEncode', function() {
+  QUnit.equal('xyz'.htmlEncode(), 'xyz');
+  QUnit.equal('<h1>a "aaa" & a "bbb"</h1>'.htmlEncode(), '&lt;h1&gt;a &quot;aaa&quot; &amp; a &quot;bbb&quot;&lt;/h1&gt;');
+});
+
+test('htmlDecode', function() {
+  QUnit.equal('xyz'.htmlDecode(), 'xyz');
+  QUnit.equal('&lt;h1&gt;a &quot;aaa&quot; &amp; a &quot;bbb&quot;&lt;/h1&gt;'.htmlDecode(), '<h1>a "aaa" & a "bbb"</h1>');
+});
+
+test('isNullOrEmpty', function () {
+  QUnit.equal(String.isNullOrEmpty(null), true, 'null should be true');
+  QUnit.equal(String.isNullOrEmpty(undefined), true, 'undefined should be true');
+  QUnit.equal(String.isNullOrEmpty(), true, 'no param, should be true');
+  QUnit.equal(String.isNullOrEmpty(""), true, 'empty string, should be true');
+  QUnit.equal(String.isNullOrEmpty(" "), false, 'white space, should be false');
+  QUnit.equal(String.isNullOrEmpty("aaa"), false, 'aaa, should be false');
+});
+
+test('isNullOrWhiteSpace', function () {
+  QUnit.equal(String.isNullOrWhiteSpace(null), true, 'null should be true');
+  QUnit.equal(String.isNullOrWhiteSpace(undefined), true, 'undefined should be true');
+  QUnit.equal(String.isNullOrWhiteSpace(), true, 'no param, should be true');
+  QUnit.equal(String.isNullOrWhiteSpace(""), true, 'empty string, should be true');
+  QUnit.equal(String.isNullOrWhiteSpace(" "), true, 'white space, should be true');
+  QUnit.equal(String.isNullOrWhiteSpace("   "), true, 'triple white space, should be true');
+  QUnit.equal(String.isNullOrWhiteSpace("aaa"), false, 'aaa, should be false');
+});
+
+</script>
+</html>
diff --git a/tests/CoreLib/TestStringBuilder.htm b/tests/CoreLib/TestStringBuilder.htm
new file mode 100644
index 000000000..0108553ac
--- /dev/null
+++ b/tests/CoreLib/TestStringBuilder.htm
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Test - StringBuilder</title>
+  <link rel="stylesheet" href="QUnit.css" type="text/css" />
+  <script type="text/javascript" src="QUnit.js"></script>
+  <script type="text/javascript" src="QUnitExt.js"></script>
+</head>
+<body>
+  <h1 id="qunit-header">Test Results</h1>
+  <h2 id="qunit-banner"></h2>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <br />
+  <textarea id="qunit-log" rows="10" cols="100"></textarea>
+</body>
+<script type="text/javascript" src="..\..\bin\Debug\mscorlib.debug.js"></script>
+<script type="text/javascript">
+module('StringBuilder');
+test('ctor', function() {
+  var sb1 = new ss.StringBuilder();
+  QUnit.equal(sb1.isEmpty, true);
+  QUnit.equal(sb1.toString(), '');
+  
+  var sb2 = new ss.StringBuilder('aaa');
+  QUnit.equal(sb2.isEmpty, false);
+  QUnit.equal(sb2.toString(), 'aaa');
+});
+
+test('isEmpty', function() {
+  var sb1 = new ss.StringBuilder();
+  QUnit.equal(sb1.isEmpty, true);
+
+  sb1.append('');
+  QUnit.equal(sb1.isEmpty, true);
+  
+  sb1.append(null);
+  QUnit.equal(sb1.isEmpty, true);
+  
+  sb1.append(undefined);
+  QUnit.equal(sb1.isEmpty, true);
+
+  sb1.append('aaa');
+  QUnit.equal(sb1.isEmpty, false);
+  QUnit.equal(sb1.toString(), 'aaa');
+});
+
+test('append', function() {
+  var sb1 = new ss.StringBuilder();
+
+  sb1.append('aaa');
+  QUnit.equal(sb1.isEmpty, false);
+  QUnit.equal(sb1.toString(), 'aaa');
+  
+  sb1.append('bbb');
+  QUnit.equal(sb1.isEmpty, false);
+  QUnit.equal(sb1.toString(), 'aaabbb');
+});
+
+test('toString', function() {
+  var sb1 = new ss.StringBuilder();
+  sb1.append('aaa');
+  QUnit.equal(sb1.toString(':'), 'aaa');
+  sb1.append('bbb');
+  QUnit.equal(sb1.toString(':'), 'aaa:bbb');
+});
+</script>
+</html>
diff --git a/tests/CoreLib/TestTask.htm b/tests/CoreLib/TestTask.htm
new file mode 100644
index 000000000..e37d041c1
--- /dev/null
+++ b/tests/CoreLib/TestTask.htm
@@ -0,0 +1,295 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Test - Task</title>
+  <link rel="stylesheet" href="QUnit.css" type="text/css" />
+  <script type="text/javascript" src="QUnit.js"></script>
+  <script type="text/javascript" src="QUnitExt.js"></script>
+</head>
+<body>
+  <h1 id="qunit-header">Test Results</h1>
+  <h2 id="qunit-banner"></h2>
+  <h2 id="qunit-userAgent"></h2>
+  <ol id="qunit-tests"></ol>
+  <br />
+  <textarea id="qunit-log" rows="10" cols="100"></textarea>
+</body>
+<script type="text/javascript" src="..\..\bin\Debug\mscorlib.debug.js"></script>
+<script type="text/javascript">
+
+module('Task');
+test('preresolved', function() {
+  var deferred = new ss.Deferred(10);
+  var task = deferred.task;
+
+  QUnit.equal(task.status, 'done');
+});
+
+asyncTest('resolve', function() {
+  QUnit.expect(2);
+
+  var deferred = new ss.Deferred();
+  deferred.task.continueWith(function(t) {
+    QUnit.start();
+    QUnit.equal(t.status, 'done');
+    QUnit.equal(t.result, 123);
+    QUnit.stop();
+  });
+
+  setTimeout(function() {
+    deferred.resolve(123);
+  }, 100);
+
+  QUnit.stop();
+});
+
+asyncTest('reject', function() {
+  QUnit.expect(2);
+
+  var deferred = new ss.Deferred();
+  deferred.task.continueWith(function(t) {
+    QUnit.start();
+    QUnit.equal(t.status, 'failed');
+    QUnit.notEqual(t.error, null);
+    QUnit.stop();
+  });
+
+  setTimeout(function() {
+    deferred.reject();
+  }, 100);
+
+  QUnit.stop();
+});
+
+asyncTest('reresolve', function() {
+  QUnit.expect(2);
+
+  var deferred = new ss.Deferred();
+  deferred.task.continueWith(function(t) {
+    QUnit.start();
+    QUnit.equal(t.status, 'done');
+    QUnit.equal(t.result, 123);
+    QUnit.stop();
+  });
+
+  setTimeout(function() {
+    deferred.resolve(123);
+    deferred.resolve(456);
+  }, 100);
+
+  QUnit.stop();
+});
+
+asyncTest('anyFirst', function() {
+  QUnit.expect(3);
+
+  var deferred1 = new ss.Deferred();
+  var deferred2 = new ss.Deferred();
+
+  ss.Task.any(deferred1.task, deferred2.task)
+         .continueWith(function(t) {
+    QUnit.start();
+    QUnit.equal(t.status, 'done');
+    QUnit.notEqual(t.result, null);
+    QUnit.equal(t.result.result, 123);
+    QUnit.stop();
+  });
+
+  setTimeout(function() {
+    deferred1.resolve(123);
+  }, 100);
+
+  setTimeout(function() {
+    deferred2.resolve(456);
+  }, 300);
+
+  QUnit.stop();
+});
+
+asyncTest('anySecond', function() {
+  QUnit.expect(3);
+
+  var deferred1 = new ss.Deferred();
+  var deferred2 = new ss.Deferred();
+  var deferred3 = new ss.Deferred();
+
+  ss.Task.any(deferred1.task, deferred2.task, deferred3.task)
+         .continueWith(function(t) {
+    QUnit.start();
+    QUnit.equal(t.status, 'done');
+    QUnit.notEqual(t.result, null);
+    QUnit.equal(t.result.result, 456);
+    QUnit.stop();
+  });
+
+  setTimeout(function() {
+    deferred1.resolve(123);
+  }, 400);
+
+  setTimeout(function() {
+    deferred2.resolve(456);
+  }, 300);
+
+  setTimeout(function() {
+    deferred3.resolve(123);
+  }, 500);
+
+  QUnit.stop();
+});
+
+asyncTest('anyTimeout', function() {
+  QUnit.expect(2);
+
+  var deferred1 = new ss.Deferred();
+  var deferred2 = new ss.Deferred();
+  var deferred3 = new ss.Deferred();
+
+  ss.Task.any(100, deferred1.task, deferred2.task, deferred3.task)
+         .continueWith(function(t) {
+    QUnit.start();
+    QUnit.equal(t.status, 'done');
+    QUnit.equal(t.result, null);
+    QUnit.stop();
+  });
+
+  setTimeout(function() {
+    deferred1.resolve(123);
+  }, 400);
+
+  setTimeout(function() {
+    deferred2.resolve(456);
+  }, 300);
+
+  setTimeout(function() {
+    deferred3.resolve(123);
+  }, 500);
+
+  QUnit.stop();
+});
+
+asyncTest('allSimple', function() {
+  QUnit.expect(2);
+
+  var deferred1 = new ss.Deferred();
+  var deferred2 = new ss.Deferred();
+
+  ss.Task.all(deferred1.task, deferred2.task)
+         .continueWith(function(t) {
+    QUnit.start();
+    QUnit.equal(t.status, 'done');
+    QUnit.equal(t.result, true);
+    QUnit.stop();
+  });
+
+  setTimeout(function() {
+    deferred1.resolve(123);
+  }, 100);
+
+  setTimeout(function() {
+    deferred2.resolve(456);
+  }, 300);
+
+  QUnit.stop();
+});
+
+asyncTest('allTimeout', function() {
+  QUnit.expect(2);
+
+  var deferred1 = new ss.Deferred();
+  var deferred2 = new ss.Deferred();
+
+  ss.Task.all(200, deferred1.task, deferred2.task)
+         .continueWith(function(t) {
+    QUnit.start();
+    QUnit.equal(t.status, 'done');
+    QUnit.equal(t.result, false);
+    QUnit.stop();
+  });
+
+  setTimeout(function() {
+    deferred1.resolve(123);
+  }, 100);
+
+  setTimeout(function() {
+    deferred2.resolve(456);
+  }, 300);
+
+  QUnit.stop();
+});
+
+asyncTest('resolveDone', function() {
+  QUnit.expect(1);
+
+  var deferred = new ss.Deferred();
+  deferred.task.done(function(result) {
+    QUnit.start();
+    QUnit.equal(result, 123);
+    QUnit.stop();
+  });
+
+  setTimeout(function() {
+    deferred.resolve(123);
+  }, 100);
+
+  QUnit.stop();
+});
+
+asyncTest('rejectFail', function() {
+  QUnit.expect(1);
+
+  var deferred = new ss.Deferred();
+  deferred.task.fail(function(error) {
+    QUnit.start();
+    QUnit.notEqual(error, null);
+    QUnit.stop();
+  });
+
+  setTimeout(function() {
+    deferred.reject();
+  }, 100);
+
+  QUnit.stop();
+});
+
+asyncTest('completed', function() {
+  QUnit.expect(4);
+
+  var deferred1 = new ss.Deferred();
+  deferred1.task.then(function(result) {
+    QUnit.start();
+    QUnit.equal(result, 123);
+    QUnit.equal(deferred1.task.get_completed(), true);
+    QUnit.stop();
+  },
+  function(error) {
+    QUnit.start();
+    throw new Error('unexpected failure');
+    QUnit.stop();
+  });
+
+  setTimeout(function() {
+    deferred1.resolve(123);
+  }, 100);
+
+  var deferred2 = new ss.Deferred();
+  deferred2.task.then(function(result) {
+    QUnit.start();
+    throw new Error('unexpected done');
+    QUnit.stop();
+  },
+  function(error) {
+    QUnit.start();
+    QUnit.equal(error.message, 'error message');
+    QUnit.equal(deferred2.task.get_completed(), true);
+    QUnit.stop();
+  });
+
+  setTimeout(function() {
+    deferred2.reject(new Error('error message'));
+  }, 100);
+
+  QUnit.stop();
+});
+
+</script>
+</html>
diff --git a/tests/CoreLib/Tests.htm b/tests/CoreLib/Tests.htm
new file mode 100644
index 000000000..1508b141f
--- /dev/null
+++ b/tests/CoreLib/Tests.htm
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Tests</title>
+  <style type="text/css">
+  body { font-family: Segoe UI; font-size: 10.5pt; }
+  h1 { font-family: Segoe UI; font-size: 12pt; }
+  h2 { font-family: Segoe UI; font-size: 12pt; font-weight: normal }
+  hr.document { background-color: black; height: 2px; border: none; }
+  hr.section { background-color: #808080; height: 1px; border: none; }
+  </style>
+</head>
+<body>
+<h1>mscorlib.js Tests</h1>
+<hr class="document" />
+<h2>Infrastructure</h2>
+<dl>
+  <dt><a href="TestStartup.htm">TestStartup</a></dt>
+  <dd>Tests startup/loader functionlity</dd>
+</dl>
+<hr class="section" />
+<h2>Type System</h2>
+<dl>
+  <dt><a href="TestOOP.htm">TestOOP</a></dt>
+  <dd>Tests classes, interfaces and related APIs</dd>
+  <dt><a href="TestDelegate.htm">TestDelegate</a></dt>
+  <dd>Tests delegates</dd>
+  <dt><a href="TestEnum.htm">TestEnum</a></dt>
+  <dd>Tests enums</dd>
+</dl>
+<hr class="section" />
+<h2>Script Extensions</h2>
+<dl>
+  <dt><a href="TestObject.htm">TestObject</a></dt>
+  <dd>Tests object extensions</dd>
+  <dt><a href="TestString.htm">TestString</a></dt>
+  <dd>Tests string extensions</dd>
+  <dt><a href="TestArray.htm">TestArray</a></dt>
+  <dd>Tests array extensions</dd>
+</dl>
+<hr class="section" />
+<h2>Script BCL</h2>
+<dl>
+  <dt><a href="TestStringBuilder.htm">TestStringBuilder</a></dt>
+  <dd>Test StringBuilder functionality</dd>
+  <dt><a href="TestObservable.htm">TestObservable</a></dt>
+  <dd>Test Observable and change notifications</dd>
+  <dt><a href="TestTask.htm">TestTask</a></dt>
+  <dd>Test Deferred and Task</dd>
+</dl>
+</body>
+</html>
diff --git a/tests/ScriptSharp.testsettings b/tests/ScriptSharp.testsettings
new file mode 100644
index 000000000..84bcf6c72
--- /dev/null
+++ b/tests/ScriptSharp.testsettings
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestSettings name="ScriptSharp" id="4d943b1b-2d0a-48f4-b3fc-adf2d6a940eb" xmlns="http://microsoft.com/schemas/VisualStudio/TeamTest/2010">
+  <Description>These are default test settings for a local test run.</Description>
+  <Deployment enabled="false" />
+  <NamingScheme baseName="Run" appendTimeStamp="false" useDefault="false" />
+  <Execution>
+    <TestTypeSpecific>
+      <UnitTestRunConfig testTypeId="13cdc9d9-ddb5-4fa4-a97d-d965ccfc6d4b">
+        <AssemblyResolution>
+          <TestDirectory useLoadContext="true" />
+        </AssemblyResolution>
+      </UnitTestRunConfig>
+      <WebTestRunConfiguration testTypeId="4e7599fa-5ecb-43e9-a887-cd63cf72d207">
+        <Browser name="Internet Explorer 7.0">
+          <Headers>
+            <Header name="User-Agent" value="Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)" />
+            <Header name="Accept" value="*/*" />
+            <Header name="Accept-Language" value="{{$IEAcceptLanguage}}" />
+            <Header name="Accept-Encoding" value="GZIP" />
+          </Headers>
+        </Browser>
+      </WebTestRunConfiguration>
+    </TestTypeSpecific>
+    <AgentRule name="LocalMachineDefaultRole">
+    </AgentRule>
+  </Execution>
+</TestSettings>
\ No newline at end of file
diff --git a/tests/ScriptSharp/BasicTests.cs b/tests/ScriptSharp/BasicTests.cs
new file mode 100644
index 000000000..ab68eb7f1
--- /dev/null
+++ b/tests/ScriptSharp/BasicTests.cs
@@ -0,0 +1,132 @@
+// BasicTests.cs
+// Script#/Tests/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.IO;
+using System.Reflection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using ScriptSharp.Generators;
+using ScriptSharp.Tests.Core;
+
+namespace ScriptSharp.Tests {
+
+    [TestClass]
+    public sealed class BasicTests : CompilationTest {
+
+        [TestMethod]
+        public void TestConditionals() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+                c.Options.DebugFlavor = true;
+                c.Options.Defines = new string[] { "DEBUG" };
+            }, "DebugBaseline.txt");
+
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+                c.Options.Defines = new string[] { "TRACE" };
+            }, "TraceBaseline.txt");
+        }
+
+        [TestMethod]
+        public void TestDocComments() {
+            RunTest((c) => {
+                c.AddReference("Script.Web.dll").
+                  AddSource("Code.cs").
+                  AddComments("DocComments.xml");
+                c.Options.DebugFlavor = true;
+            });
+        }
+
+        [TestMethod]
+        public void TestFlags() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+                c.Options.Defines = new string[] { "ABC" };
+            });
+        }
+
+        [TestMethod]
+        public void TestSimple() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestMetadata() {
+            RunTest((c) => {
+                c.AddReference("Lib.dll").
+                  AddSource("Code.cs");
+                c.Options.InternalTestType = "metadata";
+                c.Options.DebugFlavor = true;
+            });
+        }
+
+        [TestMethod]
+        public void TestMinimization() {
+            RunTest((c) => {
+                c.AddReference("Script.Web.dll").
+                  AddReference("Lib.dll").
+                  AddSource("Code.cs");
+                c.Options.Minimize = true;
+                c.Options.InternalTestType = "minimizationMap";
+            });
+        }
+
+        [TestMethod]
+        public void TestResources() {
+            string resource1Path = GetTestFilePath("Strings1.resx");
+            string resource2Path = GetTestFilePath("Strings2.resx");
+
+            string resource1Markup = File.ReadAllText(resource1Path);
+            string resource2Markup = File.ReadAllText(resource2Path);
+
+            ResXCodeBuilder resxCodeBuilder = new ResXCodeBuilder();
+
+            resxCodeBuilder.Start("Resources");
+            resxCodeBuilder.GenerateCode("Strings1.resx", resource1Markup, null);
+            string code1 = resxCodeBuilder.End();
+
+            resxCodeBuilder.Start("Resources");
+            resxCodeBuilder.GenerateCode("Strings2.resx", resource2Markup, "PublicResxScriptGenerator");
+            string code2 = resxCodeBuilder.End();
+
+            RunTest((c) => {
+                c.AddSource("Code.cs").
+                  AddCode("Strings1.Designer.cs", code1).
+                  AddCode("Strings2.Designer.cs", code2).
+                  AddResource("Strings1.resx").
+                  AddResource("Strings1.fr.resx").
+                  AddResource("Strings1.fr-FR.resx").
+                  AddResource("Strings2.resx");
+                c.Options.DebugFlavor = true;
+                c.Options.Defines = new string[] { "DEBUG" };
+            });
+        }
+
+        [TestMethod]
+        public void TestTemplate() {
+            RunTest((c) => {
+                c.AddReference("Script.Web.dll").
+                  AddTemplate("Template.js").
+                  AddSource("Code.cs");
+                c.Options.DebugFlavor = true;
+                c.Options.Defines = new string[] { "DEBUG" };
+            });
+        }
+
+        [TestMethod]
+        public void TestUnitTest() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            }, "NonTestBaseline.txt");
+
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+                c.Options.IncludeTests = true;
+            }, "TestBaseline.txt");
+        }
+    }
+}
diff --git a/tests/ScriptSharp/Core/Compilation.cs b/tests/ScriptSharp/Core/Compilation.cs
new file mode 100644
index 000000000..6fdba296c
--- /dev/null
+++ b/tests/ScriptSharp/Core/Compilation.cs
@@ -0,0 +1,158 @@
+// Compilation.cs
+// Script#/Tests/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace ScriptSharp.Tests.Core {
+
+    public sealed class Compilation : IErrorHandler {
+
+        private CompilationTest _test;
+
+        private List<string> _references;
+        private List<CompilationInput> _sources;
+        private List<CompilationInput> _resources;
+        private CompilationInput _template;
+        private CompilationInput _comments;
+        private CompilationOutput _output;
+
+        private List<string> _errors;
+
+        private CompilerOptions _options;
+
+        public Compilation(CompilationTest test) {
+            _test = test;
+
+            _references = new List<string>();
+            _sources = new List<CompilationInput>();
+            _resources = new List<CompilationInput>();
+
+            _options = new CompilerOptions();
+            _options.DebugFlavor = false;
+            _options.Minimize = false;
+            _options.InternalTestMode = true;
+            _options.Defines = new string[] { };
+        }
+
+        public string ErrorMessages {
+            get {
+                return String.Join(Environment.NewLine, Errors);
+            }
+        }
+
+        public IEnumerable<string> Errors {
+            get {
+                return _errors;
+            }
+        }
+
+        public bool HasErrors {
+            get {
+                return _errors != null;
+            }
+        }
+
+        public CompilerOptions Options {
+            get {
+                return _options;
+            }
+        }
+
+        public CompilationOutput Output {
+            get {
+                return _output;
+            }
+        }
+
+        public Compilation AddCode(string name, string code) {
+            string sourcePath = _test.GetTestFilePath(name);
+
+            CompilationInput codeInput = new CompilationInput(sourcePath, name, code);
+            _sources.Add(codeInput);
+
+            return this;
+        }
+
+        public Compilation AddComments(string name) {
+            string commentsPath = _test.GetTestFilePath(name);
+
+            _comments = new CompilationInput(commentsPath, name);
+            return this;
+        }
+
+        public Compilation AddReference(string name) {
+            string assemblyPath = _test.GetAssemblyFilePath(name);
+            if (File.Exists(assemblyPath)) {
+                _references.Add(assemblyPath);
+            }
+            else {
+                assemblyPath = _test.GetTestFilePath(name);
+                if (File.Exists(assemblyPath)) {
+                    _references.Add(assemblyPath);
+                }
+            }
+
+            return this;
+        }
+
+        public Compilation AddResource(string name) {
+            string resourcesPath = _test.GetTestFilePath(name);
+
+            CompilationInput resourceInput = new CompilationInput(resourcesPath, name);
+            _resources.Add(resourceInput);
+
+            return this;
+        }
+
+        public Compilation AddSource(string name) {
+            string sourcePath = _test.GetTestFilePath(name);
+
+            CompilationInput sourceInput = new CompilationInput(sourcePath, name);
+            _sources.Add(sourceInput);
+
+            return this;
+        }
+
+        public Compilation AddTemplate(string name) {
+            string templatePath = _test.GetTestFilePath(name);
+
+            _template = new CompilationInput(templatePath, name);
+            return this;
+        }
+
+        public bool Execute() {
+            _output = new CompilationOutput(_test.TestContext.TestName);
+
+            _options.References = _references;
+            _options.Sources = _sources.Cast<IStreamSource>().ToList();
+            _options.Resources = _resources.Cast<IStreamSource>().ToList();
+            _options.TemplateFile = _template;
+            _options.DocCommentFile = _comments;
+            _options.ScriptFile = _output;
+
+            ScriptCompiler compiler = new ScriptCompiler(this);
+            return compiler.Compile(_options);
+        }
+
+        #region Implementation of IErrorHandler
+
+        void IErrorHandler.ReportError(string errorMessage, string location) {
+            if (_errors == null) {
+                _errors = new List<string>();
+            }
+
+            string error = errorMessage + " " + location;
+
+            _errors.Add(error);
+            _test.TestContext.WriteLine(error);
+        }
+
+        #endregion
+    }
+}
diff --git a/tests/ScriptSharp/Core/CompilationInput.cs b/tests/ScriptSharp/Core/CompilationInput.cs
new file mode 100644
index 000000000..0995cdeb2
--- /dev/null
+++ b/tests/ScriptSharp/Core/CompilationInput.cs
@@ -0,0 +1,58 @@
+// CompilationInput.cs
+// Script#/Tests/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.IO;
+using System.Text;
+
+namespace ScriptSharp.Tests.Core {
+
+    public sealed class CompilationInput : IStreamSource {
+
+        private string _path;
+        private string _name;
+        private string _content;
+
+        public CompilationInput(string path, string name) {
+            _path = path;
+            _name = name;
+        }
+
+        public CompilationInput(string path, string name, string content) {
+            _path = path;
+            _name = name;
+            _content = content;
+        }
+
+        #region Implementation of IStreamSource
+
+        string IStreamSource.FullName {
+            get {
+                return _path;
+            }
+        }
+
+        string IStreamSource.Name {
+            get {
+                return _name;
+            }
+        }
+
+        void IStreamSource.CloseStream(Stream stream) {
+            stream.Close();
+        }
+
+        Stream IStreamSource.GetStream() {
+            if (_content != null) {
+                byte[] data = Encoding.UTF8.GetBytes(_content);
+                return new MemoryStream(data);
+            }
+
+            return File.OpenRead(_path);
+        }
+
+        #endregion
+    }
+}
diff --git a/tests/ScriptSharp/Core/CompilationOutput.cs b/tests/ScriptSharp/Core/CompilationOutput.cs
new file mode 100644
index 000000000..37ef1848c
--- /dev/null
+++ b/tests/ScriptSharp/Core/CompilationOutput.cs
@@ -0,0 +1,55 @@
+// CompilationOutput.cs
+// Script#/Tests/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.IO;
+using System.Text;
+
+namespace ScriptSharp.Tests.Core {
+
+    public sealed class CompilationOutput : IStreamSource {
+
+        private string _name;
+        private string _generatedOutput;
+
+        public CompilationOutput(string name) {
+            _name = name;
+        }
+
+        public string GeneratedOutput {
+            get {
+                return _generatedOutput;
+            }
+        }
+
+        #region Implementation of IStreamSource
+
+        string IStreamSource.FullName {
+            get {
+                return _name;
+            }
+        }
+
+        string IStreamSource.Name {
+            get {
+                return _name;
+            }
+        }
+
+        void IStreamSource.CloseStream(Stream stream) {
+            MemoryStream ms = (MemoryStream)stream;
+            byte[] buffer = ms.GetBuffer();
+
+            _generatedOutput = Encoding.UTF8.GetString(buffer, 0, (int)ms.Length);
+            ms.Close();
+        }
+
+        Stream IStreamSource.GetStream() {
+            return new MemoryStream();
+        }
+
+        #endregion
+    }
+}
diff --git a/tests/ScriptSharp/Core/CompilationTest.cs b/tests/ScriptSharp/Core/CompilationTest.cs
new file mode 100644
index 000000000..5cd4afd78
--- /dev/null
+++ b/tests/ScriptSharp/Core/CompilationTest.cs
@@ -0,0 +1,149 @@
+// CompilationTest.cs
+// Script#/Tests/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace ScriptSharp.Tests.Core {
+
+    public abstract class CompilationTest {
+
+        private TestContext _context;
+
+        public TestContext TestContext {
+            get {
+                return _context;
+            }
+            set {
+                _context = value;
+            }
+        }
+
+        protected Compilation CreateCompilation() {
+            return CreateCompilation(avoidStandardReferences: false);
+        }
+
+        protected Compilation CreateCompilation(bool avoidStandardReferences) {
+            Compilation compilation = new Compilation(this);
+            if (avoidStandardReferences == false) {
+                compilation.AddReference("mscorlib.dll");
+            }
+            compilation.Options.InternalTestMode = true;
+
+            return compilation;
+        }
+
+        public string GetAssemblyFilePath(string fileName) {
+            // Get the path to the ScriptSharp build output folder
+            string assemblyPath = this.GetType().Assembly.GetModules()[0].FullyQualifiedName;
+            string binPath = Path.GetFullPath(Path.Combine(assemblyPath, "..\\..\\..\\..\\..\\bin\\Debug"));
+
+            return Path.Combine(binPath, fileName);
+        }
+
+        public string GetTestFilePath(string fileName) {
+            // Get the path to the test cases folder
+            string assemblyPath = this.GetType().Assembly.GetModules()[0].FullyQualifiedName;
+            string testCasesPath = Path.GetFullPath(Path.Combine(assemblyPath, "..\\..\\..\\..\\TestCases\\"));
+
+            // Files within the test cases folder are organized into a two level folder
+            // structure ... group\test
+            // where group is mapped to the test class name, and test is mapped to the test name.
+            string groupName = this.GetType().Name;
+            string testName = _context.TestName;
+
+            if (groupName.EndsWith("Tests")) {
+                groupName = groupName.Substring(0, groupName.Length - 5);
+            }
+            if (testName.StartsWith("Test")) {
+                testName = testName.Substring(4);
+            }
+
+            return Path.Combine(testCasesPath, groupName, testName, fileName);
+        }
+
+        public string GetToolPath(string fileName) {
+            // Get the path to the tools folder
+            string assemblyPath = this.GetType().Assembly.GetModules()[0].FullyQualifiedName;
+            string toolsPath = Path.GetFullPath(Path.Combine(assemblyPath, "..\\..\\..\\..\\..\\tools\\bin"));
+
+            return Path.Combine(toolsPath, fileName);
+        }
+
+        protected void RunTest(Action<Compilation> compilationInitializer) {
+            RunTest(compilationInitializer, "Baseline.txt", avoidStandardReferences: false);
+        }
+
+        protected void RunTest(Action<Compilation> compilationInitializer, string baselineFile) {
+            RunTest(compilationInitializer, baselineFile, avoidStandardReferences: false);
+        }
+
+        protected void RunTest(Action<Compilation> compilationInitializer, string baselineFile, bool avoidStandardReferences) {
+            Compilation compilation = CreateCompilation(avoidStandardReferences);
+            compilationInitializer(compilation);
+
+            bool result = compilation.Execute();
+            Assert.IsTrue(result, "Compilation failed.");
+
+            string baselinePath = GetTestFilePath(baselineFile);
+            string baseline = File.ReadAllText(baselinePath);
+            string output = compilation.Output.GeneratedOutput;
+
+            bool validResults = ValidateResults(output, baselineFile);
+            if (validResults == false) {
+                string outputPath = Path.Combine(_context.TestRunDirectory, "..", this.GetType().Name + "." + _context.TestName + ".txt");
+                File.WriteAllText(outputPath, output);
+            }
+
+            Assert.IsTrue(validResults, "Unexpected differences between baseline and result.");
+        }
+
+        protected bool ValidateResults(string output, string baselineFile) {
+            string baselinePath = GetTestFilePath(baselineFile);
+            string baseline = File.ReadAllText(baselinePath);
+
+            if (String.CompareOrdinal(baseline, output) != 0) {
+                string diff = null;
+
+                string outputFile = Path.GetTempFileName();
+                try {
+                    File.WriteAllText(outputFile, output);
+
+                    ProcessStartInfo diffInfo = new ProcessStartInfo();
+                    diffInfo.FileName = GetToolPath("diff.exe");
+                    diffInfo.Arguments = "\"" + baselinePath + "\" \"" + outputFile + "\"";
+                    diffInfo.UseShellExecute = false;
+                    diffInfo.RedirectStandardOutput = true;
+
+                    Process diffProcess = Process.Start(diffInfo);
+
+                    diff = diffProcess.StandardOutput.ReadToEnd();
+                    diffProcess.WaitForExit();
+
+                    if (Debugger.IsAttached) {
+                        ProcessStartInfo windiffInfo = new ProcessStartInfo();
+                        windiffInfo.FileName = GetToolPath("windiff.exe");
+                        windiffInfo.Arguments = "\"" + baselinePath + "\" \"" + outputFile + "\"";
+                        windiffInfo.UseShellExecute = true;
+
+                        Process windiffProcess = Process.Start(windiffInfo);
+                        windiffProcess.WaitForExit();
+                    }
+                }
+                finally {
+                    File.Delete(outputFile);
+                }
+
+                Console.WriteLine(diff);
+                return false;
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/tests/ScriptSharp/ExpressionTests.cs b/tests/ScriptSharp/ExpressionTests.cs
new file mode 100644
index 000000000..77e3eaa89
--- /dev/null
+++ b/tests/ScriptSharp/ExpressionTests.cs
@@ -0,0 +1,191 @@
+// ExpressionTests.cs
+// Script#/Tests/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using ScriptSharp.Tests.Core;
+
+namespace ScriptSharp.Tests {
+
+    [TestClass]
+    public sealed class ExpressionTests : CompilationTest {
+
+        [TestMethod]
+        public void TestAnonymousMethods() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestArguments() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestBase() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestBinary() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestCast() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestConditional() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestDelegates() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestDictionary() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestEnumToString() {
+            RunTest((c) => {
+                c.AddSource("Code1.cs");
+            }, "NormalBaseline.txt");
+
+            RunTest((c) => {
+                c.AddSource("Code2.cs");
+                c.Options.DebugFlavor = false;
+                c.Options.Minimize = true;
+            }, "MinBaseline.txt");
+        }
+
+        [TestMethod]
+        public void TestEvents() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestGenerics() {
+            RunTest((c) => {
+                c.AddReference("Script.Web.dll").
+                  AddReference("Script.jQuery.dll").
+                  AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestGetType() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestGlobalMethods() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestInlineScript() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestLateBound() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestLiterals() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestLocals() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestMembers() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestNew() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestNumber() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestScript() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestString() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestTruthy() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestUnary() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+    }
+}
diff --git a/tests/ScriptSharp/LibraryTests.cs b/tests/ScriptSharp/LibraryTests.cs
new file mode 100644
index 000000000..83ec1f075
--- /dev/null
+++ b/tests/ScriptSharp/LibraryTests.cs
@@ -0,0 +1,26 @@
+// LibraryTests.cs
+// Script#/Tests/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using ScriptSharp.Tests.Core;
+
+namespace ScriptSharp.Tests {
+
+    [TestClass]
+    public sealed class LibraryTests : CompilationTest {
+
+        [TestMethod]
+        public void TestjQuery() {
+            RunTest((c) => {
+                c.AddReference("Script.Web.dll").
+                  AddReference("Script.jQuery.dll").
+                  AddSource("Code.cs");
+                c.Options.DebugFlavor = true;
+                c.Options.Defines = new string[] { "DEBUG" };
+            });
+        }
+    }
+}
diff --git a/tests/ScriptSharp/MemberTests.cs b/tests/ScriptSharp/MemberTests.cs
new file mode 100644
index 000000000..cc2d40500
--- /dev/null
+++ b/tests/ScriptSharp/MemberTests.cs
@@ -0,0 +1,73 @@
+// MemberTests.cs
+// Script#/Tests/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using ScriptSharp.Tests.Core;
+
+namespace ScriptSharp.Tests {
+
+    [TestClass]
+    public sealed class MemberTests : CompilationTest {
+
+        [TestMethod]
+        public void TestConstructors() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestEvents() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestFields() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestIndexers() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestMethods() {
+            RunTest((c) => {
+                c.AddReference("Script.Web.dll")
+                 .AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestProperties() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestOverloads() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestStaticConstructors() {
+            RunTest((c) => {
+                c.AddReference("Script.Web.dll").
+                  AddSource("Code.cs");
+            });
+        }
+    }
+}
diff --git a/tests/ScriptSharp/Properties/AssemblyInfo.cs b/tests/ScriptSharp/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..51d4449fb
--- /dev/null
+++ b/tests/ScriptSharp/Properties/AssemblyInfo.cs
@@ -0,0 +1,20 @@
+// AssemblyInfo.cs
+// Script#/Tests/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("ScriptSharp.Tests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Script#")]
+[assembly: AssemblyCopyright("Copyright © Script# 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/tests/ScriptSharp/ScriptSharp.csproj b/tests/ScriptSharp/ScriptSharp.csproj
new file mode 100644
index 000000000..a080e9d10
--- /dev/null
+++ b/tests/ScriptSharp/ScriptSharp.csproj
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>
+    </ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{0E3485F3-D66D-4907-BDB9-D61D34F97538}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ScriptSharp.Tests</RootNamespace>
+    <AssemblyName>ScriptSharp.Tests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.XML" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="ScriptSharp, Version=0.7.0.0, Culture=neutral, PublicKeyToken=8fc0e3af5abcb6c4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\Debug\ScriptSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="ScriptSharp.Build, Version=0.7.0.0, Culture=neutral, PublicKeyToken=8fc0e3af5abcb6c4, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\Debug\ScriptSharp.Build.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
+      <Visible>False</Visible>
+    </CodeAnalysisDependentAssemblyPaths>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BasicTests.cs" />
+    <Compile Include="ExpressionTests.cs" />
+    <Compile Include="StatementTests.cs" />
+    <Compile Include="MemberTests.cs" />
+    <Compile Include="TypeTests.cs" />
+    <Compile Include="ValidationTests.cs" />
+    <Compile Include="LibraryTests.cs" />
+    <Compile Include="Core\Compilation.cs" />
+    <Compile Include="Core\CompilationInput.cs" />
+    <Compile Include="Core\CompilationOutput.cs" />
+    <Compile Include="Core\CompilationTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/tests/ScriptSharp/StatementTests.cs b/tests/ScriptSharp/StatementTests.cs
new file mode 100644
index 000000000..a41efe255
--- /dev/null
+++ b/tests/ScriptSharp/StatementTests.cs
@@ -0,0 +1,78 @@
+// StatementTests.cs
+// Script#/Tests/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using ScriptSharp.Tests.Core;
+
+namespace ScriptSharp.Tests {
+
+    [TestClass]
+    public sealed class StatementTests : CompilationTest {
+
+        [TestMethod]
+        public void TestExceptions() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestExpression() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestFor() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestForeach() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestIfElse() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestReturn() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestSwitch() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestVariables() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestWhile() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+            });
+        }
+    }
+}
diff --git a/tests/ScriptSharp/TypeTests.cs b/tests/ScriptSharp/TypeTests.cs
new file mode 100644
index 000000000..ee60c48ad
--- /dev/null
+++ b/tests/ScriptSharp/TypeTests.cs
@@ -0,0 +1,134 @@
+// TypeTests.cs
+// Script#/Tests/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using ScriptSharp.Tests.Core;
+
+namespace ScriptSharp.Tests {
+
+    [TestClass]
+    public sealed class TypeTests : CompilationTest {
+
+        [TestMethod]
+        public void TestClasses() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+                c.Options.DebugFlavor = true;
+            });
+        }
+
+        [TestMethod]
+        public void TestDelegates() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+                c.Options.DebugFlavor = true;
+            });
+        }
+
+        [TestMethod]
+        public void TestEnumerator() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+                c.Options.DebugFlavor = true;
+            });
+        }
+
+        [TestMethod]
+        public void TestEnums() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+                c.Options.DebugFlavor = true;
+            });
+        }
+
+        [TestMethod]
+        public void TestGlobals() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+                c.Options.DebugFlavor = true;
+            });
+        }
+
+        [TestMethod]
+        public void TestImported() {
+            RunTest((c) => {
+                c.AddReference("Script.Web.dll").
+                  AddSource("Code.cs");
+            });
+        }
+
+        [TestMethod]
+        public void TestInterfaces() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+                c.Options.DebugFlavor = true;
+            });
+        }
+
+        [TestMethod]
+        public void TestNamespaces() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+                c.Options.DebugFlavor = true;
+            });
+        }
+
+        [TestMethod]
+        public void TestNullable() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+                c.Options.DebugFlavor = true;
+            });
+        }
+
+        [TestMethod]
+        public void TestPartials() {
+            RunTest((c) => {
+                c.AddReference("Script.Web.dll").
+                  AddSource("Code1.cs").
+                  AddSource("Code2.cs");
+                c.Options.DebugFlavor = true;
+            });
+        }
+
+        [TestMethod]
+        public void TestRecords() {
+            RunTest((c) => {
+                c.AddSource("Code.cs");
+                c.Options.DebugFlavor = true;
+            });
+        }
+
+        [TestMethod]
+        public void TestScriptNamespaces() {
+            RunTest((c) => {
+                c.AddSource("LibraryAssemblyInfo.cs").
+                  AddSource("LibraryFeature.cs").
+                  AddSource("LibraryMyLib.cs");
+                c.Options.DebugFlavor = true;
+            }, "LibraryBaseline.txt");
+
+            RunTest((c) => {
+                c.AddReference("Lib.dll").
+                  AddSource("AppAssemblyInfo.cs").
+                  AddSource("AppFeature.cs").
+                  AddSource("AppMyApp.cs").
+                  AddSource("AppFoo.1.cs").
+                  AddSource("AppFoo.2.cs");
+                c.Options.DebugFlavor = true;
+            }, "AppBaseline.txt");
+        }
+
+        [TestMethod]
+        public void TestUsingAlias() {
+            RunTest((c) => {
+                c.AddReference("Script.Web.dll").
+                  AddSource("Code.cs");
+                c.Options.DebugFlavor = true;
+            });
+        }
+    }
+}
diff --git a/tests/ScriptSharp/ValidationTests.cs b/tests/ScriptSharp/ValidationTests.cs
new file mode 100644
index 000000000..1d79daf07
--- /dev/null
+++ b/tests/ScriptSharp/ValidationTests.cs
@@ -0,0 +1,287 @@
+// ValidationTests.cs
+// Script#/Tests/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Linq;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using ScriptSharp.Tests.Core;
+
+namespace ScriptSharp.Tests {
+
+    [TestClass]
+    public sealed class ValidationTests : CompilationTest {
+
+        [TestMethod]
+        public void TestConflictingTypes() {
+            string expectedErrors =
+                "The type 'test.App' conflicts with another existing type with the same full name. " +
+                "This might be because a referenced assembly uses the same type, or you have multiple " +
+                "types with the same name across namespaces mapped to the same script namespace. ";
+
+            Compilation compilation = CreateCompilation();
+            compilation.AddSource("Code.cs");
+
+            bool result = compilation.Execute();
+            Assert.IsFalse(result, "Expected compilation to fail.");
+
+            Assert.IsTrue(compilation.HasErrors, "Expected compilation to fail with errors.");
+            if (String.CompareOrdinal(compilation.ErrorMessages, expectedErrors) != 0) {
+                Console.WriteLine("Expected Errors:");
+                Console.WriteLine(expectedErrors);
+                Console.WriteLine();
+                Console.WriteLine("Actual Errors:");
+                Console.WriteLine(compilation.ErrorMessages);
+                Console.WriteLine();
+
+                Assert.Fail("Unexpected errors.");
+            }
+        }
+
+        [TestMethod]
+        public void TestCreateInstance() {
+            string expectedErrors =
+                "You must store the type returned from a method or property into a local variable to use with Type.CreateInstance. Code.cs(37, 25)" + Environment.NewLine +
+                "You must store the type returned from a method or property into a local variable to use with Type.CreateInstance. Code.cs(38, 25)";
+
+            Compilation compilation = CreateCompilation();
+            compilation.AddSource("Code.cs");
+
+            bool result = compilation.Execute();
+            Assert.IsFalse(result, "Expected compilation to fail.");
+
+            Assert.IsTrue(compilation.HasErrors, "Expected compilation to fail with errors.");
+            if (String.CompareOrdinal(compilation.ErrorMessages, expectedErrors) != 0) {
+                Console.WriteLine("Expected Errors:");
+                Console.WriteLine(expectedErrors);
+                Console.WriteLine();
+                Console.WriteLine("Actual Errors:");
+                Console.WriteLine(compilation.ErrorMessages);
+                Console.WriteLine();
+
+                Assert.Fail("Unexpected errors.");
+            }
+        }
+
+        [TestMethod]
+        public void TestExceptions() {
+            string expectedErrors =
+                "Try/Catch statements are limited to a single catch clause. Code.cs(12, 13)" + Environment.NewLine +
+                "Throw statements must specify an exception object. Code.cs(26, 17)";
+
+            Compilation compilation = CreateCompilation();
+            compilation.AddSource("Code.cs");
+
+            bool result = compilation.Execute();
+            Assert.IsFalse(result, "Expected compilation to fail.");
+
+            Assert.IsTrue(compilation.HasErrors, "Expected compilation to fail with errors.");
+            if (String.CompareOrdinal(compilation.ErrorMessages, expectedErrors) != 0) {
+                Console.WriteLine("Expected Errors:");
+                Console.WriteLine(expectedErrors);
+                Console.WriteLine();
+                Console.WriteLine("Actual Errors:");
+                Console.WriteLine(compilation.ErrorMessages);
+                Console.WriteLine();
+
+                Assert.Fail("Unexpected errors.");
+            }
+        }
+
+        [TestMethod]
+        public void TestImplicitEnums() {
+            string expectedErrors =
+                "Enumeration fields must have an explicit constant value specified. Code.cs(13, 9)";
+
+            Compilation compilation = CreateCompilation();
+            compilation.AddSource("Code.cs");
+
+            bool result = compilation.Execute();
+            Assert.IsFalse(result, "Expected compilation to fail.");
+
+            Assert.IsTrue(compilation.HasErrors, "Expected compilation to fail with errors.");
+            if (String.CompareOrdinal(compilation.ErrorMessages, expectedErrors) != 0) {
+                Console.WriteLine("Expected Errors:");
+                Console.WriteLine(expectedErrors);
+                Console.WriteLine();
+                Console.WriteLine("Actual Errors:");
+                Console.WriteLine(compilation.ErrorMessages);
+                Console.WriteLine();
+
+                Assert.Fail("Unexpected errors.");
+            }
+        }
+
+        [TestMethod]
+        public void TestInlineScript() {
+            string expectedErrors =
+                "The argument to Script.Literal must be a constant string. Code.cs(15, 28)";
+
+            Compilation compilation = CreateCompilation();
+            compilation.AddSource("Code.cs");
+
+            bool result = compilation.Execute();
+            Assert.IsFalse(result, "Expected compilation to fail.");
+
+            Assert.IsTrue(compilation.HasErrors, "Expected compilation to fail with errors.");
+            if (String.CompareOrdinal(compilation.ErrorMessages, expectedErrors) != 0) {
+                Console.WriteLine("Expected Errors:");
+                Console.WriteLine(expectedErrors);
+                Console.WriteLine();
+                Console.WriteLine("Actual Errors:");
+                Console.WriteLine(compilation.ErrorMessages);
+                Console.WriteLine();
+
+                Assert.Fail("Unexpected errors.");
+            }
+        }
+
+        [TestMethod]
+        public void TestKeywords() {
+            string expectedErrors =
+                "ss is a reserved word. Code.cs(12, 17)" + Environment.NewLine +
+                "instanceof is a reserved word. Code.cs(16, 17)";
+
+            Compilation compilation = CreateCompilation();
+            compilation.AddSource("Code.cs");
+
+            bool result = compilation.Execute();
+            Assert.IsFalse(result, "Expected compilation to fail.");
+
+            Assert.IsTrue(compilation.HasErrors, "Expected compilation to fail with errors.");
+            if (String.CompareOrdinal(compilation.ErrorMessages, expectedErrors) != 0) {
+                Console.WriteLine("Expected Errors:");
+                Console.WriteLine(expectedErrors);
+                Console.WriteLine();
+                Console.WriteLine("Actual Errors:");
+                Console.WriteLine(compilation.ErrorMessages);
+                Console.WriteLine();
+
+                Assert.Fail("Unexpected errors.");
+            }
+        }
+
+        [TestMethod]
+        public void TestNestedTypes() {
+            string expectedErrors =
+                "Only members are allowed inside types. Nested types are not supported. Code.cs(9, 5)" + Environment.NewLine +
+                "Only members are allowed inside types. Nested types are not supported. Code.cs(9, 5)";
+
+            Compilation compilation = CreateCompilation();
+            compilation.AddSource("Code.cs");
+
+            bool result = compilation.Execute();
+            Assert.IsFalse(result, "Expected compilation to fail.");
+
+            Assert.IsTrue(compilation.HasErrors, "Expected compilation to fail with errors.");
+            if (String.CompareOrdinal(compilation.ErrorMessages, expectedErrors) != 0) {
+                Console.WriteLine("Expected Errors:");
+                Console.WriteLine(expectedErrors);
+                Console.WriteLine();
+                Console.WriteLine("Actual Errors:");
+                Console.WriteLine(compilation.ErrorMessages);
+                Console.WriteLine();
+
+                Assert.Fail("Unexpected errors.");
+            }
+        }
+
+        [TestMethod]
+        public void TestOverloads() {
+            string expectedErrors =
+                "Extern methods used to declare alternate signatures should have a corresponding non-extern implementation as well. Code.cs(11, 9)" + Environment.NewLine +
+                "The implemenation method and associated alternate signature methods should have the same access type. Code.cs(14, 9)" + Environment.NewLine +
+                "The implemenation method and associated alternate signature methods should have the same access type. Code.cs(17, 9)";
+
+            Compilation compilation = CreateCompilation();
+            compilation.AddSource("Code.cs");
+
+            bool result = compilation.Execute();
+            Assert.IsFalse(result, "Expected compilation to fail.");
+
+            Assert.IsTrue(compilation.HasErrors, "Expected compilation to fail with errors.");
+            if (String.CompareOrdinal(compilation.ErrorMessages, expectedErrors) != 0) {
+                Console.WriteLine("Expected Errors:");
+                Console.WriteLine(expectedErrors);
+                Console.WriteLine();
+                Console.WriteLine("Actual Errors:");
+                Console.WriteLine(compilation.ErrorMessages);
+                Console.WriteLine();
+
+                Assert.Fail("Unexpected errors.");
+            }
+        }
+
+        [TestMethod]
+        public void TestProperties() {
+            string expectedErrors =
+                "Set-only properties are not supported. Use a set method instead. Code.cs(11, 9)";
+
+            Compilation compilation = CreateCompilation();
+            compilation.AddSource("Code.cs");
+
+            bool result = compilation.Execute();
+            Assert.IsFalse(result, "Expected compilation to fail.");
+
+            Assert.IsTrue(compilation.HasErrors, "Expected compilation to fail with errors.");
+            if (String.CompareOrdinal(compilation.ErrorMessages, expectedErrors) != 0) {
+                Console.WriteLine("Expected Errors:");
+                Console.WriteLine(expectedErrors);
+                Console.WriteLine();
+                Console.WriteLine("Actual Errors:");
+                Console.WriteLine(compilation.ErrorMessages);
+                Console.WriteLine();
+
+                Assert.Fail("Unexpected errors.");
+            }
+        }
+
+        [TestMethod]
+        public void TestUnsupported() {
+            string expectedErrors1 =
+                "Type destructors are not supported. Code1.cs(14, 9)" + Environment.NewLine +
+                "Using statements are not supported. Code1.cs(18, 13)" + Environment.NewLine +
+                "Derived interface types are not supported. Code1.cs(26, 5)";
+
+            string expectedErrors2 =
+                "Check that your C# source compiles and that you are not using an unsupported feature. Common things to check for include use of fully-qualified names (use a using statement to import namespaces instead) or accessing private members of a type from a static member of the same type. Code2.cs(12, 13)";
+
+            Compilation compilation1 = CreateCompilation();
+            compilation1.AddSource("Code1.cs");
+
+            bool result1 = compilation1.Execute();
+            Assert.IsFalse(result1, "Expected compilation to fail.");
+
+            Assert.IsTrue(compilation1.HasErrors, "Expected compilation to fail with errors.");
+            if (String.CompareOrdinal(compilation1.ErrorMessages, expectedErrors1) != 0) {
+                Console.WriteLine("Expected Errors:");
+                Console.WriteLine(expectedErrors1);
+                Console.WriteLine();
+                Console.WriteLine("Actual Errors:");
+                Console.WriteLine(compilation1.ErrorMessages);
+                Console.WriteLine();
+
+                Assert.Fail("Unexpected errors.");
+            }
+
+            Compilation compilation2 = CreateCompilation();
+            compilation2.AddSource("Code2.cs");
+
+            bool result2 = compilation2.Execute();
+            Assert.IsFalse(result2, "Expected compilation to fail.");
+
+            Assert.IsTrue(compilation2.HasErrors, "Expected compilation to fail with errors.");
+            if (String.CompareOrdinal(compilation2.ErrorMessages, expectedErrors2) != 0) {
+                Console.WriteLine("Expected Errors:");
+                Console.WriteLine(expectedErrors2);
+                Console.WriteLine();
+                Console.WriteLine("Actual Errors:");
+                Console.WriteLine(compilation2.ErrorMessages);
+                Console.WriteLine();
+
+                Assert.Fail("Unexpected errors.");
+            }
+        }
+    }
+}
diff --git a/tests/ScriptSharpTests.sln b/tests/ScriptSharpTests.sln
new file mode 100644
index 000000000..8fcdb92c6
--- /dev/null
+++ b/tests/ScriptSharpTests.sln
@@ -0,0 +1,49 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScriptSharp", "ScriptSharp\ScriptSharp.csproj", "{0E3485F3-D66D-4907-BDB9-D61D34F97538}"
+EndProject
+Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "CoreLib", "CoreLib\", "{956971CD-A3AA-4C69-BF6E-A42A580B08CB}"
+	ProjectSection(WebsiteProperties) = preProject
+		TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
+		Debug.AspNetCompiler.VirtualPath = "/CoreLib"
+		Debug.AspNetCompiler.PhysicalPath = "CoreLib\"
+		Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\CoreLib\"
+		Debug.AspNetCompiler.Updateable = "true"
+		Debug.AspNetCompiler.ForceOverwrite = "true"
+		Debug.AspNetCompiler.FixedNames = "false"
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.VirtualPath = "/CoreLib"
+		Release.AspNetCompiler.PhysicalPath = "CoreLib\"
+		Release.AspNetCompiler.TargetPath = "PrecompiledWeb\CoreLib\"
+		Release.AspNetCompiler.Updateable = "true"
+		Release.AspNetCompiler.ForceOverwrite = "true"
+		Release.AspNetCompiler.FixedNames = "false"
+		Release.AspNetCompiler.Debug = "False"
+		VWDPort = "23597"
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{37D238E7-539B-497A-98D7-760DAFCF6527}"
+	ProjectSection(SolutionItems) = preProject
+		ScriptSharp.testsettings = ScriptSharp.testsettings
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{0E3485F3-D66D-4907-BDB9-D61D34F97538}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E3485F3-D66D-4907-BDB9-D61D34F97538}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E3485F3-D66D-4907-BDB9-D61D34F97538}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E3485F3-D66D-4907-BDB9-D61D34F97538}.Release|Any CPU.Build.0 = Release|Any CPU
+		{956971CD-A3AA-4C69-BF6E-A42A580B08CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{956971CD-A3AA-4C69-BF6E-A42A580B08CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{956971CD-A3AA-4C69-BF6E-A42A580B08CB}.Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{956971CD-A3AA-4C69-BF6E-A42A580B08CB}.Release|Any CPU.Build.0 = Debug|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/tests/TestCases/Basic/Conditionals/Code.cs b/tests/TestCases/Basic/Conditionals/Code.cs
new file mode 100644
index 000000000..ca5ec90bc
--- /dev/null
+++ b/tests/TestCases/Basic/Conditionals/Code.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace BasicTests {
+
+    public static class MyDebug {
+
+        [Conditional("DEBUG")]
+        public static void ShowInfo() {
+        }
+
+        [Conditional("TRACE")]
+        public static void TraceInfo() {
+        }
+
+        [Conditional("RETAIL")]
+        public static void LogInfo() {
+        }
+    }
+
+    public class App {
+
+        public App(int i) {
+            Debug.Assert(false);
+            MyDebug.ShowInfo();
+
+            while (true) {
+                Debug.Assert(false);
+            }
+
+            switch (i) {
+                case 0:
+                    Debug.Assert(false);
+                    break;
+            }
+
+            {
+                Debug.Assert(i != 0);
+            }
+
+            {
+                Debug.Assert(i != 0);
+                i++;
+            }
+            
+            if (false)
+                Debug.WriteLine("Debug spew");
+                
+            while (false)
+                Debug.WriteLine(".");
+
+            for (int i = 0; i < 10; i++)
+                Debug.WriteLine(".");
+
+            MyDebug.TraceInfo();
+
+            MyDebug.LogInfo();
+        }
+    }
+}
diff --git a/tests/TestCases/Basic/Conditionals/DebugBaseline.txt b/tests/TestCases/Basic/Conditionals/DebugBaseline.txt
new file mode 100644
index 000000000..eb4eaa464
--- /dev/null
+++ b/tests/TestCases/Basic/Conditionals/DebugBaseline.txt
@@ -0,0 +1,46 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyDebug
+
+test.MyDebug = function test_MyDebug() {
+}
+test.MyDebug.showInfo = function test_MyDebug$showInfo() {
+}
+test.MyDebug.traceInfo = function test_MyDebug$traceInfo() {
+}
+test.MyDebug.logInfo = function test_MyDebug$logInfo() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function test_App(i) {
+    console.assert(false);
+    test.MyDebug.showInfo();
+    while (true) {
+        console.assert(false);
+    }
+    switch (i) {
+        case 0:
+            console.assert(false);
+            break;
+    }
+    console.assert(!!i);
+    console.assert(!!i);
+    i++;
+    if (false) {
+        console.log('Debug spew');
+    }
+    while (false) {
+        console.log('.');
+    }
+    for (var i = 0; i < 10; i++) {
+        console.log('.');
+    }
+}
+
+
+test.MyDebug.registerClass('test.MyDebug');
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Basic/Conditionals/TraceBaseline.txt b/tests/TestCases/Basic/Conditionals/TraceBaseline.txt
new file mode 100644
index 000000000..68b6097d4
--- /dev/null
+++ b/tests/TestCases/Basic/Conditionals/TraceBaseline.txt
@@ -0,0 +1,32 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyDebug
+
+test.MyDebug = function() {
+}
+test.MyDebug.showInfo = function() {
+}
+test.MyDebug.traceInfo = function() {
+}
+test.MyDebug.logInfo = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function(i) {
+    while (true) {
+    }
+    switch (i) {
+        case 0:
+            break;
+    }
+    i++;
+    test.MyDebug.traceInfo();
+}
+
+
+test.MyDebug.registerClass('test.MyDebug');
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Basic/DocComments/Baseline.txt b/tests/TestCases/Basic/DocComments/Baseline.txt
new file mode 100644
index 000000000..76c48625e
--- /dev/null
+++ b/tests/TestCases/Basic/DocComments/Baseline.txt
@@ -0,0 +1,294 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Suit
+
+test.Suit = function() { 
+    /// <summary>
+    /// Represents a card suit.
+    /// </summary>
+    /// <field name="heart" type="Number" integer="true" static="true">
+    /// The hearts.
+    /// </field>
+    /// <field name="spade" type="Number" integer="true" static="true">
+    /// The spades.
+    /// </field>
+    /// <field name="club" type="Number" integer="true" static="true">
+    /// The clubs.
+    /// </field>
+    /// <field name="diamond" type="Number" integer="true" static="true">
+    /// The diamonds.
+    /// </field>
+};
+test.Suit.prototype = {
+    heart: 0, 
+    spade: 1, 
+    club: 2, 
+    diamond: 3
+}
+test.Suit.registerEnum('test.Suit', false);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.RecordClass
+
+test.$create_RecordClass = function test_RecordClass(count) {
+    var $o = { };
+    return $o;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.IInterface
+
+test.IInterface = function() { 
+    /// <summary>
+    /// Represents an interface.
+    /// </summary>
+};
+test.IInterface.prototype = {
+    execute : null
+}
+test.IInterface.registerInterface('test.IInterface');
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.BaseClass
+
+test.BaseClass = function test_BaseClass(domElement, name, count) {
+    /// <summary>
+    /// Represents a base class.
+    /// </summary>
+    /// <param name="domElement" type="Object" domElement="true">
+    /// The parent element.
+    /// </param>
+    /// <param name="name" type="String">
+    /// The name.
+    /// </param>
+    /// <param name="count" type="Number" integer="true">
+    /// The count.
+    /// </param>
+    /// <field name="constantField" type="Number" integer="true" static="true">
+    /// A constant field.
+    /// </field>
+    /// <field name="staticField" type="String" static="true">
+    /// A static field.
+    /// </field>
+    /// <field name="instanceField" type="Number" integer="true">
+    /// An instance field.
+    /// </field>
+    /// <field name="_domElement" type="Object" domElement="true">
+    /// A private field.
+    /// </field>
+    /// <field name="__initialized" type="Function">
+    /// </field>
+    this._domElement = domElement;
+}
+test.BaseClass.get_totalCount = function test_BaseClass$get_totalCount() {
+    /// <summary>
+    /// Gets the total count.
+    /// </summary>
+    /// <value type="Number" integer="true"></value>
+    return 0;
+}
+test.BaseClass.staticMethod = function test_BaseClass$staticMethod(length) {
+    /// <summary>
+    /// A static method.
+    /// </summary>
+    /// <param name="length" type="Number" integer="true">
+    /// The length.
+    /// </param>
+}
+test.BaseClass.prototype = {
+    instanceField: 0,
+    _domElement: null,
+    
+    get_name: function test_BaseClass$get_name() {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value type="String"></value>
+        return null;
+    },
+    set_name: function test_BaseClass$set_name(value) {
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        /// <value type="String"></value>
+        return value;
+    },
+    
+    get_domElement: function test_BaseClass$get_domElement() {
+        /// <summary>
+        /// Gets or sets the element.
+        /// </summary>
+        /// <value type="Object" domElement="true"></value>
+        return null;
+    },
+    set_domElement: function test_BaseClass$set_domElement(value) {
+        /// <summary>
+        /// Gets or sets the element.
+        /// </summary>
+        /// <value type="Object" domElement="true"></value>
+        return value;
+    },
+    
+    get_count: function test_BaseClass$get_count() {
+        /// <summary>
+        /// Gets the count.
+        /// </summary>
+        /// <value type="Number" integer="true"></value>
+        return 0;
+    },
+    
+    get__privateName: function test_BaseClass$get__privateName() {
+        /// <summary>
+        /// Gets the private name.
+        /// </summary>
+        /// <value type="String"></value>
+        return null;
+    },
+    
+    add_initialized: function test_BaseClass$add_initialized(value) {
+        /// <summary>
+        /// Adds or removes a delegate for the Initialized event.
+        /// </summary>
+        /// <param name="value" type="Function" />
+        this.__initialized = ss.Delegate.combine(this.__initialized, value);
+    },
+    remove_initialized: function test_BaseClass$remove_initialized(value) {
+        /// <summary>
+        /// Adds or removes a delegate for the Initialized event.
+        /// </summary>
+        /// <param name="value" type="Function" />
+        this.__initialized = ss.Delegate.remove(this.__initialized, value);
+    },
+    
+    __initialized: null,
+    
+    method1: function test_BaseClass$method1() {
+        /// <summary>
+        /// Empty method.
+        /// </summary>
+    },
+    
+    method2: function test_BaseClass$method2() {
+        /// <summary>
+        /// Method with return value.
+        /// </summary>
+        /// <returns type="String"></returns>
+        return null;
+    },
+    
+    method3: function test_BaseClass$method3(first, last) {
+        /// <summary>
+        /// Method with params.
+        /// </summary>
+        /// <param name="first" type="String">
+        /// The first name.
+        /// </param>
+        /// <param name="last" type="String">
+        /// The last name.
+        /// </param>
+    },
+    
+    method4: function test_BaseClass$method4(count) {
+        /// <summary>
+        /// Method with both params and return value.
+        /// </summary>
+        /// <param name="count" type="Number" integer="true">
+        /// The count.
+        /// </param>
+        /// <returns type="Array" elementType="String"></returns>
+        return null;
+    },
+    
+    onInitialized: function test_BaseClass$onInitialized() {
+        /// <summary>
+        /// Raises the Initialized event.
+        /// </summary>
+        if (this.__initialized != null) {
+        }
+    },
+    
+    _privateMethod: function test_BaseClass$_privateMethod(count) {
+        /// <summary>
+        /// Private method.
+        /// </summary>
+        /// <param name="count" type="Number" integer="true">
+        /// The count.
+        /// </param>
+    },
+    get_item: function test_BaseClass$get_item(ids) {
+        /// <summary>
+        /// Gets item by identifiers.
+        /// </summary>
+        /// <param name="ids" type="Array" elementType="Number" elementInteger="true">
+        /// The identifiers.
+        /// </param>
+        /// <param name="value" type="String">
+        /// </param>
+        /// <returns type="String"></returns>
+        return null;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.DerivedClass
+
+test.DerivedClass = function test_DerivedClass() {
+    /// <summary>
+    /// Represents a derived class.
+    /// </summary>
+    test.DerivedClass.initializeBase(this, [ null, null, 0 ]);
+}
+test.DerivedClass.prototype = {
+    
+    method3: function test_DerivedClass$method3(first, last) {
+        /// <summary>
+        /// Overriden method with params.
+        /// </summary>
+        /// <param name="first" type="String">
+        /// The first name.
+        /// </param>
+        /// <param name="last" type="String">
+        /// The last name.
+        /// </param>
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test._internalClass
+
+test._internalClass = function test__internalClass() {
+    /// <summary>
+    /// An internal class.
+    /// </summary>
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test._internalClassWithNoComments
+
+test._internalClassWithNoComments = function test__internalClassWithNoComments() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.GlobalMethodsClass
+
+window.run = function test_GlobalMethodsClass$run() {
+    /// <summary>
+    /// Runs.
+    /// </summary>
+}
+
+
+test.BaseClass.registerClass('test.BaseClass');
+test.DerivedClass.registerClass('test.DerivedClass', test.BaseClass);
+test._internalClass.registerClass('test._internalClass');
+test._internalClassWithNoComments.registerClass('test._internalClassWithNoComments');
+test.BaseClass.constantField = 3;
+test.BaseClass.staticField = null;
diff --git a/tests/TestCases/Basic/DocComments/Code.cs b/tests/TestCases/Basic/DocComments/Code.cs
new file mode 100644
index 000000000..a91822eee
--- /dev/null
+++ b/tests/TestCases/Basic/DocComments/Code.cs
@@ -0,0 +1,262 @@
+using System;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace BasicTests {
+
+    /// <summary>
+    /// Represents a card suit.
+    /// </summary>
+    public enum Suit {
+
+        /// <summary>
+        /// The hearts.
+        /// </summary>
+        Heart = 0,
+
+        /// <summary>
+        /// The spades.
+        /// </summary>
+        Spade = 1,
+
+        /// <summary>
+        /// The clubs.
+        /// </summary>
+        Club = 2,
+
+        /// <summary>
+        /// The diamonds.
+        /// </summary>
+        Diamond = 3,
+    }
+
+    /// <summary>
+    /// Represents a color.
+    /// </summary>
+    internal enum Color {
+
+        Red = 0,
+
+        /// <summary>
+        /// The color green.
+        /// </summary>
+        Green = 1,
+    }
+
+    /// <summary>
+    /// Represents a base class.
+    /// </summary>
+    public class BaseClass {
+
+        /// <summary>
+        /// A constant field.
+        /// </summary>
+        public const uint ConstantField = 3;
+
+        /// <summary>
+        /// A static field.
+        /// </summary>
+        public static string StaticField;
+
+        /// <summary>
+        /// An instance field.
+        /// </summary>
+        public int InstanceField;
+
+        /// <summary>
+        /// A private field.
+        /// </summary>
+        private Element domElement;
+
+        /// <summary>
+        /// Initializes a new instance of the BaseClass class.
+        /// </summary>
+        /// <param name="domElement">The parent element.</param>
+        /// <param name="name">The name.</param>
+        /// <param name="count">The count.</param>
+        public BaseClass(Element domElement, string name, int count) {
+            this.domElement = domElement;
+        }
+
+        /// <summary>
+        /// Gets or sets the name.
+        /// </summary>
+        public string Name {
+            get { return null; }
+            set { }
+        }
+
+        /// <summary>
+        /// Gets or sets the element.
+        /// </summary>
+        public Element DOMElement {
+            get { return null; }
+            set { }
+        }
+
+        /// <summary>
+        /// Gets the count.
+        /// </summary>
+        public int Count {
+            get { return 0; }
+        }
+
+        /// <summary>
+        /// Gets the private name.
+        /// </summary>
+        private string PrivateName {
+            get { return null; }
+        }
+
+        /// <summary>
+        /// Gets the total count.
+        /// </summary>
+        public static int TotalCount {
+            get { return 0; }
+        }
+
+        /// <summary>
+        /// Adds or removes a delegate for the Initialized event.
+        /// </summary>
+        public event EventHandler Initialized;
+
+        /// <summary>
+        /// Gets item by identifiers.
+        /// </summary>
+        /// <param name="ids">The identifiers.</param>
+        /// <returns>The item.</returns>
+        public string this[int[] ids] {
+            get {
+                return null;
+            }
+        }
+
+        /// <summary>
+        /// Empty method.
+        /// </summary>
+        public void Method1() {
+        }
+
+        /// <summary>
+        /// Method with return value.
+        /// </summary>
+        /// <returns>The string.</returns>
+        public string Method2() {
+            return null;
+        }
+
+        /// <summary>
+        /// Method with params.
+        /// </summary>
+        /// <param name="first">The first name.</param>
+        /// <param name="last">The last name.</param>
+        public virtual void Method3(string first, string last) {
+        }
+
+        /// <summary>
+        /// Method with both params and return value.
+        /// </summary>
+        /// <param name="count">The count.</param>
+        /// <returns>The set of names.</returns>
+        public string[] Method4(int count) {
+            return null;
+        }
+
+        /// <summary>
+        /// Raises the Initialized event.
+        /// </summary>
+        protected internal void OnInitialized() {
+            if (this.Initialized != null) {
+            }
+        }
+
+        /// <summary>
+        /// Private method.
+        /// </summary>
+        /// <param name="count">The count.</param>
+        private void PrivateMethod(int count) {
+        }
+
+        /// <summary>
+        /// A static method.
+        /// </summary>
+        /// <param name="length">The length.</param>
+        public static void StaticMethod(int length) {
+        }
+    }
+
+    /// <summary>
+    /// Represents a derived class.
+    /// </summary>
+    public class DerivedClass : BaseClass {
+
+        /// <summary>
+        /// Internal constructor.
+        /// </summary>
+        internal DerivedClass()
+            : base(null, null, 0) {
+        }
+
+        /// <summary>
+        /// Overriden method with params.
+        /// </summary>
+        /// <param name="first">The first name.</param>
+        /// <param name="last">The last name.</param>
+        public override void Method3(string first, string last) {
+        }
+    }
+
+    /// <summary>
+    /// An internal class.
+    /// </summary>
+    internal class InternalClass {
+    }
+
+    internal class InternalClassWithNoComments {
+    }
+
+    /// <summary>
+    /// Represents a record.
+    /// </summary>
+    public sealed class RecordClass : Record {
+
+        /// <summary>
+        /// Gets or sets a count.
+        /// </summary>
+        public int Count;
+
+        /// <summary>
+        /// Initializes a new instance of the RecordClass class.
+        /// </summary>
+        /// <param name="count">A count.</param>
+        public RecordClass(int count) {
+        }
+    }
+
+    /// <summary>
+    /// Represents an interface.
+    /// </summary>
+    public interface IInterface {
+
+        /// <summary>
+        /// Executes code.
+        /// </summary>
+        void Execute();
+    }
+
+    /// <summary>
+    /// Class with global methods.
+    /// </summary>
+    [GlobalMethods]
+    public static class GlobalMethodsClass {
+
+        /// <summary>
+        /// Runs.
+        /// </summary>
+        public static void Run() {
+        }
+    }
+}
diff --git a/tests/TestCases/Basic/DocComments/DocComments.xml b/tests/TestCases/Basic/DocComments/DocComments.xml
new file mode 100644
index 000000000..e9461611c
--- /dev/null
+++ b/tests/TestCases/Basic/DocComments/DocComments.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0"?>
+<doc>
+    <assembly>
+        <name>Code</name>
+    </assembly>
+    <members>
+        <member name="T:BasicTests.Suit">
+            <summary>
+            Represents a card suit.
+            </summary>
+        </member>
+        <member name="F:BasicTests.Suit.Heart">
+            <summary>
+            The hearts.
+            </summary>
+        </member>
+        <member name="F:BasicTests.Suit.Spade">
+            <summary>
+            The spades.
+            </summary>
+        </member>
+        <member name="F:BasicTests.Suit.Club">
+            <summary>
+            The clubs.
+            </summary>
+        </member>
+        <member name="F:BasicTests.Suit.Diamond">
+            <summary>
+            The diamonds.
+            </summary>
+        </member>
+        <member name="T:BasicTests.Color">
+            <summary>
+            Represents a color.
+            </summary>
+        </member>
+        <member name="F:BasicTests.Color.Green">
+            <summary>
+            The color green.
+            </summary>
+        </member>
+        <member name="T:BasicTests.BaseClass">
+            <summary>
+            Represents a base class.
+            </summary>
+        </member>
+        <member name="F:BasicTests.BaseClass.ConstantField">
+            <summary>
+            A constant field.
+            </summary>
+        </member>
+        <member name="F:BasicTests.BaseClass.StaticField">
+            <summary>
+            A static field.
+            </summary>
+        </member>
+        <member name="F:BasicTests.BaseClass.InstanceField">
+            <summary>
+            An instance field.
+            </summary>
+        </member>
+        <member name="F:BasicTests.BaseClass.domElement">
+            <summary>
+            A private field.
+            </summary>
+        </member>
+        <member name="M:BasicTests.BaseClass.#ctor(System.Html.Element,System.String,System.Int32)">
+            <summary>
+            Initializes a new instance of the BaseClass class.
+            </summary>
+            <param name="domElement">The parent element.</param>
+            <param name="name">The name.</param>
+            <param name="count">The count.</param>
+        </member>
+        <member name="M:BasicTests.BaseClass.Method1">
+            <summary>
+            Empty method.
+            </summary>
+        </member>
+        <member name="M:BasicTests.BaseClass.Method2">
+            <summary>
+            Method with return value.
+            </summary>
+            <returns>The string.</returns>
+        </member>
+        <member name="M:BasicTests.BaseClass.Method3(System.String,System.String)">
+            <summary>
+            Method with params.
+            </summary>
+            <param name="first">The first name.</param>
+            <param name="last">The last name.</param>
+        </member>
+        <member name="M:BasicTests.BaseClass.Method4(System.Int32)">
+            <summary>
+            Method with both params and return value.
+            </summary>
+            <param name="count">The count.</param>
+            <returns>The set of names.</returns>
+        </member>
+        <member name="M:BasicTests.BaseClass.OnInitialized">
+            <summary>
+            Raises the Initialized event.
+            </summary>
+        </member>
+        <member name="M:BasicTests.BaseClass.PrivateMethod(System.Int32)">
+            <summary>
+            Private method.
+            </summary>
+            <param name="count">The count.</param>
+        </member>
+        <member name="M:BasicTests.BaseClass.StaticMethod(System.Int32)">
+            <summary>
+            A static method.
+            </summary>
+            <param name="length">The length.</param>
+        </member>
+        <member name="P:BasicTests.BaseClass.Name">
+            <summary>
+            Gets or sets the name.
+            </summary>
+        </member>
+        <member name="P:BasicTests.BaseClass.DOMElement">
+            <summary>
+            Gets or sets the element.
+            </summary>
+        </member>
+        <member name="P:BasicTests.BaseClass.Count">
+            <summary>
+            Gets the count.
+            </summary>
+        </member>
+        <member name="P:BasicTests.BaseClass.PrivateName">
+            <summary>
+            Gets the private name.
+            </summary>
+        </member>
+        <member name="P:BasicTests.BaseClass.TotalCount">
+            <summary>
+            Gets the total count.
+            </summary>
+        </member>
+        <member name="E:BasicTests.BaseClass.Initialized">
+            <summary>
+            Adds or removes a delegate for the Initialized event.
+            </summary>
+        </member>
+        <member name="P:BasicTests.BaseClass.Item(System.Int32[])">
+            <summary>
+            Gets item by identifiers.
+            </summary>
+            <param name="ids">The identifiers.</param>
+            <returns>The item.</returns>
+        </member>
+        <member name="T:BasicTests.DerivedClass">
+            <summary>
+            Represents a derived class.
+            </summary>
+        </member>
+        <member name="M:BasicTests.DerivedClass.#ctor">
+            <summary>
+            Internal constructor.
+            </summary>
+        </member>
+        <member name="M:BasicTests.DerivedClass.Method3(System.String,System.String)">
+            <summary>
+            Overriden method with params.
+            </summary>
+            <param name="first">The first name.</param>
+            <param name="last">The last name.</param>
+        </member>
+        <member name="T:BasicTests.InternalClass">
+            <summary>
+            An internal class.
+            </summary>
+        </member>
+        <member name="T:BasicTests.RecordClass">
+            <summary>
+            Represents a record.
+            </summary>
+        </member>
+        <member name="F:BasicTests.RecordClass.Count">
+            <summary>
+            Gets or sets a count.
+            </summary>
+        </member>
+        <member name="M:BasicTests.RecordClass.#ctor(System.Int32)">
+            <summary>
+            Initializes a new instance of the RecordClass class.
+            </summary>
+            <param name="count">A count.</param>
+        </member>
+        <member name="T:BasicTests.IInterface">
+            <summary>
+            Represents an interface.
+            </summary>
+        </member>
+        <member name="M:BasicTests.IInterface.Execute">
+            <summary>
+            Executes code.
+            </summary>
+        </member>
+        <member name="T:BasicTests.GlobalMethodsClass">
+            <summary>
+            Class with global methods.
+            </summary>
+        </member>
+        <member name="M:BasicTests.GlobalMethodsClass.Run">
+            <summary>
+            Runs.
+            </summary>
+        </member>
+    </members>
+</doc>
diff --git a/tests/TestCases/Basic/Flags/Baseline.txt b/tests/TestCases/Basic/Flags/Baseline.txt
new file mode 100644
index 000000000..74720d529
--- /dev/null
+++ b/tests/TestCases/Basic/Flags/Baseline.txt
@@ -0,0 +1,22 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    method1: function(i) {
+        var j = i;
+        var x = j++;
+    },
+    
+    method2: function(i) {
+        var j = 10;
+        var x = j++;
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Basic/Flags/Code.cs b/tests/TestCases/Basic/Flags/Code.cs
new file mode 100644
index 000000000..8efcaf1b9
--- /dev/null
+++ b/tests/TestCases/Basic/Flags/Code.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace BasicTests {
+
+    public class App {
+
+        public void Method1(int i) {
+#if ABC
+		int j = i;
+#else
+		int j = 10;
+#endif
+
+		int x = j++;
+        }
+
+        public void Method2(int i) {
+#if !ABC
+		int j = i;
+#else
+		int j = 10;
+#endif
+
+		int x = j++;
+        }
+    }
+}
diff --git a/tests/TestCases/Basic/Metadata/Baseline.txt b/tests/TestCases/Basic/Metadata/Baseline.txt
new file mode 100644
index 000000000..d880a5d98
--- /dev/null
+++ b/tests/TestCases/Basic/Metadata/Baseline.txt
@@ -0,0 +1,4179 @@
+Metadata
+================================================================
+Namespace: 
+HasApplicationTypes: False
+Types:
+
+Namespace: BasicTests
+HasApplicationTypes: True
+Types:
+    Class: App
+        Application Type: True
+        Public: True
+        Generated Name: App
+        Global Methods: False
+        Interfaces:
+            BasicTests.IApp
+        Constructor:
+            Constructor: 
+                AssociatedType: BasicTests.App
+                Visibility: Public
+                Generated Name: 
+        Members:
+            Event: Event1
+                AssociatedType: DoStuff
+                Visibility: Public
+                Generated Name: event1
+            Field: __event1
+                AssociatedType: DoStuff
+                Visibility: PrivateInstance
+                Generated Name: __event1
+            Event: Event2
+                AssociatedType: DoStuff
+                Visibility: Public
+                Generated Name: event2
+            Method: Run
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: run
+                Associated Interface Member: IApp.Run
+                Abstract: False
+            Method: Initialize
+                AssociatedType: Void
+                Visibility: PrivateInstance
+                Generated Name: initialize
+                Abstract: False
+        
+    Enumeration: AppFlags
+        Application Type: True
+        Public: True
+        Generated Name: AppFlags
+        Flags: True
+        Members:
+            EnumerationField: AAA
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: AAA
+            EnumerationField: BBB
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: BBB
+        
+    Class: AppHelper
+        Application Type: True
+        Public: False
+        Generated Name: AppHelper
+        Global Methods: False
+        Indexer:
+            Indexer: Item
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: item
+                ReadOnly: True
+                Abstract: False
+        Members:
+            Property: Prop1
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: prop1
+                ReadOnly: True
+                Abstract: False
+            Property: Prop2
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: prop2
+                ReadOnly: False
+                Abstract: False
+            Method: ShowHelp
+                AssociatedType: Void
+                Visibility: Internal
+                Generated Name: showHelp
+                Abstract: False
+        
+    Delegate: DoStuff
+        Application Type: True
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Interface: IApp
+        Application Type: True
+        Public: True
+        Generated Name: IApp
+        Members:
+            Method: Run
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: run
+                Abstract: False
+        
+    Interface: IFoo
+        Application Type: True
+        Public: False
+        Generated Name: IFoo
+        Members:
+        
+    Enumeration: Mode
+        Application Type: True
+        Public: True
+        Generated Name: Mode
+        Flags: False
+        Members:
+            EnumerationField: Mode1
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: mode1
+            EnumerationField: Mode2
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: mode2
+        
+    Record: Point
+        Application Type: True
+        Public: False
+        Generated Name: Point
+        Global Methods: False
+        Constructor:
+            Constructor: 
+                AssociatedType: BasicTests.Point
+                Visibility: Public
+                Generated Name: 
+                Parameters:Parameter: x
+                    AssociatedType: Int32
+                    Mode: In
+                    Parameter: y
+                    AssociatedType: Int32
+                    Mode: In
+        Members:
+            Field: x
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: x
+            Field: y
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: y
+        
+    Class: Util
+        Application Type: True
+        Public: False
+        Generated Name: Util
+        Global Methods: True
+        Members:
+            Method: ShowHelp
+                AssociatedType: Void
+                Visibility: Internal, Static
+                Generated Name: showHelp
+                Abstract: False
+        
+
+Namespace: System
+HasApplicationTypes: False
+Types:
+    Delegate: Action
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Action`1
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Action`2
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Action`3
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Action`4
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Action`5
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Action`6
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Action`7
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Action`8
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Class: Arguments
+        Application Type: False
+        Public: True
+        Generated Name: arguments
+        Global Methods: False
+        Indexer:
+            Indexer: Item
+                AssociatedType: Object
+                Visibility: Public, Static
+                Generated Name: item
+                ReadOnly: False
+                Abstract: False
+        Members:
+            Field: Current
+                AssociatedType: Array
+                Visibility: Public, Static
+                Generated Name: arguments
+            Field: Length
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: length
+            Method: GetArgument
+                AssociatedType: Object
+                Visibility: Public, Static
+                Generated Name: getArgument
+                Abstract: False
+            Method: ToArray
+                AssociatedType: Array
+                Visibility: Public, Static
+                Generated Name: Array.toArray
+                Abstract: False
+        
+    Class: Array
+        Application Type: False
+        Public: True
+        Generated Name: Array
+        Global Methods: False
+        Indexer:
+            Indexer: Item
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: item
+                ReadOnly: False
+                Abstract: False
+        Members:
+            Field: Length
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+            Method: Clone
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: clone
+                Abstract: False
+            Method: Concat
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: concat
+                Abstract: False
+            Method: Contains
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: contains
+                Abstract: False
+            Method: Every
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: every
+                Abstract: False
+            Method: Extract
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: extract
+                Abstract: False
+            Method: Filter
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: filter
+                Abstract: False
+            Method: ForEach
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: forEach
+                Abstract: False
+            Method: GetEnumerator
+                AssociatedType: System.Collections.IEnumerator
+                Visibility: Public
+                Generated Name: getEnumerator
+                Abstract: False
+            Method: GroupBy
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: groupBy
+                Abstract: False
+            Method: Index
+                AssociatedType: Dictionary
+                Visibility: Public
+                Generated Name: index
+                Abstract: False
+            Method: IndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: indexOf
+                Abstract: False
+            Method: Join
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: join
+                Abstract: False
+            Method: LastIndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: lastIndexOf
+                Abstract: False
+            Method: Map
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: map
+                Abstract: False
+            Method: Parse
+                AssociatedType: Array
+                Visibility: Public, Static
+                Generated Name: parse
+                Abstract: False
+            Method: Reduce
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: reduce
+                Abstract: False
+            Method: ReduceRight
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: reduceRight
+                Abstract: False
+            Method: Reverse
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: reverse
+                Abstract: False
+            Method: Shift
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: shift
+                Abstract: False
+            Method: Slice
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: slice
+                Abstract: False
+            Method: Some
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: some
+                Abstract: False
+            Method: Sort
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: sort
+                Abstract: False
+            Method: Splice
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: splice
+                Abstract: False
+            Method: ToArray
+                AssociatedType: Array
+                Visibility: Public, Static
+                Generated Name: toArray
+                Abstract: False
+            Method: Unshift
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: unshift
+                Abstract: False
+        
+    Class: Boolean
+        Application Type: False
+        Public: True
+        Generated Name: Boolean
+        Global Methods: False
+        Members:
+            Method: Parse
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: parse
+                Abstract: False
+        
+    Class: Byte
+        Application Type: False
+        Public: True
+        Generated Name: Number
+        Global Methods: False
+        Members:
+            Method: Format
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: format
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: localeFormat
+                Abstract: False
+            Method: ToString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toString
+                Abstract: False
+        
+    Delegate: Callback
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Class: CancelEventArgs
+        Application Type: False
+        Public: True
+        Generated Name: CancelEventArgs
+        Global Methods: False
+        BaseClass: System.EventArgs
+        Members:
+            Field: Cancel
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: cancel
+        
+    Class: Char
+        Application Type: False
+        Public: True
+        Generated Name: String
+        Global Methods: False
+        Members:
+        
+    Delegate: CompareCallback
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Class: Date
+        Application Type: False
+        Public: True
+        Generated Name: Date
+        Global Methods: False
+        Members:
+            Field: Empty
+                AssociatedType: Date
+                Visibility: Public, Static
+                Generated Name: empty
+            Property: Now
+                AssociatedType: Date
+                Visibility: Public, Static
+                Generated Name: now
+                ReadOnly: True
+                Abstract: False
+            Property: Today
+                AssociatedType: Date
+                Visibility: Public, Static
+                Generated Name: today
+                ReadOnly: True
+                Abstract: False
+            Method: Format
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: format
+                Abstract: False
+            Method: GetDate
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getDate
+                Abstract: False
+            Method: GetDay
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getDay
+                Abstract: False
+            Method: GetFullYear
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getFullYear
+                Abstract: False
+            Method: GetHours
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getHours
+                Abstract: False
+            Method: GetMilliseconds
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getMilliseconds
+                Abstract: False
+            Method: GetMinutes
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getMinutes
+                Abstract: False
+            Method: GetMonth
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getMonth
+                Abstract: False
+            Method: GetSeconds
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getSeconds
+                Abstract: False
+            Method: GetTime
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getTime
+                Abstract: False
+            Method: GetTimezoneOffset
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getTimezoneOffset
+                Abstract: False
+            Method: GetUTCDate
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getUTCDate
+                Abstract: False
+            Method: GetUTCDay
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getUTCDay
+                Abstract: False
+            Method: GetUTCFullYear
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getUTCFullYear
+                Abstract: False
+            Method: GetUTCHours
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getUTCHours
+                Abstract: False
+            Method: GetUTCMilliseconds
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getUTCMilliseconds
+                Abstract: False
+            Method: GetUTCMinutes
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getUTCMinutes
+                Abstract: False
+            Method: GetUTCMonth
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getUTCMonth
+                Abstract: False
+            Method: GetUTCSeconds
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: getUTCSeconds
+                Abstract: False
+            Method: IsEmpty
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: isEmpty
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: localeFormat
+                Abstract: False
+            Method: Parse
+                AssociatedType: Date
+                Visibility: Public, Static
+                Generated Name: parseDate
+                Abstract: False
+            Method: SetDate
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setDate
+                Abstract: False
+            Method: SetFullYear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setFullYear
+                Abstract: False
+            Method: SetHours
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setHours
+                Abstract: False
+            Method: SetMilliseconds
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setMilliseconds
+                Abstract: False
+            Method: SetMinutes
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setMinutes
+                Abstract: False
+            Method: SetMonth
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setMonth
+                Abstract: False
+            Method: SetSeconds
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setSeconds
+                Abstract: False
+            Method: SetTime
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setTime
+                Abstract: False
+            Method: SetUTCDate
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setUTCDate
+                Abstract: False
+            Method: SetUTCFullYear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setUTCFullYear
+                Abstract: False
+            Method: SetUTCHours
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setUTCHours
+                Abstract: False
+            Method: SetUTCMilliseconds
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setUTCMilliseconds
+                Abstract: False
+            Method: SetUTCMinutes
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setUTCMinutes
+                Abstract: False
+            Method: SetUTCMonth
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setUTCMonth
+                Abstract: False
+            Method: SetUTCSeconds
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setUTCSeconds
+                Abstract: False
+            Method: SetYear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setYear
+                Abstract: False
+            Method: ToDateString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toDateString
+                Abstract: False
+            Method: ToISOString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toISOString
+                Abstract: False
+            Method: ToLocaleDateString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toLocaleDateString
+                Abstract: False
+            Method: ToLocaleTimeString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toLocaleTimeString
+                Abstract: False
+            Method: ToTimeString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toTimeString
+                Abstract: False
+            Method: ToUTCString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toUTCString
+                Abstract: False
+            Method: UTC
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: UTC
+                Abstract: False
+        
+    Class: Decimal
+        Application Type: False
+        Public: True
+        Generated Name: Number
+        Global Methods: False
+        Members:
+            Method: Format
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: format
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: localeFormat
+                Abstract: False
+            Method: Parse
+                AssociatedType: Decimal
+                Visibility: Public, Static
+                Generated Name: parseFloat
+                Abstract: False
+            Method: ToString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toString
+                Abstract: False
+        
+    Class: Delegate
+        Application Type: False
+        Public: True
+        Generated Name: Delegate
+        Global Methods: False
+        Members:
+            Field: Empty
+                AssociatedType: System.Delegate
+                Visibility: Public, Static
+                Generated Name: empty
+            Method: ClearExport
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: clearExport
+                Abstract: False
+            Method: Combine
+                AssociatedType: System.Delegate
+                Visibility: Public, Static
+                Generated Name: combine
+                Abstract: False
+            Method: Create
+                AssociatedType: System.Delegate
+                Visibility: Public, Static
+                Generated Name: create
+                Abstract: False
+            Method: CreateExport
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: createExport
+                Abstract: False
+            Method: DeleteExport
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: deleteExport
+                Abstract: False
+            Method: Remove
+                AssociatedType: System.Delegate
+                Visibility: Public, Static
+                Generated Name: remove
+                Abstract: False
+        
+    Class: Double
+        Application Type: False
+        Public: True
+        Generated Name: Number
+        Global Methods: False
+        Members:
+            Method: Format
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: format
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: localeFormat
+                Abstract: False
+            Method: Parse
+                AssociatedType: Double
+                Visibility: Public, Static
+                Generated Name: parseFloat
+                Abstract: False
+            Method: ToExponential
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toExponential
+                Abstract: False
+            Method: ToFixed
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toFixed
+                Abstract: False
+            Method: ToPrecision
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toPrecision
+                Abstract: False
+        
+    Class: Enum
+        Application Type: False
+        Public: True
+        Generated Name: Enum
+        Global Methods: False
+        Members:
+        
+    Class: EventArgs
+        Application Type: False
+        Public: True
+        Generated Name: EventArgs
+        Global Methods: False
+        Members:
+            Field: Empty
+                AssociatedType: System.EventArgs
+                Visibility: Public, Static
+                Generated Name: Empty
+        
+    Delegate: EventHandler
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: EventHandler`1
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Class: Exception
+        Application Type: False
+        Public: True
+        Generated Name: Error
+        Global Methods: False
+        Indexer:
+            Indexer: Item
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: item
+                ReadOnly: True
+                Abstract: False
+        Members:
+            Field: InnerException
+                AssociatedType: Exception
+                Visibility: Public
+                Generated Name: innerException
+            Field: Message
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: message
+            Field: StackTrace
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: stack
+            Method: Create
+                AssociatedType: Exception
+                Visibility: Public, Static
+                Generated Name: Error.createError
+                Abstract: False
+        
+    Delegate: Func`1
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: TResult
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Func`2
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: TResult
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Func`3
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: TResult
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Func`4
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: TResult
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Func`5
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: TResult
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Func`6
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: TResult
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Func`7
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: TResult
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Func`8
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: TResult
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: Func`9
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: TResult
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Class: Function
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Global Methods: False
+        Members:
+            Field: Length
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+            Method: Apply
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: apply
+                Abstract: False
+            Method: Call
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: call
+                Abstract: False
+        
+    Interface: IDisposable
+        Application Type: False
+        Public: True
+        Generated Name: IDisposable
+        Members:
+            Method: Dispose
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: dispose
+                Abstract: True
+        
+    Class: Int16
+        Application Type: False
+        Public: True
+        Generated Name: Number
+        Global Methods: False
+        Members:
+            Method: Format
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: format
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: localeFormat
+                Abstract: False
+            Method: ToString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toString
+                Abstract: False
+        
+    Class: Int32
+        Application Type: False
+        Public: True
+        Generated Name: Number
+        Global Methods: False
+        Members:
+            Method: Format
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: format
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: localeFormat
+                Abstract: False
+            Method: Parse
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: parseInt
+                Abstract: False
+            Method: ToString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toString
+                Abstract: False
+        
+    Class: Int64
+        Application Type: False
+        Public: True
+        Generated Name: Number
+        Global Methods: False
+        Members:
+            Method: Format
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: format
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: localeFormat
+                Abstract: False
+            Method: ToString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toString
+                Abstract: False
+        
+    Class: Math
+        Application Type: False
+        Public: True
+        Generated Name: Math
+        Global Methods: False
+        Members:
+            Field: E
+                AssociatedType: Double
+                Visibility: Public, Static
+                Generated Name: E
+            Field: LN2
+                AssociatedType: Double
+                Visibility: Public, Static
+                Generated Name: LN2
+            Field: LN10
+                AssociatedType: Double
+                Visibility: Public, Static
+                Generated Name: LN10
+            Field: LOG2E
+                AssociatedType: Double
+                Visibility: Public, Static
+                Generated Name: LOG2E
+            Field: LOG10E
+                AssociatedType: Double
+                Visibility: Public, Static
+                Generated Name: LOG10E
+            Field: PI
+                AssociatedType: Double
+                Visibility: Public, Static
+                Generated Name: PI
+            Field: SQRT1_2
+                AssociatedType: Double
+                Visibility: Public, Static
+                Generated Name: SQRT1_2
+            Field: SQRT2
+                AssociatedType: Double
+                Visibility: Public, Static
+                Generated Name: SQRT2
+            Method: Abs
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: abs
+                Abstract: False
+            Method: Acos
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: acos
+                Abstract: False
+            Method: Asin
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: asin
+                Abstract: False
+            Method: Atan
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: atan
+                Abstract: False
+            Method: Atan2
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: atan2
+                Abstract: False
+            Method: Ceil
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: ceil
+                Abstract: False
+            Method: Cos
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: cos
+                Abstract: False
+            Method: Exp
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: exp
+                Abstract: False
+            Method: Floor
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: floor
+                Abstract: False
+            Method: Log
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: log
+                Abstract: False
+            Method: Max
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: max
+                Abstract: False
+            Method: Min
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: min
+                Abstract: False
+            Method: Pow
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: pow
+                Abstract: False
+            Method: Random
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: random
+                Abstract: False
+            Method: Round
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: round
+                Abstract: False
+            Method: Sin
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: sin
+                Abstract: False
+            Method: Sqrt
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: sqrt
+                Abstract: False
+            Method: Tan
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: tan
+                Abstract: False
+            Method: Truncate
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: parseInt
+                Abstract: False
+        
+    Class: Nullable`1
+        Application Type: False
+        Public: True
+        Generated Name: Nullable`1
+        Global Methods: False
+        Members:
+            Property: HasValue
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: hasValue
+                ReadOnly: True
+                Abstract: False
+            Property: Value
+                AssociatedType: T
+                Visibility: Public
+                Generated Name: value
+                ReadOnly: True
+                Abstract: False
+            Method: GetValueOrDefault
+                AssociatedType: T
+                Visibility: Public
+                Generated Name: getValueOrDefault
+                Abstract: False
+        
+    Class: Number
+        Application Type: False
+        Public: True
+        Generated Name: Number
+        Global Methods: False
+        Members:
+            Field: MAX_VALUE
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: MAX_VALUE
+            Field: MIN_VALUE
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: MIN_VALUE
+            Field: NaN
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: NaN
+            Field: NEGATIVE_INFINITY
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: NEGATIVE_INFINITY
+            Field: POSITIVE_INFINITY
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: POSITIVE_INFINITY
+            Method: Format
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: format
+                Abstract: False
+            Method: IsFinite
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: isFinite
+                Abstract: False
+            Method: IsNaN
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: isNaN
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: localeFormat
+                Abstract: False
+            Method: Parse
+                AssociatedType: Number
+                Visibility: Public, Static
+                Generated Name: parse
+                Abstract: False
+            Method: ParseDouble
+                AssociatedType: Double
+                Visibility: Public, Static
+                Generated Name: parseFloat
+                Abstract: False
+            Method: ParseFloat
+                AssociatedType: Single
+                Visibility: Public, Static
+                Generated Name: parseFloat
+                Abstract: False
+            Method: ParseInt
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: parseInt
+                Abstract: False
+            Method: ToExponential
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toExponential
+                Abstract: False
+            Method: ToFixed
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toFixed
+                Abstract: False
+            Method: ToPrecision
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toPrecision
+                Abstract: False
+            Method: ToString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toString
+                Abstract: False
+        
+    Class: Object
+        Application Type: False
+        Public: True
+        Generated Name: Object
+        Global Methods: False
+        Members:
+            Method: GetType
+                AssociatedType: Type
+                Visibility: Public
+                Generated Name: getType
+                Abstract: False
+            Method: ToString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toString
+                Abstract: False
+            Method: ToLocaleString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toLocaleString
+                Abstract: False
+        
+    Class: Record
+        Application Type: False
+        Public: True
+        Generated Name: Record
+        Global Methods: False
+        Members:
+        
+    Class: RegularExpression
+        Application Type: False
+        Public: True
+        Generated Name: RegExp
+        Global Methods: False
+        Members:
+            Field: LastIndex
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: lastIndex
+            Field: Global
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: global
+            Field: IgnoreCase
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: ignoreCase
+            Field: Multiline
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: multiline
+            Field: Pattern
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: pattern
+            Field: Source
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: source
+            Method: Exec
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: exec
+                Abstract: False
+            Method: Parse
+                AssociatedType: RegularExpression
+                Visibility: Public, Static
+                Generated Name: parse
+                Abstract: False
+            Method: Test
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: test
+                Abstract: False
+        
+    Class: SByte
+        Application Type: False
+        Public: True
+        Generated Name: Number
+        Global Methods: False
+        Members:
+            Method: Format
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: format
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: localeFormat
+                Abstract: False
+            Method: ToString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toString
+                Abstract: False
+        
+    Class: Script
+        Application Type: False
+        Public: True
+        Generated Name: Script
+        Global Methods: True
+        Members:
+            Method: Boolean
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: boolean
+                Abstract: False
+            Method: ClearInterval
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: clearInterval
+                Abstract: False
+            Method: ClearTimeout
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: clearTimeout
+                Abstract: False
+            Method: Confirm
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: confirm
+                Abstract: False
+            Method: CreateInstance
+                AssociatedType: Object
+                Visibility: Public, Static
+                Generated Name: createInstance
+                Abstract: False
+            Method: DeleteField
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: deleteField
+                Abstract: False
+            Method: Eval
+                AssociatedType: Object
+                Visibility: Public, Static
+                Generated Name: eval
+                Abstract: False
+            Method: GetField
+                AssociatedType: Object
+                Visibility: Public, Static
+                Generated Name: getField
+                Abstract: False
+            Method: GetScriptType
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: getScriptType
+                Abstract: False
+            Method: HasField
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: hasField
+                Abstract: False
+            Method: HasMethod
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: hasMethod
+                Abstract: False
+            Method: InvokeMethod
+                AssociatedType: Object
+                Visibility: Public, Static
+                Generated Name: invokeMethod
+                Abstract: False
+            Method: IsNull
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: ss.isNull
+                Abstract: False
+            Method: IsNullOrUndefined
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: ss.isNullOrUndefined
+                Abstract: False
+            Method: IsUndefined
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: ss.isUndefined
+                Abstract: False
+            Method: IsValue
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: ss.isValue
+                Abstract: False
+            Method: Literal
+                AssociatedType: Object
+                Visibility: Public, Static
+                Generated Name: literal
+                Abstract: False
+            Method: SetField
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: setField
+                Abstract: False
+            Method: SetInterval
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: setInterval
+                Abstract: False
+            Method: SetTimeout
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: setTimeout
+                Abstract: False
+            Method: Value
+                AssociatedType: TValue
+                Visibility: Public, Static
+                Generated Name: value
+                Abstract: False
+            Method: Escape
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: escape
+                Abstract: False
+            Method: Unescape
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: unescape
+                Abstract: False
+            Method: EncodeUri
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: encodeURI
+                Abstract: False
+            Method: DecodeUri
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: decodeURI
+                Abstract: False
+            Method: EncodeUriComponent
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: encodeURIComponent
+                Abstract: False
+            Method: DecodeUriComponent
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: decodeURIComponent
+                Abstract: False
+        
+    Class: Single
+        Application Type: False
+        Public: True
+        Generated Name: Number
+        Global Methods: False
+        Members:
+            Method: Format
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: format
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: localeFormat
+                Abstract: False
+            Method: Parse
+                AssociatedType: Single
+                Visibility: Public, Static
+                Generated Name: parseFloat
+                Abstract: False
+            Method: ToExponential
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toExponential
+                Abstract: False
+            Method: ToFixed
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toFixed
+                Abstract: False
+            Method: ToPrecision
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toPrecision
+                Abstract: False
+        
+    Class: String
+        Application Type: False
+        Public: True
+        Generated Name: String
+        Global Methods: False
+        Indexer:
+            Indexer: Item
+                AssociatedType: Char
+                Visibility: Public
+                Generated Name: item
+                ReadOnly: True
+                Abstract: False
+        Members:
+            Field: Empty
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: Empty
+            Field: Length
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+            Method: CharAt
+                AssociatedType: Char
+                Visibility: Public
+                Generated Name: charAt
+                Abstract: False
+            Method: CharCodeAt
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: charCodeAt
+                Abstract: False
+            Method: Compare
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: compare
+                Abstract: False
+            Method: CompareTo
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: compareTo
+                Abstract: False
+            Method: Concat
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: concat
+                Abstract: False
+            Method: DecodeUri
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: decodeURI
+                Abstract: False
+            Method: DecodeUriComponent
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: decodeURIComponent
+                Abstract: False
+            Method: EncodeUri
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: encodeURI
+                Abstract: False
+            Method: EncodeUriComponent
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: encodeURIComponent
+                Abstract: False
+            Method: EndsWith
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: endsWith
+                Abstract: False
+            Method: Equals
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: equals
+                Abstract: False
+            Method: Escape
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: escape
+                Abstract: False
+            Method: Format
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: format
+                Abstract: False
+            Method: FromChar
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: fromChar
+                Abstract: False
+            Method: FromCharCode
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: fromCharCode
+                Abstract: False
+            Method: HtmlDecode
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: htmlDecode
+                Abstract: False
+            Method: HtmlEncode
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: htmlEncode
+                Abstract: False
+            Method: IndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: indexOf
+                Abstract: False
+            Method: IndexOfAny
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: indexOfAny
+                Abstract: False
+            Method: Insert
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: insert
+                Abstract: False
+            Method: IsNullOrEmpty
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: isNullOrEmpty
+                Abstract: False
+            Method: IsNullOrWhiteSpace
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: isNullOrWhiteSpace
+                Abstract: False
+            Method: LastIndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: lastIndexOf
+                Abstract: False
+            Method: LastIndexOfAny
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: lastIndexOfAny
+                Abstract: False
+            Method: LocaleCompare
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: localeCompare
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: localeFormat
+                Abstract: False
+            Method: Match
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: match
+                Abstract: False
+            Method: PadLeft
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: padLeft
+                Abstract: False
+            Method: PadRight
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: padRight
+                Abstract: False
+            Method: Remove
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: remove
+                Abstract: False
+            Method: Replace
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: replaceAll
+                Abstract: False
+            Method: ReplaceFirst
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: replace
+                Abstract: False
+            Method: ReplaceRegex
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: replace
+                Abstract: False
+            Method: Search
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: search
+                Abstract: False
+            Method: Split
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: split
+                Abstract: False
+            Method: StartsWith
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: startsWith
+                Abstract: False
+            Method: Substr
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: substr
+                Abstract: False
+            Method: Substring
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: substring
+                Abstract: False
+            Method: ToLocaleLowerCase
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toLocaleLowerCase
+                Abstract: False
+            Method: ToLocaleUpperCase
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toLocaleUpperCase
+                Abstract: False
+            Method: ToLowerCase
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toLowerCase
+                Abstract: False
+            Method: ToUpperCase
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toUpperCase
+                Abstract: False
+            Method: Trim
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: trim
+                Abstract: False
+            Method: TrimStart
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: trimStart
+                Abstract: False
+            Method: TrimEnd
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: trimEnd
+                Abstract: False
+            Method: Unescape
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: unescape
+                Abstract: False
+        
+    Class: StringBuilder
+        Application Type: False
+        Public: True
+        Generated Name: StringBuilder
+        Global Methods: False
+        Members:
+            Field: IsEmpty
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: isEmpty
+            Method: Append
+                AssociatedType: System.StringBuilder
+                Visibility: Public
+                Generated Name: append
+                Abstract: False
+            Method: AppendLine
+                AssociatedType: System.StringBuilder
+                Visibility: Public
+                Generated Name: appendLine
+                Abstract: False
+            Method: Clear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: clear
+                Abstract: False
+            Method: ToString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toString
+                Abstract: False
+        
+    Delegate: StringReplaceCallback
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Class: Tuple`2
+        Application Type: False
+        Public: True
+        Generated Name: Tuple
+        Global Methods: False
+        Members:
+            Field: First
+                AssociatedType: T1
+                Visibility: Public
+                Generated Name: first
+            Field: Second
+                AssociatedType: T2
+                Visibility: Public
+                Generated Name: second
+        
+    Class: Tuple`3
+        Application Type: False
+        Public: True
+        Generated Name: Tuple
+        Global Methods: False
+        Members:
+            Field: First
+                AssociatedType: T1
+                Visibility: Public
+                Generated Name: first
+            Field: Second
+                AssociatedType: T2
+                Visibility: Public
+                Generated Name: second
+            Field: Third
+                AssociatedType: T3
+                Visibility: Public
+                Generated Name: third
+        
+    Class: Type
+        Application Type: False
+        Public: True
+        Generated Name: Type
+        Global Methods: False
+        Members:
+            Property: BaseType
+                AssociatedType: Type
+                Visibility: Public
+                Generated Name: baseType
+                ReadOnly: True
+                Abstract: False
+            Property: FullName
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: fullName
+                ReadOnly: True
+                Abstract: False
+            Property: Name
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: name
+                ReadOnly: True
+                Abstract: False
+            Field: Prototype
+                AssociatedType: Dictionary
+                Visibility: Public
+                Generated Name: prototype
+            Method: GetType
+                AssociatedType: Type
+                Visibility: Public, Static
+                Generated Name: getType
+                Abstract: False
+            Method: IsAssignableFrom
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: isAssignableFrom
+                Abstract: False
+            Method: IsClass
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: isClass
+                Abstract: False
+            Method: IsInterface
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: isInterface
+                Abstract: False
+            Method: IsInstanceOfType
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: isInstanceOfType
+                Abstract: False
+            Method: GetTypeFromHandle
+                AssociatedType: Type
+                Visibility: Public, Static
+                Generated Name: getTypeFromHandle
+                Abstract: False
+            Method: GetInstanceType
+                AssociatedType: Type
+                Visibility: Public, Static
+                Generated Name: getInstanceType
+                Abstract: False
+                Parameters:
+                    Parameter: instance
+                    AssociatedType: Object
+                    Mode: In
+        
+    Class: UInt16
+        Application Type: False
+        Public: True
+        Generated Name: Number
+        Global Methods: False
+        Members:
+            Method: Format
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: format
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: localeFormat
+                Abstract: False
+            Method: ToString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toString
+                Abstract: False
+        
+    Class: UInt32
+        Application Type: False
+        Public: True
+        Generated Name: Number
+        Global Methods: False
+        Members:
+            Method: Format
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: format
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: localeFormat
+                Abstract: False
+            Method: ToString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toString
+                Abstract: False
+        
+    Class: UInt64
+        Application Type: False
+        Public: True
+        Generated Name: Number
+        Global Methods: False
+        Members:
+            Method: Format
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: format
+                Abstract: False
+            Method: LocaleFormat
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: localeFormat
+                Abstract: False
+            Method: ToString
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: toString
+                Abstract: False
+        
+    Class: Void
+        Application Type: False
+        Public: True
+        Generated Name: Void
+        Global Methods: False
+        Members:
+        
+
+Namespace: System.Collections
+HasApplicationTypes: False
+Types:
+    Delegate: ArrayCallback
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: ArrayFilterCallback
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Class: ArrayGrouping
+        Application Type: False
+        Public: True
+        Generated Name: Array
+        Global Methods: False
+        Indexer:
+            Indexer: Item
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: item
+                ReadOnly: False
+                Abstract: False
+        Members:
+            Field: Key
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: key
+            Field: Length
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+            Method: Clone
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: clone
+                Abstract: False
+            Method: Concat
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: concat
+                Abstract: False
+            Method: Contains
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: contains
+                Abstract: False
+            Method: Every
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: every
+                Abstract: False
+            Method: Extract
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: extract
+                Abstract: False
+            Method: Filter
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: filter
+                Abstract: False
+            Method: ForEach
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: forEach
+                Abstract: False
+            Method: GetEnumerator
+                AssociatedType: System.Collections.IEnumerator
+                Visibility: Public
+                Generated Name: getEnumerator
+                Abstract: False
+            Method: GroupBy
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: groupBy
+                Abstract: False
+            Method: Index
+                AssociatedType: Dictionary
+                Visibility: Public
+                Generated Name: index
+                Abstract: False
+            Method: IndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: indexOf
+                Abstract: False
+            Method: Join
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: join
+                Abstract: False
+            Method: LastIndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: lastIndexOf
+                Abstract: False
+            Method: Map
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: map
+                Abstract: False
+            Method: Reverse
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: reverse
+                Abstract: False
+            Method: Some
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: some
+                Abstract: False
+            Method: Sort
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: sort
+                Abstract: False
+        
+    Delegate: ArrayItemCallback
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: ArrayItemFilterCallback
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: ArrayItemKeyGenerator
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: ArrayItemMapCallback
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: ArrayItemReduceCallback
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Class: ArrayList
+        Application Type: False
+        Public: True
+        Generated Name: Array
+        Global Methods: False
+        Indexer:
+            Indexer: Item
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: item
+                ReadOnly: False
+                Abstract: False
+        Members:
+            Field: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+            Method: Add
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: add
+                Abstract: False
+            Method: AddRange
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: addRange
+                Abstract: False
+            Method: Clone
+                AssociatedType: ArrayList
+                Visibility: Public
+                Generated Name: clone
+                Abstract: False
+            Method: Clear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: clear
+                Abstract: False
+            Method: Concat
+                AssociatedType: ArrayList
+                Visibility: Public
+                Generated Name: concat
+                Abstract: False
+            Method: Contains
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: contains
+                Abstract: False
+            Method: Every
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: every
+                Abstract: False
+            Method: Extract
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: extract
+                Abstract: False
+            Method: Filter
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: filter
+                Abstract: False
+            Method: ForEach
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: forEach
+                Abstract: False
+            Method: GetEnumerator
+                AssociatedType: System.Collections.IEnumerator
+                Visibility: Public
+                Generated Name: getEnumerator
+                Abstract: False
+            Method: GroupBy
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: groupBy
+                Abstract: False
+            Method: Index
+                AssociatedType: Dictionary
+                Visibility: Public
+                Generated Name: index
+                Abstract: False
+            Method: IndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: indexOf
+                Abstract: False
+            Method: Insert
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: insert
+                Abstract: False
+            Method: InsertRange
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: insertRange
+                Abstract: False
+            Method: Join
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: join
+                Abstract: False
+            Method: LastIndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: lastIndexOf
+                Abstract: False
+            Method: Map
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: map
+                Abstract: False
+            Method: Parse
+                AssociatedType: ArrayList
+                Visibility: Public, Static
+                Generated Name: parse
+                Abstract: False
+            Method: Reduce
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: reduce
+                Abstract: False
+            Method: ReduceRight
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: reduceRight
+                Abstract: False
+            Method: Remove
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: remove
+                Abstract: False
+            Method: RemoveAt
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: removeAt
+                Abstract: False
+            Method: RemoveRange
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: removeRange
+                Abstract: False
+            Method: Reverse
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: reverse
+                Abstract: False
+            Method: Shift
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: shift
+                Abstract: False
+            Method: Slice
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: slice
+                Abstract: False
+            Method: Some
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: some
+                Abstract: False
+            Method: Sort
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: sort
+                Abstract: False
+            Method: Splice
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: splice
+                Abstract: False
+            Method: Unshift
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: unshift
+                Abstract: False
+        
+    Delegate: ArrayMapCallback
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: ArrayReduceCallback
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Class: Dictionary
+        Application Type: False
+        Public: True
+        Generated Name: Object
+        Global Methods: False
+        Indexer:
+            Indexer: Item
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: item
+                ReadOnly: False
+                Abstract: False
+        Members:
+            Property: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: count
+                ReadOnly: True
+                Abstract: False
+            Property: Keys
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: keys
+                ReadOnly: True
+                Abstract: False
+            Method: Clear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: clear
+                Abstract: False
+            Method: ContainsKey
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: containsKey
+                Abstract: False
+            Method: GetDictionary
+                AssociatedType: Dictionary
+                Visibility: Public, Static
+                Generated Name: getDictionary
+                Abstract: False
+            Method: Remove
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: remove
+                Abstract: False
+            Method: GetKeys
+                AssociatedType: Array
+                Visibility: Public, Static
+                Generated Name: keys
+                Abstract: False
+            Method: GetKeyCount
+                AssociatedType: Int32
+                Visibility: Public, Static
+                Generated Name: getKeyCount
+                Abstract: False
+            Method: ClearKeys
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: clearKeys
+                Abstract: False
+            Method: DeleteKey
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: deleteKey
+                Abstract: False
+            Method: KeyExists
+                AssociatedType: Boolean
+                Visibility: Public, Static
+                Generated Name: keyExists
+                Abstract: False
+        
+    Class: DictionaryEntry
+        Application Type: False
+        Public: True
+        Generated Name: DictionaryEntry
+        Global Methods: False
+        Members:
+            Field: Key
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: key
+            Field: Value
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: value
+        
+    Interface: ICollection
+        Application Type: False
+        Public: True
+        Generated Name: ICollection
+        Members:
+            Field: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+        
+    Interface: IEnumerable
+        Application Type: False
+        Public: True
+        Generated Name: IEnumerable
+        Members:
+            Method: GetEnumerator
+                AssociatedType: System.Collections.IEnumerator
+                Visibility: Public
+                Generated Name: getEnumerator
+                Abstract: True
+        
+    Interface: IEnumerator
+        Application Type: False
+        Public: True
+        Generated Name: IEnumerator
+        Members:
+            Field: Current
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: current
+            Method: MoveNext
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: moveNext
+                Abstract: True
+            Method: Reset
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: reset
+                Abstract: True
+        
+    Interface: IReadonlyCollection
+        Application Type: False
+        Public: True
+        Generated Name: ICollection
+        Members:
+            Field: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+        
+    Class: ObservableCollection
+        Application Type: False
+        Public: True
+        Generated Name: ObservableCollection
+        Global Methods: False
+        Indexer:
+            Indexer: Item
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: item
+                ReadOnly: False
+                Abstract: False
+        Members:
+            Property: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+                ReadOnly: True
+                Abstract: False
+            Method: Add
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: add
+                Abstract: False
+            Method: Clear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: clear
+                Abstract: False
+            Method: Contains
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: contains
+                Abstract: False
+            Method: GetEnumerator
+                AssociatedType: System.Collections.IEnumerator
+                Visibility: Public
+                Generated Name: getEnumerator
+                Abstract: False
+            Method: IndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: indexOf
+                Abstract: False
+            Method: Insert
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: insert
+                Abstract: False
+            Method: Remove
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: remove
+                Abstract: False
+            Method: RemoveAt
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: removeAt
+                Abstract: False
+            Method: ToArray
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: toArray
+                Abstract: False
+        
+    Class: Queue
+        Application Type: False
+        Public: True
+        Generated Name: Array
+        Global Methods: False
+        Members:
+            Field: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+            Method: Clear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: clear
+                Abstract: False
+            Method: Contains
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: contains
+                Abstract: False
+            Method: Dequeue
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: dequeue
+                Abstract: False
+            Method: Enqueue
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: enqueue
+                Abstract: False
+            Method: Peek
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: peek
+                Abstract: False
+        
+    Class: Stack
+        Application Type: False
+        Public: True
+        Generated Name: Array
+        Global Methods: False
+        Members:
+            Field: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+            Method: Clear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: clear
+                Abstract: False
+            Method: Contains
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: contains
+                Abstract: False
+            Method: Peek
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: peek
+                Abstract: False
+            Method: Pop
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: pop
+                Abstract: False
+            Method: Push
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: push
+                Abstract: False
+        
+
+Namespace: System.Collections.Generic
+HasApplicationTypes: False
+Types:
+    Delegate: CompareCallback`1
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Class: Dictionary`2
+        Application Type: False
+        Public: True
+        Generated Name: Object
+        Global Methods: False
+        Indexer:
+            Indexer: Item
+                AssociatedType: TValue
+                Visibility: Public
+                Generated Name: item
+                ReadOnly: False
+                Abstract: False
+        Members:
+            Property: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: count
+                ReadOnly: True
+                Abstract: False
+            Property: Keys
+                AssociatedType: System.Collections.Generic.IReadonlyCollection`1
+                Visibility: Public
+                Generated Name: keys
+                ReadOnly: True
+                Abstract: False
+            Method: Add
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: add
+                Abstract: False
+            Method: Clear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: clear
+                Abstract: False
+            Method: ContainsKey
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: containsKey
+                Abstract: False
+            Method: GetDictionary
+                AssociatedType: Dictionary`2
+                Visibility: Public, Static
+                Generated Name: getDictionary
+                Abstract: False
+            Method: GetEnumerator
+                AssociatedType: System.Collections.Generic.IEnumerator`1
+                Visibility: Public
+                Generated Name: getEnumerator
+                Abstract: False
+            Method: Remove
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: remove
+                Abstract: False
+            Method: TryGetValue
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: tryGetValue
+                Abstract: False
+        
+    Interface: ICollection`1
+        Application Type: False
+        Public: True
+        Generated Name: ICollection
+        Members:
+            Field: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+        
+    Interface: IEnumerable`1
+        Application Type: False
+        Public: True
+        Generated Name: IEnumerable
+        Members:
+            Method: GetEnumerator
+                AssociatedType: System.Collections.Generic.IEnumerator`1
+                Visibility: Public
+                Generated Name: getEnumerator
+                Abstract: True
+        
+    Interface: IEnumerator`1
+        Application Type: False
+        Public: True
+        Generated Name: IEnumerator
+        Members:
+            Field: Current
+                AssociatedType: T
+                Visibility: Public
+                Generated Name: current
+            Method: MoveNext
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: moveNext
+                Abstract: True
+            Method: Reset
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: reset
+                Abstract: True
+        
+    Interface: IReadonlyCollection`1
+        Application Type: False
+        Public: True
+        Generated Name: ICollection
+        Members:
+            Field: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+        
+    Class: KeyValuePair`2
+        Application Type: False
+        Public: True
+        Generated Name: Object
+        Global Methods: False
+        Members:
+            Field: Key
+                AssociatedType: TKey
+                Visibility: Public
+                Generated Name: key
+            Field: Value
+                AssociatedType: TValue
+                Visibility: Public
+                Generated Name: value
+        
+    Class: List`1
+        Application Type: False
+        Public: True
+        Generated Name: Array
+        Global Methods: False
+        Indexer:
+            Indexer: Item
+                AssociatedType: T
+                Visibility: Public
+                Generated Name: item
+                ReadOnly: False
+                Abstract: False
+        Members:
+            Field: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+            Method: Add
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: add
+                Abstract: False
+            Method: AddRange
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: addRange
+                Abstract: False
+            Method: Clone
+                AssociatedType: List`1
+                Visibility: Public
+                Generated Name: clone
+                Abstract: False
+            Method: Clear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: clear
+                Abstract: False
+            Method: Concat
+                AssociatedType: List`1
+                Visibility: Public
+                Generated Name: concat
+                Abstract: False
+            Method: Contains
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: contains
+                Abstract: False
+            Method: Every
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: every
+                Abstract: False
+            Method: Extract
+                AssociatedType: List`1
+                Visibility: Public
+                Generated Name: extract
+                Abstract: False
+            Method: Filter
+                AssociatedType: List`1
+                Visibility: Public
+                Generated Name: filter
+                Abstract: False
+            Method: ForEach
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: forEach
+                Abstract: False
+            Method: GetEnumerator
+                AssociatedType: System.Collections.Generic.IEnumerator`1
+                Visibility: Public
+                Generated Name: getEnumerator
+                Abstract: False
+            Method: GroupBy
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: groupBy
+                Abstract: False
+            Method: IndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: indexOf
+                Abstract: False
+            Method: Insert
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: insert
+                Abstract: False
+            Method: InsertRange
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: insertRange
+                Abstract: False
+            Method: Join
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: join
+                Abstract: False
+            Method: LastIndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: lastIndexOf
+                Abstract: False
+            Method: Map
+                AssociatedType: List`1
+                Visibility: Public
+                Generated Name: map
+                Abstract: False
+            Method: Parse
+                AssociatedType: List`1
+                Visibility: Public, Static
+                Generated Name: parse
+                Abstract: False
+            Method: Reduce
+                AssociatedType: TReduced
+                Visibility: Public
+                Generated Name: reduce
+                Abstract: False
+            Method: ReduceRight
+                AssociatedType: TReduced
+                Visibility: Public
+                Generated Name: reduceRight
+                Abstract: False
+            Method: Remove
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: remove
+                Abstract: False
+            Method: RemoveAt
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: removeAt
+                Abstract: False
+            Method: RemoveRange
+                AssociatedType: List`1
+                Visibility: Public
+                Generated Name: removeRange
+                Abstract: False
+            Method: Reverse
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: reverse
+                Abstract: False
+            Method: Slice
+                AssociatedType: List`1
+                Visibility: Public
+                Generated Name: slice
+                Abstract: False
+            Method: Some
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: some
+                Abstract: False
+            Method: Sort
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: sort
+                Abstract: False
+            Method: Splice
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: splice
+                Abstract: False
+            Method: Unshift
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: unshift
+                Abstract: False
+        
+    Delegate: ListCallback`1
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: ListFilterCallback`1
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Class: ListGrouping`1
+        Application Type: False
+        Public: True
+        Generated Name: Array
+        Global Methods: False
+        Indexer:
+            Indexer: Item
+                AssociatedType: T
+                Visibility: Public
+                Generated Name: item
+                ReadOnly: True
+                Abstract: False
+        Members:
+            Field: Key
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: key
+            Field: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+            Method: Contains
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: contains
+                Abstract: False
+            Method: Every
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: every
+                Abstract: False
+            Method: Extract
+                AssociatedType: List`1
+                Visibility: Public
+                Generated Name: extract
+                Abstract: False
+            Method: Filter
+                AssociatedType: List`1
+                Visibility: Public
+                Generated Name: filter
+                Abstract: False
+            Method: ForEach
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: forEach
+                Abstract: False
+            Method: GetEnumerator
+                AssociatedType: System.Collections.Generic.IEnumerator`1
+                Visibility: Public
+                Generated Name: getEnumerator
+                Abstract: False
+            Method: GroupBy
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: groupBy
+                Abstract: False
+            Method: IndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: indexOf
+                Abstract: False
+            Method: Join
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: join
+                Abstract: False
+            Method: LastIndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: lastIndexOf
+                Abstract: False
+            Method: Map
+                AssociatedType: List`1
+                Visibility: Public
+                Generated Name: map
+                Abstract: False
+            Method: Reverse
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: reverse
+                Abstract: False
+            Method: Some
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: some
+                Abstract: False
+        
+    Delegate: ListItemCallback`1
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: ListItemFilterCallback`1
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: ListItemKeyGenerator`1
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: ListItemMapCallback`2
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: TTarget
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: ListItemReduceCallback`2
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: TReduced
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: ListMapCallback`2
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: TTarget
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: ListReduceCallback`2
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: TReduced
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Class: ObservableCollection`1
+        Application Type: False
+        Public: True
+        Generated Name: ObservableCollection
+        Global Methods: False
+        Indexer:
+            Indexer: Item
+                AssociatedType: T
+                Visibility: Public
+                Generated Name: item
+                ReadOnly: False
+                Abstract: False
+        Members:
+            Property: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+                ReadOnly: True
+                Abstract: False
+            Method: Add
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: add
+                Abstract: False
+            Method: Clear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: clear
+                Abstract: False
+            Method: Contains
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: contains
+                Abstract: False
+            Method: GetEnumerator
+                AssociatedType: System.Collections.Generic.IEnumerator`1
+                Visibility: Public
+                Generated Name: getEnumerator
+                Abstract: False
+            Method: IndexOf
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: indexOf
+                Abstract: False
+            Method: Insert
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: insert
+                Abstract: False
+            Method: Remove
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: remove
+                Abstract: False
+            Method: RemoveAt
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: removeAt
+                Abstract: False
+            Method: ToArray
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: toArray
+                Abstract: False
+        
+    Class: Queue`1
+        Application Type: False
+        Public: True
+        Generated Name: Array
+        Global Methods: False
+        Members:
+            Field: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+            Method: Clear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: clear
+                Abstract: False
+            Method: Contains
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: contains
+                Abstract: False
+            Method: Dequeue
+                AssociatedType: T
+                Visibility: Public
+                Generated Name: dequeue
+                Abstract: False
+            Method: Enqueue
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: enqueue
+                Abstract: False
+            Method: Peek
+                AssociatedType: T
+                Visibility: Public
+                Generated Name: peek
+                Abstract: False
+        
+    Class: Stack`1
+        Application Type: False
+        Public: True
+        Generated Name: Array
+        Global Methods: False
+        Members:
+            Field: Count
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: length
+            Method: Clear
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: clear
+                Abstract: False
+            Method: Contains
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: contains
+                Abstract: False
+            Method: Peek
+                AssociatedType: T
+                Visibility: Public
+                Generated Name: peek
+                Abstract: False
+            Method: Pop
+                AssociatedType: T
+                Visibility: Public
+                Generated Name: pop
+                Abstract: False
+            Method: Push
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: push
+                Abstract: False
+        
+
+Namespace: System.ComponentModel
+HasApplicationTypes: False
+Types:
+    Interface: IApplication
+        Application Type: False
+        Public: True
+        Generated Name: IApplication
+        Members:
+            Method: GetSetting
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: getSetting
+                Abstract: True
+        
+    Interface: IContainer
+        Application Type: False
+        Public: True
+        Generated Name: IContainer
+        Members:
+            Method: GetObject
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: getObject
+                Abstract: True
+            Method: RegisterObject
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: registerObject
+                Abstract: True
+            Method: RegisterFactory
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: registerFactory
+                Abstract: True
+        
+    Interface: IEventManager
+        Application Type: False
+        Public: True
+        Generated Name: IEventManager
+        Members:
+            Method: PublishEvent
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: publishEvent
+                Abstract: True
+            Method: SubscribeEvent
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: subscribeEvent
+                Abstract: True
+            Method: UnsubscribeEvent
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: unsubscribeEvent
+                Abstract: True
+        
+    Interface: IInitializable
+        Application Type: False
+        Public: True
+        Generated Name: IInitializable
+        Members:
+            Method: BeginInitialization
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: beginInitialization
+                Abstract: True
+            Method: EndInitialization
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: endInitialization
+                Abstract: True
+        
+    Interface: IObserver
+        Application Type: False
+        Public: True
+        Generated Name: IObserver
+        Members:
+            Method: InvalidateObserver
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: invalidateObserver
+                Abstract: True
+        
+    Class: Observable`1
+        Application Type: False
+        Public: True
+        Generated Name: Observable
+        Global Methods: False
+        Members:
+            Method: GetValue
+                AssociatedType: T
+                Visibility: Public
+                Generated Name: getValue
+                Abstract: False
+            Method: SetValue
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setValue
+                Abstract: False
+        
+    Class: ObserverManager
+        Application Type: False
+        Public: True
+        Generated Name: Observable
+        Global Methods: False
+        Members:
+            Method: RegisterObserver
+                AssociatedType: System.IDisposable
+                Visibility: Public, Static
+                Generated Name: registerObserver
+                Abstract: False
+        
+
+Namespace: System.Diagnostics
+HasApplicationTypes: False
+Types:
+    Class: Debug
+        Application Type: False
+        Public: True
+        Generated Name: console
+        Global Methods: False
+        Members:
+            Method: Assert
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: assert
+                Abstract: False
+                Conditions:
+                    DEBUG
+            Method: Fail
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: fail
+                Abstract: False
+                Conditions:
+                    DEBUG
+            Method: WriteLine
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: log
+                Abstract: False
+                Conditions:
+                    DEBUG
+        
+
+Namespace: System.Globalization
+HasApplicationTypes: False
+Types:
+    Class: CultureInfo
+        Application Type: False
+        Public: True
+        Generated Name: CultureInfo
+        Global Methods: False
+        Members:
+            Field: CurrentCulture
+                AssociatedType: System.Globalization.CultureInfo
+                Visibility: Public, Static
+                Generated Name: CurrentCulture
+            Field: DateFormat
+                AssociatedType: DateFormatInfo
+                Visibility: Public
+                Generated Name: dateFormat
+            Field: InvariantCulture
+                AssociatedType: System.Globalization.CultureInfo
+                Visibility: Public, Static
+                Generated Name: InvariantCulture
+            Field: Name
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: name
+            Field: NumberFormat
+                AssociatedType: NumberFormatInfo
+                Visibility: Public
+                Generated Name: numberFormat
+        
+    Class: DateFormatInfo
+        Application Type: False
+        Public: True
+        Generated Name: DateFormatInfo
+        Global Methods: False
+        Members:
+            Field: AMDesignator
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: amDesignator
+            Field: PMDesignator
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: pmDesignator
+            Field: DateSeparator
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: dateSeparator
+            Field: TimeSeparator
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: timeSeparator
+            Field: GMTDateTimePattern
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: gmtDateTimePattern
+            Field: UniversalDateTimePattern
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: universalDateTimePattern
+            Field: SortableDateTimePattern
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: sortableDateTimePattern
+            Field: DateTimePattern
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: dateTimePattern
+            Field: LongDatePattern
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: longDatePattern
+            Field: ShortDatePattern
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: shortDatePattern
+            Field: LongTimePattern
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: longTimePattern
+            Field: ShortTimePattern
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: shortTimePattern
+            Field: FirstDayOfWeek
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: firstDayOfWeek
+            Field: DayNames
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: dayNames
+            Field: ShortDayNames
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: shortDayNames
+            Field: MinimizedDayNames
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: minimizedDayNames
+            Field: MonthNames
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: monthNames
+            Field: ShortMonthNames
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: shortMonthNames
+        
+    Class: NumberFormatInfo
+        Application Type: False
+        Public: True
+        Generated Name: NumberFormatInfo
+        Global Methods: False
+        Members:
+            Field: NaNSymbol
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: naNSymbol
+            Field: NegativeSign
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: negativeSign
+            Field: PositiveSign
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: positiveSign
+            Field: NegativeInfinityText
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: negativeInfinityText
+            Field: PositiveInfinityText
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: positiveInfinityText
+            Field: PercentSymbol
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: percentSymbol
+            Field: PercentGroupSizes
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: percentGroupSizes
+            Field: PercentDecimalDigits
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: percentDecimalDigits
+            Field: PercentDecimalSeparator
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: percentDecimalSeparator
+            Field: PercentGroupSeparator
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: percentGroupSeparator
+            Field: PercentPositivePattern
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: percentPositivePattern
+            Field: PercentNegativePattern
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: percentNegativePattern
+            Field: CurrencySymbol
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: currencySymbol
+            Field: CurrencyGroupSizes
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: currencyGroupSizes
+            Field: CurrencyDecimalDigits
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: currencyDecimalDigits
+            Field: CurrencyDecimalSeparator
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: currencyDecimalSeparator
+            Field: CurrencyGroupSeparator
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: currencyGroupSeparator
+            Field: CurrencyPositivePattern
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: currencyPositivePattern
+            Field: CurrencyNegativePattern
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: currencyNegativePattern
+            Field: NumberGroupSizes
+                AssociatedType: Array
+                Visibility: Public
+                Generated Name: numberGroupSizes
+            Field: NumberDecimalDigits
+                AssociatedType: Int32
+                Visibility: Public
+                Generated Name: numberDecimalDigits
+            Field: NumberDecimalSeparator
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: numberDecimalSeparator
+            Field: NumberGroupSeparator
+                AssociatedType: String
+                Visibility: Public
+                Generated Name: numberGroupSeparator
+        
+
+Namespace: System.Serialization
+HasApplicationTypes: False
+Types:
+    Class: Json
+        Application Type: False
+        Public: True
+        Generated Name: JSON
+        Global Methods: False
+        Members:
+            Method: Parse
+                AssociatedType: Object
+                Visibility: Public, Static
+                Generated Name: parse
+                Abstract: False
+            Method: ParseData
+                AssociatedType: TData
+                Visibility: Public, Static
+                Generated Name: parse
+                Abstract: False
+            Method: Stringify
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: stringify
+                Abstract: False
+        
+    Delegate: JsonParseCallback
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+    Delegate: JsonStringifyCallback
+        Application Type: False
+        Public: True
+        Generated Name: Function
+        Members:
+            Method: Invoke
+                AssociatedType: Object
+                Visibility: Public
+                Generated Name: 
+                Abstract: True
+        
+
+Namespace: System.Testing
+HasApplicationTypes: False
+Types:
+    Class: Assert
+        Application Type: False
+        Public: True
+        Generated Name: Assert
+        Global Methods: False
+        Members:
+            Method: AreEqual
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: QUnit.equal
+                Abstract: False
+            Method: AreNotEqual
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: QUnit.notEqual
+                Abstract: False
+            Method: ExpectAsserts
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: QUnit.expect
+                Abstract: False
+            Method: IsTrue
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: QUnit.ok
+                Abstract: False
+        
+    Class: TestClass
+        Application Type: False
+        Public: True
+        Generated Name: TestClass
+        Global Methods: False
+        Members:
+            Method: Cleanup
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: cleanup
+                Abstract: False
+            Method: Setup
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: setup
+                Abstract: False
+        
+    Class: TestEngine
+        Application Type: False
+        Public: True
+        Generated Name: TestEngine
+        Global Methods: False
+        Members:
+            Method: Log
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: QUnit.log
+                Abstract: False
+            Method: ResumeOnAsyncCompleted
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: QUnit.start
+                Abstract: False
+            Method: TriggerEvent
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: QUnit.triggerEvent
+                Abstract: False
+            Method: WaitForAsyncCompletion
+                AssociatedType: Void
+                Visibility: Public, Static
+                Generated Name: QUnit.stop
+                Abstract: False
+        
+
+Namespace: System.Threading
+HasApplicationTypes: False
+Types:
+    Class: Deferred
+        Application Type: False
+        Public: True
+        Generated Name: Deferred
+        Global Methods: False
+        Members:
+            Field: Task
+                AssociatedType: System.Threading.Task
+                Visibility: Public
+                Generated Name: task
+            Method: Reject
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: reject
+                Abstract: False
+            Method: Resolve
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: resolve
+                Abstract: False
+        
+    Class: Deferred`1
+        Application Type: False
+        Public: True
+        Generated Name: Deferred
+        Global Methods: False
+        BaseClass: System.Threading.Deferred
+        Members:
+            Field: Task
+                AssociatedType: System.Threading.Task`1
+                Visibility: Public
+                Generated Name: task
+            Method: Resolve
+                AssociatedType: Void
+                Visibility: Public
+                Generated Name: resolve
+                Abstract: False
+        
+    Class: Task
+        Application Type: False
+        Public: True
+        Generated Name: Task
+        Global Methods: False
+        Members:
+            Property: Completed
+                AssociatedType: Boolean
+                Visibility: Public
+                Generated Name: completed
+                ReadOnly: True
+                Abstract: False
+            Field: Error
+                AssociatedType: Exception
+                Visibility: Public
+                Generated Name: error
+            Field: Status
+                AssociatedType: TaskStatus
+                Visibility: Public
+                Generated Name: status
+            Method: All
+                AssociatedType: System.Threading.Task`1
+                Visibility: Public, Static
+                Generated Name: all
+                Abstract: False
+            Method: Any
+                AssociatedType: System.Threading.Task`1
+                Visibility: Public, Static
+                Generated Name: any
+                Abstract: False
+            Method: ContinueWith
+                AssociatedType: System.Threading.Task
+                Visibility: Public
+                Generated Name: continueWith
+                Abstract: False
+            Method: Delay
+                AssociatedType: System.Threading.Task
+                Visibility: Public, Static
+                Generated Name: delay
+                Abstract: False
+            Method: Done
+                AssociatedType: System.Threading.Task
+                Visibility: Public
+                Generated Name: done
+                Abstract: False
+            Method: Fail
+                AssociatedType: System.Threading.Task
+                Visibility: Public
+                Generated Name: fail
+                Abstract: False
+            Method: Then
+                AssociatedType: System.Threading.Task
+                Visibility: Public
+                Generated Name: then
+                Abstract: False
+        
+    Class: Task`1
+        Application Type: False
+        Public: True
+        Generated Name: Task
+        Global Methods: False
+        BaseClass: System.Threading.Task
+        Members:
+            Field: Result
+                AssociatedType: T
+                Visibility: Public
+                Generated Name: result
+            Method: ContinueWith
+                AssociatedType: System.Threading.Task`1
+                Visibility: Public
+                Generated Name: continueWith
+                Abstract: False
+            Method: Done
+                AssociatedType: System.Threading.Task`1
+                Visibility: Public
+                Generated Name: done
+                Abstract: False
+        
+    Enumeration: TaskStatus
+        Application Type: False
+        Public: True
+        Generated Name: TaskStatus
+        Flags: False
+        Members:
+            EnumerationField: Pending
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: pending
+            EnumerationField: Done
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: done
+            EnumerationField: Failed
+                AssociatedType: String
+                Visibility: Public, Static
+                Generated Name: failed
+        
+
+
+
+Script
+================================================================
+
+
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.AppFlags
+
+test.AppFlags = function() { };
+test.AppFlags.prototype = {
+    AAA: 1, 
+    BBB: 2
+}
+test.AppFlags.registerEnum('test.AppFlags', true);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Mode
+
+test.Mode = function() { };
+test.Mode.prototype = {
+    mode1: 0, 
+    mode2: 1
+}
+test.Mode.registerEnum('test.Mode', false);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test._iFoo
+
+test._iFoo = function() { };
+test._iFoo.prototype = {
+
+}
+test._iFoo.registerInterface('test._iFoo');
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.IApp
+
+test.IApp = function() { };
+test.IApp.prototype = {
+    run : null
+}
+test.IApp.registerInterface('test.IApp');
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test._point
+
+test.$create__point = function test__point(x, y) {
+    var $o = { };
+    $o.x = x;
+    $o.y = y;
+    return $o;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function test_App() {
+}
+test.App.prototype = {
+    
+    add_event1: function test_App$add_event1(value) {
+        this.__event1 = ss.Delegate.combine(this.__event1, value);
+    },
+    remove_event1: function test_App$remove_event1(value) {
+        this.__event1 = ss.Delegate.remove(this.__event1, value);
+    },
+    
+    __event1: null,
+    
+    add_event2: function test_App$add_event2(value) {
+    },
+    remove_event2: function test_App$remove_event2(value) {
+    },
+    
+    run: function test_App$run() {
+    },
+    
+    _initialize: function test_App$_initialize() {
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test._appHelper
+
+test._appHelper = function test__appHelper() {
+}
+test._appHelper.prototype = {
+    
+    get_prop1: function test__appHelper$get_prop1() {
+        return 0;
+    },
+    
+    get_prop2: function test__appHelper$get_prop2() {
+        return 0;
+    },
+    set_prop2: function test__appHelper$set_prop2(value) {
+        return value;
+    },
+    
+    _showHelp: function test__appHelper$_showHelp() {
+    },
+    get_item: function test__appHelper$get_item(name) {
+        return 0;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test._util
+
+window._showHelp = function test__util$_showHelp() {
+}
+
+
+test.App.registerClass('test.App', null, test.IApp);
+test._appHelper.registerClass('test._appHelper');
diff --git a/tests/TestCases/Basic/Metadata/Code.cs b/tests/TestCases/Basic/Metadata/Code.cs
new file mode 100644
index 000000000..6170ff312
--- /dev/null
+++ b/tests/TestCases/Basic/Metadata/Code.cs
@@ -0,0 +1,80 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace BasicTests {
+
+    public delegate void DoStuff(int i);
+
+    public class App : IApp {
+
+        public App() {
+        }
+
+        public event DoStuff Event1;
+
+        public event DoStuff Event2 {
+            add {
+            }
+            remove {
+            }
+        }
+
+        public void Run() {
+        }
+
+        private void Initialize() {
+        }
+    }
+
+    [Flags]
+    public enum AppFlags {
+
+        AAA = 1,
+
+        BBB = 2
+    }
+
+    public enum Mode {
+
+        Mode1 = 0,
+
+        Mode2 = 1
+    }
+
+    internal class AppHelper {
+
+        public int Prop1 { get { return 0; } }
+        public int Prop2 { get { return 0; } set { } }
+
+        public int this[string name] { get { return 0; } }
+
+        internal void ShowHelp() { }
+    }
+
+    internal interface IFoo {
+    }
+
+    public interface IApp {
+
+        void Run();
+    }
+
+    [GlobalMethods]
+    internal static class Util {
+
+        internal static void ShowHelp() { }
+    }
+
+    internal sealed class Point : Record {
+         public int x;
+         public int y;
+
+         public Point(int x, int y) {
+             this.x = x;
+             this.y = y;
+         }
+    }
+}
diff --git a/tests/TestCases/Basic/Metadata/Sample.bat b/tests/TestCases/Basic/Metadata/Sample.bat
new file mode 100644
index 000000000..6d88e26f3
--- /dev/null
+++ b/tests/TestCases/Basic/Metadata/Sample.bat
@@ -0,0 +1 @@
+csc.exe /t:library /noconfig /nologo /nostdlib /r:..\..\..\..\bin\Debug\mscorlib.dll /out:Sample.dll Sample.cs
diff --git a/tests/TestCases/Basic/Metadata/Sample.cs b/tests/TestCases/Basic/Metadata/Sample.cs
new file mode 100644
index 000000000..85c23fe1f
--- /dev/null
+++ b/tests/TestCases/Basic/Metadata/Sample.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("Sample")]
+
+namespace Script.Sample {
+
+    public abstract class Component {
+
+        private string _id;
+
+        static Component() {
+        }
+
+        protected Component(bool registerAsDisposable) {
+            _id = null;
+            Initialized(this, new EventArgs());
+        }
+
+        public string id {
+            get {
+                return _id;
+            }
+        }
+
+        public virtual string this[string name] {
+            get {
+                return _id;
+            }
+        }
+
+        public event EventHandler Initialized;
+    }
+
+    public class Control : Component {
+
+        public Control() : base(true) {
+        }
+
+        public override string this[string name] {
+            get {
+                return base[name] + "1";
+            }
+        }
+    }
+
+    public interface ITypeDescriptorProvider {
+
+        object getDescriptor();
+    }
+
+    public enum BindingDirection { In, Out, InOut }
+
+    public class Binding {
+
+        private BindingDirection _direction;
+
+        public BindingDirection direction {
+            get {
+                return _direction;
+            }
+            set {
+                _direction = value;
+            }
+        }
+    }
+
+    public class EventArgs {
+    }
+
+    public delegate void EventHandler(object sender, EventArgs e);
+
+    public delegate int MyCallback();
+}
diff --git a/tests/TestCases/Basic/Metadata/Sample.dll b/tests/TestCases/Basic/Metadata/Sample.dll
new file mode 100644
index 000000000..8398256ca
Binary files /dev/null and b/tests/TestCases/Basic/Metadata/Sample.dll differ
diff --git a/tests/TestCases/Basic/Minimization/Baseline.txt b/tests/TestCases/Basic/Minimization/Baseline.txt
new file mode 100644
index 000000000..01dc79325
--- /dev/null
+++ b/tests/TestCases/Basic/Minimization/Baseline.txt
@@ -0,0 +1,316 @@
+Minimization Map
+================================================================
+    Member '__valueChanged' renamed to '$1_5'
+    Member '_intVal' renamed to '$1_0'
+    Member '_intVal2' renamed to '$1_1'
+    Member '_intVal3' renamed to '$1_2'
+    Member '_strVal' renamed to '$1_3'
+Type 'BasicTests.ABC' renamed to '_ABC'
+    Member 'Alpha' renamed to '$0'
+Type 'BasicTests.AppHelper' renamed to 'test$3'
+Type 'BasicTests.Bar' renamed to '_Bar'
+Type 'BasicTests.Bar2' renamed to '_Bar2'
+Type 'BasicTests.BarCustom2' renamed to 'test$6'
+Type 'BasicTests.BarEx' renamed to 'test$5'
+Type 'BasicTests.BaseBaseClass' renamed to 'test$1'
+Type 'BasicTests.BaseClass' renamed to 'test$4'
+Type 'BasicTests.DerivedClass' renamed to 'test$7'
+    Member 'Dispose' renamed to '$1'
+    Member 'DoStuff' renamed to '$0'
+    Member 'DoStuff' renamed to '$0'
+    Member 'DoStuffBase' renamed to '$1'
+    Member 'DoStuffBaseBase' renamed to '$0'
+    Member 'DoStuffDelayed' renamed to '$4'
+    Member 'DoStuffDerived' renamed to '$2'
+    Member 'DoStuffInternal' renamed to '$3'
+    Member 'ExecuteHandler' renamed to '$1'
+    Member 'Foo' renamed to '$2'
+Type 'BasicTests.IApp' renamed to '_IApp'
+    Member 'Initialize' renamed to '$0'
+Type 'BasicTests.MaskTextBox' renamed to 'test$8'
+Type 'BasicTests.MyData' renamed to 'test$2'
+Type 'BasicTests.MyMode' renamed to 'test$0'
+    Member 'Numeric' renamed to '$1'
+    Member 'OnClicked' renamed to '$3_1'
+    Member 'OnValueChanged' renamed to '$1_6'
+    Member 'OnValueChanged' renamed to '$3_0'
+    Member 'Property1' renamed to '$1_7'
+    Member 'Setup' renamed to '$2'
+    Member 'ShowHelp' renamed to '$0'
+    Member 'string1' renamed to '$0'
+    Member 'string2' renamed to '$1'
+    Member 'Stuff' renamed to '$5'
+    Member 'StuffProperty' renamed to '$6'
+    Member 'ToString' renamed to 'toString'
+    Member 'ValueChanged' renamed to '$1_4'
+
+
+Script
+================================================================
+
+
+Type.registerNamespace('test');
+
+test.AppFlags = function() { };
+test.AppFlags.prototype = {
+    AAA: 0, 
+    BBB: 1
+}
+test.AppFlags.registerEnum('test.AppFlags', false);
+
+
+test._IApp = function() { };
+test._IApp.registerInterface('test._IApp');
+
+
+test.$create_test$2 = function(a, b) {
+    var $o = { };
+    $o.$0 = a;
+    $o.$1 = b;
+    return $o;
+}
+
+
+window.run = function() {
+}
+
+
+test.App = function() {
+    var $0 = new test.test$3();
+    $0.$0();
+}
+test.App.prototype = {
+    
+    run: function() {
+    },
+    
+    $0: function() {
+    },
+    
+    $1: function() {
+    }
+}
+
+
+test.test$3 = function() {
+}
+test.test$3.prototype = {
+    
+    $0: function() {
+    }
+}
+
+
+test._Bar = function() {
+}
+test._Bar.prototype = {
+    
+    $0: function() {
+    },
+    
+    toString: function() {
+        return null;
+    },
+    
+    $1: function($p0) {
+    }
+}
+
+
+test._Bar2 = function() {
+    test._Bar2.initializeBase(this);
+}
+
+
+test.test$5 = function() {
+    test.test$5.initializeBase(this);
+}
+test.test$5.prototype = {
+    
+    $2: function() {
+        var $0 = 1;
+    },
+    
+    $0: function() {
+        this.$2();
+        test.test$5.callBaseMethod(this, '$0');
+        var $0 = test.$create_test$2('a', 'b');
+        $0.$0 = $0.$1;
+    },
+    
+    $3: function($p0) {
+        $p0 = $p0 + 2;
+    },
+    
+    $4: function($p0) {
+        var $0 = $p0 + 1;
+        var $1 = $p0.toString();
+        var $2 = 0;
+        this.$1(ss.Delegate.create(this, function($p1_0, $p1_1) {
+            this.$1(function($p2_0, $p2_1) {
+                var $2_0 = 11;
+                return $p2_0;
+            });
+            var $1_0 = 10;
+            var $1_1 = 11;
+            return $0 + $p1_0 + $1 + $p1_1 + $1_0;
+        }));
+    },
+    
+    get_$5: function() {
+        return 0;
+    },
+    set_$5: function($p0) {
+        var $0 = $p0;
+        return $p0;
+    },
+    
+    get_$6: function() {
+        this.$1(ss.Delegate.create(this, function($p1_0, $p1_1) {
+            this.$1(function($p2_0, $p2_1) {
+                var $2_0 = 11;
+                return $p2_0;
+            });
+            var $1_0 = 10;
+            var $1_1 = 11;
+            return $p1_0 + $p1_1 + $1_0;
+        }));
+        return 0;
+    },
+    set_$6: function($p0) {
+        var $0 = $p0 + 1;
+        var $1 = $p0.toString();
+        this.$1(ss.Delegate.create(this, function($p1_0, $p1_1) {
+            this.$1(function($p2_0, $p2_1) {
+                var $2_0 = 11;
+                return $p2_0;
+            });
+            var $1_0 = 10;
+            var $1_1 = 11;
+            return $0 + $p1_0 + $1 + $p1_1 + $p0 + $1_1;
+        }));
+        return $p0;
+    }
+}
+
+
+test.BarCustom = function() {
+    test.BarCustom.initializeBase(this);
+}
+
+
+test.test$6 = function() {
+    test.test$6.initializeBase(this);
+}
+test.test$6.prototype = {
+    
+    $2: function() {
+        return 0;
+    },
+    
+    baz: function() {
+        return 0;
+    },
+    
+    xyz: function() {
+    }
+}
+
+
+test.FooBehavior = function(e, i) {
+    test.FooBehavior.initializeBase(this, [ e, null ]);
+    this.$1_0 = i;
+    this.$1_1 = i * 2;
+    this.$1_2 = i * 4;
+}
+test.FooBehavior.prototype = {
+    $1_0: 0,
+    $1_1: 0,
+    $1_2: 0,
+    
+    add_$1_4: function($p0) {
+        this.$1_5 = ss.Delegate.combine(this.$1_5, $p0);
+    },
+    remove_$1_4: function($p0) {
+        this.$1_5 = ss.Delegate.remove(this.$1_5, $p0);
+    },
+    
+    $1_5: null,
+    
+    dispose: function() {
+        this.$1_0 = 0;
+        test.FooBehavior.callBaseMethod(this, 'dispose');
+    },
+    
+    $1_6: function() {
+    },
+    
+    get_$1_7: function() {
+        return null;
+    },
+    get_item: function($p0) {
+        return 0;
+    }
+}
+
+
+test.test$8 = function(e) {
+    test.test$8.initializeBase(this, [ e ]);
+}
+test.test$8.prototype = {
+    
+    $3_0: function() {
+    },
+    
+    $3_1: function() {
+    }
+}
+
+
+test.test$7 = function() {
+    test.test$7.initializeBase(this);
+}
+test.test$7.prototype = {
+    
+    $2: function() {
+    }
+}
+
+
+test.test$4 = function() {
+    test.test$4.initializeBase(this);
+}
+test.test$4.prototype = {
+    
+    $1: function() {
+    }
+}
+
+
+test.test$1 = function() {
+}
+test.test$1.prototype = {
+    
+    $0: function() {
+    }
+}
+
+
+test._ABC = function() {
+}
+
+
+test.App.registerClass('test.App');
+test.test$3.registerClass('test.test$3');
+test._Bar.registerClass('test._Bar');
+test._Bar2.registerClass('test._Bar2', test._Bar);
+test.test$5.registerClass('test.test$5', test._Bar2);
+test.BarCustom.registerClass('test.BarCustom', test._Bar);
+test.test$6.registerClass('test.test$6', test.BarCustom);
+test.FooBehavior.registerClass('test.FooBehavior', ScriptFX.Behavior);
+test.test$8.registerClass('test.test$8', ScriptFX.TextBox);
+test.test$1.registerClass('test.test$1');
+test.test$4.registerClass('test.test$4', test.test$1);
+test.test$7.registerClass('test.test$7', test.test$4);
+test._ABC.registerClass('test._ABC');
+test.FooBehavior.$1_3 = null;
diff --git a/tests/TestCases/Basic/Minimization/Code.cs b/tests/TestCases/Basic/Minimization/Code.cs
new file mode 100644
index 000000000..94ded6c0f
--- /dev/null
+++ b/tests/TestCases/Basic/Minimization/Code.cs
@@ -0,0 +1,226 @@
+using System;
+using System.Html;
+using System.Runtime.CompilerServices;
+using ScriptFX;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace BasicTests {
+
+    [GlobalMethods]
+    public static class GlobalMethodsClass {
+
+        public static void Run() {
+        }
+    }
+
+    public class App {
+
+        public App() {
+            AppHelper helper = new AppHelper();
+            helper.ShowHelp();
+        }
+
+        public void Run() {
+        }
+
+        private void Initialize() {
+        }
+
+        void Dispose() {
+        }
+    }
+
+    public delegate object MyHandler(int indexValue, string textValue);
+
+    public enum AppFlags {
+
+        AAA = 0,
+
+        BBB = 1
+    }
+
+    internal class AppHelper {
+
+        internal void ShowHelp() { }
+    }
+
+    internal interface IApp {
+    }
+
+    internal class Bar {
+
+        public virtual void DoStuff() { }
+
+        public override string ToString() {
+            return null;
+        }
+
+        internal void ExecuteHandler(MyHandler handler) {
+        }
+    }
+
+    internal class Bar2 : Bar {
+    }
+
+    internal class BarEx : Bar2 {
+
+        public void Setup() { MyMode mode = MyMode.Numeric; }
+
+        public override void DoStuff() {
+            Setup();
+            base.DoStuff();
+
+            MyData d = new MyData("a", "b");
+            d.string1 = d.string2;
+        }
+
+        internal void DoStuffInternal(int blah) {
+            blah = blah + 2;
+        }
+
+        internal void DoStuffDelayed(int currentValue) {
+            int numericValue = currentValue + 1;
+            string stringValue = currentValue.ToString();
+            int value = 0;
+
+            ExecuteHandler(delegate (int indexValue, string textValue) {
+                               ExecuteHandler(delegate (int indexValue, string textValue) {
+                                                  int value = 11;
+                                                  return indexValue;
+                                              });
+                               int value = 10;
+                               int value2 = 11;
+                               return numericValue + indexValue +
+                                      stringValue + textValue + value;
+                           });
+        }
+
+        internal int Stuff { get { return 0; } set { int x = value; } }
+        
+        internal int StuffProperty {
+            get {
+                ExecuteHandler(delegate (int indexValue, string textValue) {
+                               ExecuteHandler(delegate (int indexValue, string textValue) {
+                                                  int value = 11;
+                                                  return indexValue;
+                                              });
+                               int value = 10;
+                               int value2 = 11;
+                               return indexValue + textValue + value;
+                });
+                return 0;
+            }
+            set {
+                int numericValue = value + 1;
+                string stringValue = value.ToString();
+
+                ExecuteHandler(delegate (int indexValue, string textValue) {
+                               ExecuteHandler(delegate (int indexValue, string textValue) {
+                                                  int value1 = 11;
+                                                  return indexValue;
+                                              });
+                               int value2 = 10;
+                               int value3 = 11;
+                               return numericValue + indexValue +
+                                      stringValue + textValue + value + value3;
+                });
+            }
+        }
+    }
+
+    [PreserveName]
+    internal class BarCustom : Bar {
+    }
+
+    internal class BarCustom2 : BarCustom {
+
+        public int Foo() { return 0; }
+
+        [PreserveName]
+        public int Baz() { return 0; }
+
+        [PreserveName]
+        private void Xyz() { }
+    }
+
+    internal enum MyMode { Alpha = 0, Numeric = 1 };
+
+    public class FooBehavior : Behavior {
+
+        private int _intVal;
+        private int _intVal2;
+        int _intVal3;
+
+        static string _strVal;
+
+        event EventHandler ValueChanged;
+
+        public FooBehavior(Element e, int i) : base(e, null) {
+            _intVal = i;
+            _intVal2 = i * 2;
+            _intVal3 = i * 4;
+        }
+
+        public override void Dispose() {
+            _intVal = 0;
+            base.Dispose();
+        }
+
+        void OnValueChanged() {
+        }
+
+        int this[string name] {
+            get { return 0; }
+        }
+
+        string Property1 {
+            get { return null; }
+        }
+    }
+
+    internal class MaskTextBox : TextBox {
+
+        public MaskTextBox(Element e) : base(e) {
+        }
+
+        private void OnValueChanged() {
+        }
+
+        void OnClicked() {
+        }
+    }
+
+    internal class DerivedClass : BaseClass {
+
+        private void DoStuffDerived() {
+        }
+    }
+
+    internal class BaseClass : BaseBaseClass {
+
+        private void DoStuffBase() {
+        }
+    }
+
+    internal class BaseBaseClass {
+
+        private void DoStuffBaseBase() {
+        }
+    }
+
+    internal sealed class MyData : Record {
+
+        public string string1;
+        public string string2;
+
+        public MyData(string a, string b) {
+            string1 = a;
+            string2 = b;
+        }
+    }
+
+    internal class ABC {
+    }
+}
diff --git a/tests/TestCases/Basic/Minimization/Lib.bat b/tests/TestCases/Basic/Minimization/Lib.bat
new file mode 100644
index 000000000..4ce0f26f5
--- /dev/null
+++ b/tests/TestCases/Basic/Minimization/Lib.bat
@@ -0,0 +1 @@
+csc.exe /t:library /noconfig /nologo /nostdlib /r:..\..\..\..\bin\Debug\mscorlib.dll /r:..\..\..\..\bin\Debug\Script.Web.dll /out:Lib.dll Lib.cs
diff --git a/tests/TestCases/Basic/Minimization/Lib.cs b/tests/TestCases/Basic/Minimization/Lib.cs
new file mode 100644
index 000000000..31d156548
--- /dev/null
+++ b/tests/TestCases/Basic/Minimization/Lib.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+[assembly:ScriptAssembly("lib")]
+
+namespace ScriptFX {
+
+    public abstract class Behavior {
+    
+        protected Behavior(Element e, string name) {
+        }
+        
+        public virtual void Dispose() {
+        }
+    }
+    
+    public abstract class Control : Behavior {
+    
+        protected Control(Element e) : base(e, "control") {
+        }
+    }
+
+    public class TextBox : Control {
+    
+        protected TextBox(Element e) : base(e) {
+        }
+    }
+}
diff --git a/tests/TestCases/Basic/Minimization/Lib.dll b/tests/TestCases/Basic/Minimization/Lib.dll
new file mode 100644
index 000000000..e7ebacbca
Binary files /dev/null and b/tests/TestCases/Basic/Minimization/Lib.dll differ
diff --git a/tests/TestCases/Basic/Resources/Baseline.txt b/tests/TestCases/Basic/Resources/Baseline.txt
new file mode 100644
index 000000000..02edf7458
--- /dev/null
+++ b/tests/TestCases/Basic/Resources/Baseline.txt
@@ -0,0 +1,30 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function test_App() {
+    var s1 = test._strings1.string1;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test._strings1
+
+test._strings1 = { 
+    string1: 'neutral: aaa',
+    string2: 'fr: bbb',
+    string3: 'fr-FR: ccc'
+};
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Strings2
+
+test.Strings2 = { 
+    string1: 's2',
+    string2: '1234'
+};
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Basic/Resources/Code.cs b/tests/TestCases/Basic/Resources/Code.cs
new file mode 100644
index 000000000..15d8060d6
--- /dev/null
+++ b/tests/TestCases/Basic/Resources/Code.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Runtime.CompilerServices;
+using Resources;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace BasicTests {
+
+    public class App {
+
+        public App() {
+            string s1 = Strings1.String1;
+        }
+    }
+}
diff --git a/tests/TestCases/Basic/Resources/Strings1.fr-FR.resx b/tests/TestCases/Basic/Resources/Strings1.fr-FR.resx
new file mode 100644
index 000000000..581a8e96a
--- /dev/null
+++ b/tests/TestCases/Basic/Resources/Strings1.fr-FR.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="String3" xml:space="preserve">
+    <value>fr-FR: ccc</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/tests/TestCases/Basic/Resources/Strings1.fr.resx b/tests/TestCases/Basic/Resources/Strings1.fr.resx
new file mode 100644
index 000000000..34c3ebfd2
--- /dev/null
+++ b/tests/TestCases/Basic/Resources/Strings1.fr.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="String2" xml:space="preserve">
+    <value>fr: bbb</value>
+  </data>
+  <data name="String3" xml:space="preserve">
+    <value>fr: ccc</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/tests/TestCases/Basic/Resources/Strings1.resx b/tests/TestCases/Basic/Resources/Strings1.resx
new file mode 100644
index 000000000..f11281dbb
--- /dev/null
+++ b/tests/TestCases/Basic/Resources/Strings1.resx
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="String1" xml:space="preserve">
+    <value>neutral: aaa</value>
+    <comment>This is a string</comment>
+  </data>
+  <data name="String2" xml:space="preserve">
+    <value>neutral: bbb</value>
+  </data>
+  <data name="String3" xml:space="preserve">
+    <value>neutral: ccc</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/tests/TestCases/Basic/Resources/Strings2.resx b/tests/TestCases/Basic/Resources/Strings2.resx
new file mode 100644
index 000000000..6208df33d
--- /dev/null
+++ b/tests/TestCases/Basic/Resources/Strings2.resx
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="String1" xml:space="preserve">
+    <value>s2</value>
+  </data>
+  <data name="String2" xml:space="preserve">
+    <value>1234</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/tests/TestCases/Basic/Simple/Baseline.txt b/tests/TestCases/Basic/Simple/Baseline.txt
new file mode 100644
index 000000000..a753696fc
--- /dev/null
+++ b/tests/TestCases/Basic/Simple/Baseline.txt
@@ -0,0 +1,75 @@
+Type.registerNamespace('Basic');
+
+////////////////////////////////////////////////////////////////////////////////
+// Basic.EventArgs
+
+Basic.EventArgs = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Basic.Button
+
+Basic.Button = function(text) {
+    this._text = text;
+}
+Basic.Button.prototype = {
+    _text: null,
+    
+    add_click: function(value) {
+        this.__click = ss.Delegate.combine(this.__click, value);
+    },
+    remove_click: function(value) {
+        this.__click = ss.Delegate.remove(this.__click, value);
+    },
+    
+    __click: null,
+    
+    get_text: function() {
+        return this._text;
+    },
+    
+    performClick: function() {
+        if (this.__click != null) {
+            this.__click(this, Basic.EventArgs.Empty);
+        }
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Basic.App
+
+Basic.App = function() {
+    this._btn1 = new Basic.Button('OK');
+    this._btn1.add_click(ss.Delegate.create(this, this.onClickButton));
+    this._btn1.add_click(ss.Delegate.create(this, this.onClickButtonDup));
+    this._btn2 = new Basic.Button('Cancel');
+    this._btn2.add_click(ss.Delegate.create(this, this.onClickButton));
+}
+Basic.App.main = function(args) {
+    var theApp = new Basic.App();
+    theApp._btn1.performClick();
+    theApp._btn2.performClick();
+}
+Basic.App.prototype = {
+    _btn1: null,
+    _btn2: null,
+    
+    echo: function(s) {
+    },
+    
+    onClickButton: function(sender, e) {
+        this.echo((sender).get_text() + ' was clicked!');
+    },
+    
+    onClickButtonDup: function(sender, e) {
+        this.echo((sender).get_text() + ' was clicked as well!');
+    }
+}
+
+
+Basic.EventArgs.registerClass('Basic.EventArgs');
+Basic.Button.registerClass('Basic.Button');
+Basic.App.registerClass('Basic.App');
+Basic.EventArgs.Empty = new Basic.EventArgs();
diff --git a/tests/TestCases/Basic/Simple/Code.cs b/tests/TestCases/Basic/Simple/Code.cs
new file mode 100644
index 000000000..07c6d7733
--- /dev/null
+++ b/tests/TestCases/Basic/Simple/Code.cs
@@ -0,0 +1,75 @@
+// Code.cs
+//
+
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("basic")]
+
+namespace Basic {
+
+    public class EventArgs {
+
+        [PreserveCase]
+        public static readonly EventArgs Empty = new EventArgs();
+    }
+
+    public delegate void EventHandler(object sender, EventArgs e);
+
+    public class Button {
+
+        private string _text;
+
+        public event EventHandler click;
+
+        public Button(string text) {
+            _text = text;
+        }
+
+        public string text {
+            get {
+                return _text;
+            }
+        }
+
+        public void performClick() {
+            if (click != null) {
+                click(this, EventArgs.Empty);
+            }
+        }
+    }
+
+    public class App {
+
+        private Button _btn1;
+        private Button _btn2;
+
+        public App() {
+            _btn1 = new Button("OK");
+            _btn1.click += new EventHandler(this.onClickButton);
+            _btn1.click += new EventHandler(this.onClickButtonDup);
+
+            _btn2 = new Button("Cancel");
+            _btn2.click += new EventHandler(this.onClickButton);
+        }
+
+        private void Echo(string s) {
+        }
+
+        private void onClickButton(object sender, EventArgs e) {
+            Echo(((Button)sender).text + " was clicked!");
+        }
+
+        private void onClickButtonDup(object sender, EventArgs e) {
+            Echo(((Button)sender).text + " was clicked as well!");
+        }
+
+        public static void Main(Dictionary args) {
+            App theApp = new App();
+
+            theApp._btn1.performClick();
+            theApp._btn2.performClick();
+        }
+    }
+}
diff --git a/tests/TestCases/Basic/Template/Baseline.txt b/tests/TestCases/Basic/Template/Baseline.txt
new file mode 100644
index 000000000..c844360cb
--- /dev/null
+++ b/tests/TestCases/Basic/Template/Baseline.txt
@@ -0,0 +1,22 @@
+//! Test.js
+
+alert('some static script');
+
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function test_App() {
+    var e = document.body;
+}
+
+
+test.App.registerClass('test.App');
+
+alert('debug');
+
+ss.checkScripts('test', 'core');
+
+//! Copyright (c) 2007
+ 
diff --git a/tests/TestCases/Basic/Template/Code.cs b/tests/TestCases/Basic/Template/Code.cs
new file mode 100644
index 000000000..c877fcbc1
--- /dev/null
+++ b/tests/TestCases/Basic/Template/Code.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace BasicTests {
+
+    public class App {
+
+        public App() {
+            Element e = Document.Body;
+        }
+    }
+}
diff --git a/tests/TestCases/Basic/Template/Static.js b/tests/TestCases/Basic/Template/Static.js
new file mode 100644
index 000000000..b977931eb
--- /dev/null
+++ b/tests/TestCases/Basic/Template/Static.js
@@ -0,0 +1 @@
+alert('some static script');
diff --git a/tests/TestCases/Basic/Template/Template.js b/tests/TestCases/Basic/Template/Template.js
new file mode 100644
index 000000000..feaaa3e73
--- /dev/null
+++ b/tests/TestCases/Basic/Template/Template.js
@@ -0,0 +1,15 @@
+//! Test.js
+
+#include "Static.js"
+#include[as-is] "%code%"
+
+#if DEBUG
+alert('debug');
+#endif
+
+#if DEBUG
+ss.checkScripts('#= Name ##', '#= ExecutionDependencies ##');
+#endif
+
+//! Copyright (c) 2007
+ 
\ No newline at end of file
diff --git a/tests/TestCases/Basic/UnitTest/Code.cs b/tests/TestCases/Basic/UnitTest/Code.cs
new file mode 100644
index 000000000..2f975d647
--- /dev/null
+++ b/tests/TestCases/Basic/UnitTest/Code.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Diagnostics;
+using System.Testing;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace BasicTests {
+
+    public class PublicClass {
+
+        public string Format(int i) { return "0"; }
+        public int Parse(string s) { return 0; }
+    }
+
+    internal class InternalClass {
+
+        public string Format(int i) { return null; }
+        public int Parse(string s) { return 0; }
+    }
+}
+
+namespace BasicTests.Tests {
+
+    internal sealed class PublicTests : TestClass {
+
+        public void TestFormat() {
+            Assert.ExpectAsserts(1);
+
+            PublicClass testee = new PublicClass();
+            string s = testee.Format(0);
+            Assert.AreEqual(s, "0", "Expected '0' for result.");
+        }
+    }
+
+    internal sealed class InternalTests : TestClass {
+
+        private Date _startTime;
+        private Date _endTime;
+
+        public void TestFormat() {
+            Assert.ExpectAsserts(1);
+
+            InternalClass testee = new InternalClass();
+            string s = testee.Format(0);
+            Assert.AreEqual(s, "0", "Expected '0' for result.");
+        }
+
+        public void TestParse() {
+            Assert.ExpectAsserts(1);
+
+            InternalClass testee = new InternalClass();
+            int i = testee.Parse("0");
+            Assert.AreEqual(i, 0, "Expected 0 for result.");
+        }
+
+        public override void Setup() {
+            _startTime = Date.Now;
+        }
+
+        public override void Cleanup() {
+            _endTime = Date.Now;
+        }
+    }
+}
diff --git a/tests/TestCases/Basic/UnitTest/NonTestBaseline.txt b/tests/TestCases/Basic/UnitTest/NonTestBaseline.txt
new file mode 100644
index 000000000..8c92ee524
--- /dev/null
+++ b/tests/TestCases/Basic/UnitTest/NonTestBaseline.txt
@@ -0,0 +1,38 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.PublicClass
+
+test.PublicClass = function() {
+}
+test.PublicClass.prototype = {
+    
+    format: function(i) {
+        return '0';
+    },
+    
+    parse: function(s) {
+        return 0;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.InternalClass
+
+test.InternalClass = function() {
+}
+test.InternalClass.prototype = {
+    
+    format: function(i) {
+        return null;
+    },
+    
+    parse: function(s) {
+        return 0;
+    }
+}
+
+
+test.PublicClass.registerClass('test.PublicClass');
+test.InternalClass.registerClass('test.InternalClass');
diff --git a/tests/TestCases/Basic/UnitTest/TestBaseline.txt b/tests/TestCases/Basic/UnitTest/TestBaseline.txt
new file mode 100644
index 000000000..97e7b1d57
--- /dev/null
+++ b/tests/TestCases/Basic/UnitTest/TestBaseline.txt
@@ -0,0 +1,122 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.PublicClass
+
+test.PublicClass = function() {
+}
+test.PublicClass.prototype = {
+    
+    format: function(i) {
+        return '0';
+    },
+    
+    parse: function(s) {
+        return 0;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.InternalClass
+
+test.InternalClass = function() {
+}
+test.InternalClass.prototype = {
+    
+    format: function(i) {
+        return null;
+    },
+    
+    parse: function(s) {
+        return 0;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.PublicTests
+
+test.PublicTests = function() {
+    test.PublicTests.initializeBase(this);
+}
+test.PublicTests.prototype = {
+    
+    testFormat: function() {
+        QUnit.expect(1);
+        var testee = new test.PublicClass();
+        var s = testee.format(0);
+        QUnit.equal(s, '0', "Expected '0' for result.");
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.InternalTests
+
+test.InternalTests = function() {
+    test.InternalTests.initializeBase(this);
+}
+test.InternalTests.prototype = {
+    _startTime: null,
+    _endTime: null,
+    
+    testFormat: function() {
+        QUnit.expect(1);
+        var testee = new test.InternalClass();
+        var s = testee.format(0);
+        QUnit.equal(s, '0', "Expected '0' for result.");
+    },
+    
+    testParse: function() {
+        QUnit.expect(1);
+        var testee = new test.InternalClass();
+        var i = testee.parse('0');
+        QUnit.equal(i, 0, 'Expected 0 for result.');
+    },
+    
+    setup: function() {
+        this._startTime = Date.get_now();
+    },
+    
+    cleanup: function() {
+        this._endTime = Date.get_now();
+    }
+}
+
+
+test.PublicClass.registerClass('test.PublicClass');
+test.InternalClass.registerClass('test.InternalClass');
+test.PublicTests.registerClass('test.PublicTests');
+test.InternalTests.registerClass('test.InternalTests');
+
+module('PublicTests', {
+    setup: function() {
+        this.instance = new test.PublicTests();
+    },
+    teardown: function() {
+        delete this.instance;
+    }
+});
+
+test('testFormat', function() {
+    this.instance.testFormat();
+});
+
+module('InternalTests', {
+    setup: function() {
+        this.instance = new test.InternalTests();
+        this.instance.setup();
+    },
+    teardown: function() {
+        this.instance.cleanup();
+        delete this.instance;
+    }
+});
+
+test('testFormat', function() {
+    this.instance.testFormat();
+});
+test('testParse', function() {
+    this.instance.testParse();
+});
diff --git a/tests/TestCases/Expression/AnonymousMethods/Baseline.txt b/tests/TestCases/Expression/AnonymousMethods/Baseline.txt
new file mode 100644
index 000000000..c1f3ea93c
--- /dev/null
+++ b/tests/TestCases/Expression/AnonymousMethods/Baseline.txt
@@ -0,0 +1,59 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.SomeClass
+
+test.SomeClass = function(cb) {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Test
+
+test.Test = function() {
+}
+test.Test.main = function(args) {
+    var o = {};
+    var name;
+    test.Test.doStuffStatic(o, function(i, s, b) {
+        name = s;
+    });
+}
+test.Test.doStuffStatic = function(o, callback) {
+}
+test.Test.prototype = {
+    _n: 0,
+    
+    AAA: function() {
+        var o = {};
+        this.doStuff(o, ss.Delegate.create(this, function(i, s, b) {
+            this._n = i;
+        }));
+        var s = new test.SomeClass(function() {
+        });
+        for (var i = 0; i < 10; i++) {
+            var foo;
+            this.doStuff(o, function(i, s, b) {
+                foo = i + s;
+            });
+            this.doStuff(o, ss.Delegate.create(this, function(i, s, b) {
+                this._n += i;
+            }));
+            test.Test.doStuffStatic(o, function() {
+            });
+            test.Test.doStuffStatic(o, ss.Delegate.create(this, function() {
+                this._n++;
+            }));
+        }
+        var s2 = new test.SomeClass(ss.Delegate.create(this, function() {
+            var numbers = [ this._n ];
+        }));
+    },
+    
+    doStuff: function(o, callback) {
+    }
+}
+
+
+test.SomeClass.registerClass('test.SomeClass');
+test.Test.registerClass('test.Test');
diff --git a/tests/TestCases/Expression/AnonymousMethods/Code.cs b/tests/TestCases/Expression/AnonymousMethods/Code.cs
new file mode 100644
index 000000000..a66915d12
--- /dev/null
+++ b/tests/TestCases/Expression/AnonymousMethods/Code.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public delegate void Foo(int i, string s, bool b);
+
+    public delegate void Callback();
+
+    public class SomeClass {
+
+        public SomeClass(Callback cb) {
+        }
+    }
+
+    public class Test {
+
+        private int _n;
+
+        public static void Main(string[] args) {
+            object o = new object();
+            string name;
+
+            DoStuffStatic(o, delegate(int i, string s, bool b) {
+                                 name = s;
+                             });
+        }
+
+        public void AAA() {
+            object o = new object();
+            DoStuff(o, delegate(int i, string s, bool b) {
+                   _n = i;
+               });
+
+            SomeClass s = new SomeClass(delegate { });
+
+            for (int i = 0; i < 10; i++) {
+                object foo;
+
+                DoStuff(o, delegate(int i, string s, bool b) {
+                        foo = i + s;
+                    });
+                DoStuff(o, delegate(int i, string s, bool b) {
+                        _n += i;
+                    });
+                DoStuffStatic(o, delegate { });
+                DoStuffStatic(o, delegate { _n++; });
+            }
+
+            SomeClass s2 = new SomeClass(delegate {
+               int[] numbers = new int[] { _n };
+            });
+        }
+
+        public static void DoStuffStatic(object o, Foo callback) {
+        }
+
+        public void DoStuff(object o, Foo callback) {
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Arguments/Baseline.txt b/tests/TestCases/Expression/Arguments/Baseline.txt
new file mode 100644
index 000000000..fc9ea7db0
--- /dev/null
+++ b/tests/TestCases/Expression/Arguments/Baseline.txt
@@ -0,0 +1,18 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var count = arguments.length;
+        var value = arguments[0];
+        var items = Array.toArray(arguments);
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/Arguments/Code.cs b/tests/TestCases/Expression/Arguments/Code.cs
new file mode 100644
index 000000000..7e8573e19
--- /dev/null
+++ b/tests/TestCases/Expression/Arguments/Code.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class App {
+
+        public void Test(int arg) {
+            int count = Arguments.Length;
+            int value = (int)Arguments.GetArgument(0);
+            object[] items = Arguments.ToArray();
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Base/Baseline.txt b/tests/TestCases/Expression/Base/Baseline.txt
new file mode 100644
index 000000000..c2efec3aa
--- /dev/null
+++ b/tests/TestCases/Expression/Base/Baseline.txt
@@ -0,0 +1,39 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Foo
+
+test.Foo = function(i, j) {
+}
+test.Foo.prototype = {
+    
+    toString: function() {
+        return 'Foo';
+    },
+    
+    sum: function(i) {
+        return 0;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Bar
+
+test.Bar = function(i, j, f) {
+    test.Bar.initializeBase(this, [ i, j ]);
+}
+test.Bar.prototype = {
+    
+    sum: function() {
+        return test.Bar.callBaseMethod(this, 'sum', [ 1 ]) + 1;
+    },
+    
+    toString: function() {
+        return test.Bar.callBaseMethod(this, 'toString') + ' -> Bar';
+    }
+}
+
+
+test.Foo.registerClass('test.Foo');
+test.Bar.registerClass('test.Bar', test.Foo);
diff --git a/tests/TestCases/Expression/Base/Code.cs b/tests/TestCases/Expression/Base/Code.cs
new file mode 100644
index 000000000..15190ff4d
--- /dev/null
+++ b/tests/TestCases/Expression/Base/Code.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class Foo {
+
+        public Foo(int i, int j) {
+        }
+
+        public override string ToString() {
+            return "Foo";
+        }
+
+        public virtual int Sum(int i) {
+            return 0;
+        }
+    }
+
+    public class Bar : Foo {
+
+        public Bar(int i, int j, Foo f) : base(i, j) {
+        }
+
+        public override int Sum() {
+            return base.Sum(1) + 1;
+        }
+
+        public override string ToString() {
+            return base.ToString() + " -> Bar";
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Binary/Baseline.txt b/tests/TestCases/Expression/Binary/Baseline.txt
new file mode 100644
index 000000000..bad74ddf1
--- /dev/null
+++ b/tests/TestCases/Expression/Binary/Baseline.txt
@@ -0,0 +1,121 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Data
+
+test.Data = function() {
+}
+test.Data.prototype = {
+    _value: 0,
+    
+    get_value: function() {
+        return this._value;
+    },
+    set_value: function(value) {
+        this._value = value;
+        return value;
+    },
+    
+    get_flag: function() {
+        return true;
+    },
+    set_flag: function(value) {
+        return value;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    get_foo: function() {
+        return 0;
+    },
+    set_foo: function(value) {
+        return value;
+    },
+    
+    get_bar: function() {
+        return 0;
+    },
+    set_bar: function(value) {
+        return value;
+    },
+    
+    get_data: function() {
+        return new test.Data();
+    },
+    set_data: function(value) {
+        return value;
+    },
+    
+    get_flag1: function() {
+        return this.get_data().get_flag();
+    },
+    
+    get_flag2: function() {
+        return test.Data.staticFlag;
+    },
+    
+    test: function(arg1, arg2) {
+        var sum = arg1 + arg2;
+        sum += arg2 * -1;
+        sum = arg1 - arg2;
+        sum = arg1 * arg2;
+        sum = arg1 / arg2;
+        sum = arg1 ^ arg2;
+        sum = arg1 >> 2;
+        sum *= arg2;
+        sum ^= arg2;
+        var f = arg1;
+        var s = (f + 1).toExponential();
+        var len = (10 + s).length;
+        var b = (f < 10);
+        sum = arg1 + (arg2 + 1) * 10;
+        sum = arg1 + (arg2 + ~arg1) * (arg1 - 10);
+        var b2 = Type.canCast(sum, Number);
+        var o = Type.safeCast(b, ss.IDisposable);
+        this.set_foo(this.get_foo() + 10);
+        this.set_foo(this.get_foo() - this.get_bar());
+        sum = sum << 1;
+        sum <<= 1;
+        var xyz;
+        var abc;
+        abc = xyz << 1;
+        abc = xyz >>> 2;
+        abc <<= 1;
+        xyz >>>= 1;
+        var d = new test.Data();
+        d.set_value(d.get_value() + 5);
+        d.set_flag((d.get_flag() | true) === 1);
+        var o1 = null || {};
+        var s2 = (10).toString();
+        s2 = (100).toString();
+        s2 = true.toString();
+        s2 = (10.1).toString();
+        s2 = 'aaa';
+    },
+    
+    bitwiseBooleans: function() {
+        var a = (true & false) === 1;
+        var b = (true | false) === 1;
+        var c = (true ^ false) === 1;
+        a = (a & true) === 1;
+        b = (b | true) === 1;
+        c = (c ^ true) === 1;
+        a = (a | (a || a)) === 1;
+        var d = new test.Data();
+        d.set_flag((d.get_flag() & true) === 1);
+        d.set_flag((d.get_flag() | true) === 1);
+        d.set_flag((d.get_flag() ^ true) === 1);
+    }
+}
+
+
+test.Data.registerClass('test.Data');
+test.App.registerClass('test.App');
+test.Data.staticFlag = false;
diff --git a/tests/TestCases/Expression/Binary/Code.cs b/tests/TestCases/Expression/Binary/Code.cs
new file mode 100644
index 000000000..486d4c8e0
--- /dev/null
+++ b/tests/TestCases/Expression/Binary/Code.cs
@@ -0,0 +1,105 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class Data {
+        private int _value;
+
+        public int Value {
+            get { return _value; }
+            set { _value = value; }
+        }
+
+        public bool Flag {
+            get { return true; }
+            set { }
+        }
+
+        public static bool StaticFlag = false;
+    }
+
+    public class App {
+    
+        private const int CValue = 100;
+
+        private int Foo { get { return 0; } set { } }
+        private int Bar { get { return 0; } set { } }
+
+        public Data Data { get { return new Data(); } set { } }
+
+        public bool Flag1 { get { return Data.Flag; } }
+        public bool Flag2 { get { return Data.StaticFlag; } }
+
+        public void Test(int arg1, int arg2) {
+            int sum = arg1 + arg2;
+            sum += arg2 * -1;
+            sum = arg1 - arg2;
+            sum = arg1 * arg2;
+            sum = arg1 / arg2;
+            sum = arg1 ^ arg2;
+
+            sum = arg1 >> 2;
+            sum *= arg2;
+            sum ^= arg2;
+
+            float f = arg1;
+            string s = (f + 1).ToExponential();
+
+            int len = (10 + s).Length;
+
+            bool b = (f < 10);
+
+            sum = arg1 + (arg2 + 1) * 10;
+            sum = arg1 + (arg2 + ~arg1) * (arg1 - 10);
+
+            bool b2 = sum is int;
+
+            object o = b as IDisposable;
+
+            Foo += 10;
+            Foo -= Bar;
+
+            sum = sum << 1;
+            sum <<= 1;
+
+            uint xyz;
+            uint abc;
+
+            abc = xyz << 1;
+            abc = xyz >> 2;
+            abc <<= 1;
+            xyz >>= 1;
+
+            Data d = new Data();
+            d.Value += 5;
+            d.Flag |= true;
+
+            object o1 = null ?? new object();
+            
+            string s2 = 10.ToString();
+            s2 = CValue.ToString();
+            s2 = true.ToString();
+            s2 = 10.1.ToString();
+            s2 = "aaa".ToString();
+        }
+
+        public void BitwiseBooleans() {
+            bool a = true & false;
+            bool b = true | false;
+            bool c = true ^ false;
+            a &= true;
+            b |= true;
+            c ^= true;
+            a |= a || a;
+
+            Data d = new Data();
+            d.Flag &= true;
+            d.Flag |= true;
+            d.Flag ^= true;
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Cast/Baseline.txt b/tests/TestCases/Expression/Cast/Baseline.txt
new file mode 100644
index 000000000..2467d09dc
--- /dev/null
+++ b/tests/TestCases/Expression/Cast/Baseline.txt
@@ -0,0 +1,37 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var f = arg / 2;
+        var d = 0.25;
+        var i = parseInt(f);
+        var j = parseInt(d);
+        var f2 = d;
+        var a = 1;
+        var b = 2;
+        var n1 = a / b;
+        var n2 = parseInt((a / b));
+        var d2 = a / b;
+        var action = function() {
+        };
+        var secondAction = Type.safeCast(action, Function);
+        if (Type.canCast(action, Function)) {
+        }
+        var cb = Type.safeCast(action, Function);
+        if (Type.canCast(action, Function)) {
+            cb = action;
+        }
+        var action2 = Type.safeCast(action, Function);
+        if (action2 != null) {
+        }
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/Cast/Code.cs b/tests/TestCases/Expression/Cast/Code.cs
new file mode 100644
index 000000000..30ac3e5d3
--- /dev/null
+++ b/tests/TestCases/Expression/Cast/Code.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public delegate void MyCallback();
+
+    public class App {
+
+        public void Test(int arg) {
+            float f = arg / 2f;
+            double d = 0.25;
+
+            int i = (int)f;
+            int j = (int)d;
+
+            float f2 = (float)d;
+
+            int a = 1;
+            int b = 2;
+
+            int n1 = a / b;
+            int n2 = (int)(a / b);
+            double d2 = a / b;
+
+            Action action = (Action)delegate() {
+            };
+            Action secondAction = action as Action;
+            if (action is Action) {
+            }
+
+            MyCallback cb = action as MyCallback;
+            if (action is MyCallback) {
+                cb = (MyCallback)action;
+            }
+            
+            Action<bool> action2 = action as Action<bool>;
+            if (action2 != null) {
+            }
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Conditional/Baseline.txt b/tests/TestCases/Expression/Conditional/Baseline.txt
new file mode 100644
index 000000000..e37cbb97b
--- /dev/null
+++ b/tests/TestCases/Expression/Conditional/Baseline.txt
@@ -0,0 +1,21 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var b = (!arg) ? true : false;
+        b = (!arg) ? true : false;
+        var n = (!arg) ? --arg : ++arg;
+        n = (!arg) ? ((b) ? 10 : (arg - 1)) : 100;
+        var s = (n > 50) ? 'xyz' : 'abc';
+        var l = (s != null) ? s.length : 'Hello'.length;
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/Conditional/Code.cs b/tests/TestCases/Expression/Conditional/Code.cs
new file mode 100644
index 000000000..3a70a591b
--- /dev/null
+++ b/tests/TestCases/Expression/Conditional/Code.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class App {
+
+        public void Test(int arg) {
+            bool b = (arg == 0) ? true : false;
+            b = arg == 0 ? true : false;
+
+            int n = (arg == 0) ? --arg : ++arg;
+            n = (arg == 0) ? (b ? 10 : (arg - 1)) : 100;
+
+            string s = (n > 50) ? "xyz" : "abc";
+
+            int l = (s != null) ? s.Length : "Hello".Length;
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Delegates/Baseline.txt b/tests/TestCases/Expression/Delegates/Baseline.txt
new file mode 100644
index 000000000..55cd0eb8b
--- /dev/null
+++ b/tests/TestCases/Expression/Delegates/Baseline.txt
@@ -0,0 +1,54 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.EventArgs
+
+test.EventArgs = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.SomeClass
+
+test.SomeClass = function(handler) {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Test
+
+test.Test = function() {
+    this._handler = ss.Delegate.create(this, this.onEvent);
+    this._handler = ss.Delegate.create(this, this.onEvent);
+    this._handler = ss.Delegate.create(this, this.onEvent);
+    this._handler = test.Test2.onGlobalEvent;
+    var s1 = new test.SomeClass(ss.Delegate.create(this, this.onEvent));
+    var s2 = new test.SomeClass(this._handler);
+}
+test.Test.prototype = {
+    _handler: null,
+    
+    doStuff: function() {
+        if (this._handler != null) {
+            this._handler(this, null);
+        }
+    },
+    
+    onEvent: function(sender, e) {
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Test2
+
+test.Test2 = function() {
+}
+test.Test2.onGlobalEvent = function(sender, e) {
+}
+
+
+test.EventArgs.registerClass('test.EventArgs');
+test.SomeClass.registerClass('test.SomeClass');
+test.Test.registerClass('test.Test');
+test.Test2.registerClass('test.Test2');
diff --git a/tests/TestCases/Expression/Delegates/Code.cs b/tests/TestCases/Expression/Delegates/Code.cs
new file mode 100644
index 000000000..0eaf59565
--- /dev/null
+++ b/tests/TestCases/Expression/Delegates/Code.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class EventArgs {
+    }
+
+    public delegate void Foo();
+
+    public delegate void EventHandler(object sender, EventArgs e);
+
+    public class SomeClass {
+
+        public SomeClass(EventHandler handler) {
+        }
+    }
+
+    public class Test {
+
+        private EventHandler _handler;
+
+        public Test() {
+            _handler = OnEvent;
+            _handler = new EventHandler(OnEvent);
+            _handler = new EventHandler(this.OnEvent);
+            _handler = new EventHandler(Test2.OnGlobalEvent);
+
+            SomeClass s1 = new SomeClass(OnEvent);
+            SomeClass s2 = new SomeClass(_handler);
+        }
+
+        public void DoStuff() {
+            if (_handler != null) {
+                _handler(this, null);
+            }
+        }
+
+        public void OnEvent(object sender, EventArgs e) {
+        }
+    }
+
+    public class Test2 {
+
+        public static void OnGlobalEvent(object sender, EventArgs e) {
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Dictionary/Baseline.txt b/tests/TestCases/Expression/Dictionary/Baseline.txt
new file mode 100644
index 000000000..02ed22509
--- /dev/null
+++ b/tests/TestCases/Expression/Dictionary/Baseline.txt
@@ -0,0 +1,51 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    getData: function() {
+        return null;
+    },
+    
+    getData2: function() {
+        return null;
+    },
+    
+    test: function(arg) {
+        var dictionary1 = {};
+        var dictionary2 = { xyz: 1, abc: new test.App(), 'delete': 2, 'test.': 3, '\t': 4 };
+    },
+    
+    test2: function(arg) {
+        var dictionary1 = { aaa: 123, xyz: true };
+        var key = 'blah';
+        var c = Object.getKeyCount(dictionary1);
+        var c2 = Object.getKeyCount(this.getData());
+        var b = Object.keyExists(dictionary1, 'aaa');
+        delete dictionary1.aaa;
+        delete dictionary1['Proxy-Connection'];
+        delete dictionary1[key];
+        Object.clearKeys(dictionary1);
+        var keys = Object.keys(dictionary1);
+    },
+    
+    test3: function(arg) {
+        var dictionary1 = { aaa: 123, xyz: true };
+        var key = 'blah';
+        var c = Object.getKeyCount(dictionary1);
+        var c2 = Object.getKeyCount(this.getData2());
+        var b = Object.keyExists(dictionary1, 'aaa');
+        delete dictionary1.aaa;
+        delete dictionary1['Proxy-Connection'];
+        delete dictionary1[key];
+        Object.clearKeys(dictionary1);
+        var keys = Object.keys(dictionary1);
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/Dictionary/Code.cs b/tests/TestCases/Expression/Dictionary/Code.cs
new file mode 100644
index 000000000..73551bfa5
--- /dev/null
+++ b/tests/TestCases/Expression/Dictionary/Code.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class App {
+
+        public Dictionary GetData() {
+            return null;
+        }
+
+        public Dictionary<string, int> GetData2() {
+            return null;
+        }
+
+        public void Test(int arg) {
+            Dictionary dictionary1 = new Dictionary();
+            Dictionary dictionary2 = new Dictionary("xyz", 1, "abc", new App(), "delete", 2, "test.", 3, "\t", 4);
+        }
+
+        public void Test2(int arg) {
+            Dictionary dictionary1 = new Dictionary("aaa", 123, "xyz", true);
+            string key = "blah";
+            int c = dictionary1.Count;
+
+            int c2 = GetData().Count;
+
+            bool b = dictionary1.ContainsKey("aaa");
+
+            dictionary1.Remove("aaa");
+            dictionary1.Remove("Proxy-Connection");
+            dictionary1.Remove(key);
+
+            dictionary1.Clear();
+            
+            string[] keys = dictionary1.Keys;
+        }
+
+        public void Test3(int arg) {
+            Dictionary<string, int> dictionary1 = new Dictionary<string, int>("aaa", 123, "xyz", true);
+            string key = "blah";
+            int c = dictionary1.Count;
+
+            int c2 = GetData2().Count;
+
+            bool b = dictionary1.ContainsKey("aaa");
+
+            dictionary1.Remove("aaa");
+            dictionary1.Remove("Proxy-Connection");
+            dictionary1.Remove(key);
+
+            dictionary1.Clear();
+            
+            string[] keys = dictionary1.Keys;
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/EnumToString/Code1.cs b/tests/TestCases/Expression/EnumToString/Code1.cs
new file mode 100644
index 000000000..a420c7245
--- /dev/null
+++ b/tests/TestCases/Expression/EnumToString/Code1.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    enum Mode { A = 0, B = 1 }
+    
+    public enum Color { Red = 1, Green = 2, Blue = 3 }
+
+    [NamedValues]
+    public enum State {
+        Starting = 1,
+        Running = 2,
+        Completed = 3
+    }
+
+    [Flags]
+    public enum Types {
+        None = 0,
+        Type1 = 1,
+        Type2 = 2,
+        Type3 = 4
+    }
+
+    public class App {
+
+        public void Test(int arg) {
+            string s1 = Mode.A.ToString();
+            string s2 = Color.Green.ToString();
+            string s3 = State.Starting.ToString();
+            string s4 = Types.None.ToString();
+        }
+
+        private void Display(Mode m, Color c, State s, Types t) {
+            string mstr = m.ToString();
+            string cstr = c.ToString();
+            string sstr = s.ToString();
+            string tstr = t.ToString();
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/EnumToString/Code2.cs b/tests/TestCases/Expression/EnumToString/Code2.cs
new file mode 100644
index 000000000..a6c7de2ff
--- /dev/null
+++ b/tests/TestCases/Expression/EnumToString/Code2.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    enum Mode { A = 0, B = 1 }
+    
+    enum Color { Red = 1, Green = 2, Blue = 3 }
+
+    [NamedValues]
+    enum State {
+        Starting = 1,
+        Running = 2,
+        Completed = 3
+    }
+
+    [Flags]
+    enum Types {
+        None = 0,
+        Type1 = 1,
+        Type2 = 2,
+        Type3 = 4
+    }
+
+    public class App {
+
+        public void Test(int arg) {
+            string s1 = Mode.A.ToString();
+            string s2 = Color.Green.ToString();
+            string s3 = State.Starting.ToString();
+            string s4 = Types.None.ToString();
+        }
+
+        private void Display(Mode m, Color c, State s, Types t) {
+            string mstr = m.ToString();
+            string cstr = c.ToString();
+            string sstr = s.ToString();
+            string tstr = t.ToString();
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/EnumToString/MinBaseline.txt b/tests/TestCases/Expression/EnumToString/MinBaseline.txt
new file mode 100644
index 000000000..1c048ddc4
--- /dev/null
+++ b/tests/TestCases/Expression/EnumToString/MinBaseline.txt
@@ -0,0 +1,23 @@
+Type.registerNamespace('test');
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var $0 = (0).toString();
+        var $1 = (2).toString();
+        var $2 = '$0';
+        var $3 = (0).toString();
+    },
+    
+    $0: function($p0, $p1, $p2, $p3) {
+        var $0 = $p0.toString();
+        var $1 = $p1.toString();
+        var $2 = $p2;
+        var $3 = $p3.toString();
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/EnumToString/NormalBaseline.txt b/tests/TestCases/Expression/EnumToString/NormalBaseline.txt
new file mode 100644
index 000000000..2126c3d9f
--- /dev/null
+++ b/tests/TestCases/Expression/EnumToString/NormalBaseline.txt
@@ -0,0 +1,63 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Color
+
+test.Color = function() { };
+test.Color.prototype = {
+    red: 1, 
+    green: 2, 
+    blue: 3
+}
+test.Color.registerEnum('test.Color', false);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.State
+
+test.State = function() { };
+test.State.prototype = {
+    starting: 'starting', 
+    running: 'running', 
+    completed: 'completed'
+}
+test.State.registerEnum('test.State', false);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Types
+
+test.Types = function() { };
+test.Types.prototype = {
+    none: 0, 
+    type1: 1, 
+    type2: 2, 
+    type3: 4
+}
+test.Types.registerEnum('test.Types', true);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var s1 = (0).toString();
+        var s2 = (2).toString();
+        var s3 = 'starting';
+        var s4 = (0).toString();
+    },
+    
+    display: function(m, c, s, t) {
+        var mstr = m.toString();
+        var cstr = c.toString();
+        var sstr = s;
+        var tstr = t.toString();
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/Events/Baseline.txt b/tests/TestCases/Expression/Events/Baseline.txt
new file mode 100644
index 000000000..be1954b23
--- /dev/null
+++ b/tests/TestCases/Expression/Events/Baseline.txt
@@ -0,0 +1,100 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.FooEventArgs
+
+test.FooEventArgs = function() {
+    test.FooEventArgs.initializeBase(this);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Button
+
+test.Button = function() {
+}
+test.Button.add_test = function(value) {
+    test.Button.__test = ss.Delegate.combine(test.Button.__test, value);
+}
+test.Button.remove_test = function(value) {
+    test.Button.__test = ss.Delegate.remove(test.Button.__test, value);
+}
+test.Button.prototype = {
+    _aaa: null,
+    _bbb: null,
+    
+    add_click: function(value) {
+        this.__click = ss.Delegate.combine(this.__click, value);
+    },
+    remove_click: function(value) {
+        this.__click = ss.Delegate.remove(this.__click, value);
+    },
+    
+    __click: null,
+    
+    add_aaa: function(value) {
+        if (this._aaa == null) {
+            this._aaa = value;
+        }
+        else {
+            this._aaa = ss.Delegate.combine(this._aaa, value);
+        }
+    },
+    remove_aaa: function(value) {
+        this._aaa = ss.Delegate.remove(this._aaa, value);
+    },
+    
+    add_bbb: function(value) {
+        if (this._bbb == null) {
+            this._bbb = value;
+        }
+        else {
+            this._bbb = ss.Delegate.combine(this._bbb, value);
+        }
+    },
+    remove_bbb: function(value) {
+        this._bbb = ss.Delegate.remove(this._bbb, value);
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+    this._btn.add_click(ss.Delegate.create(this, this.onClickButton));
+    this._btn.add_click(ss.Delegate.create(this, this.onClickButton));
+    this._btn.add_click(ss.Delegate.create(this, this.onClickButton));
+    this._btn.remove_click(ss.Delegate.create(this, this.onClickButton));
+    this._btn.remove_click(ss.Delegate.create(this, this.onClickButton));
+    this._btn.remove_click(ss.Delegate.create(this, this.onClickButton));
+    test.Button.add_test(test.App.onTestButton);
+    test.Button.add_test(test.App.onTestButton);
+    test.Button.add_test(test.App.onTestButton);
+    test.Button.remove_test(test.App.onTestButton);
+    test.Button.remove_test(test.App.onTestButton);
+    test.Button.remove_test(test.App.onTestButton);
+    this._btn.add_aaa(ss.Delegate.create(this, this.onAAAButton));
+    this._btn.add_aaa(ss.Delegate.create(this, this.onAAAButton));
+    this._btn.add_aaa(ss.Delegate.create(this, this.onAAAButton));
+    this._btn.remove_aaa(ss.Delegate.create(this, this.onAAAButton));
+    this._btn.remove_aaa(ss.Delegate.create(this, this.onAAAButton));
+    this._btn.remove_aaa(ss.Delegate.create(this, this.onAAAButton));
+}
+test.App.onTestButton = function(sender, e) {
+}
+test.App.prototype = {
+    _btn: null,
+    
+    onAAAButton: function(sender, e) {
+    },
+    
+    onClickButton: function(sender, e) {
+    }
+}
+
+
+test.FooEventArgs.registerClass('test.FooEventArgs', ss.EventArgs);
+test.Button.registerClass('test.Button');
+test.App.registerClass('test.App');
+test.Button.__test = null;
diff --git a/tests/TestCases/Expression/Events/Code.cs b/tests/TestCases/Expression/Events/Code.cs
new file mode 100644
index 000000000..0c439c4c6
--- /dev/null
+++ b/tests/TestCases/Expression/Events/Code.cs
@@ -0,0 +1,90 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class FooEventArgs : EventArgs {
+    }
+
+    public class Button {
+
+        private EventHandler _aaa;
+        private EventHandler<FooEventArgs> _bbb;
+
+        public event EventHandler click;
+
+        public static event EventHandler test;
+
+        public event EventHandler aaa {
+            add {
+                if (_aaa == null) {
+                    _aaa = value;
+                }
+                else {
+                    _aaa = (EventHandler)Delegate.Combine(_aaa, value);
+                }
+            }
+            remove {
+                _aaa = (EventHandler)Delegate.Remove(_aaa, value);
+            }
+        }
+
+        public event EventHandler<FooEventArgs> bbb {
+            add {
+                if (_bbb == null) {
+                    _bbb = value;
+                }
+                else {
+                    _bbb = (EventHandler<FooEventArgs>)Delegate.Combine(_bbb, value);
+                }
+            }
+            remove {
+                _bbb = (EventHandler<FooEventArgs>)Delegate.Remove(_bbb, value);
+            }
+        }
+    }
+
+    public class App {
+
+        private Button _btn;
+
+        public App() {
+            _btn.click += OnClickButton;
+            _btn.click += new EventHandler(OnClickButton);
+            _btn.click += new EventHandler(this.OnClickButton);
+
+            _btn.click -= OnClickButton;
+            _btn.click -= new EventHandler(OnClickButton);
+            _btn.click -= new EventHandler(this.OnClickButton);
+
+            Button.test += OnTestButton;
+            Button.test += new EventHandler(OnTestButton);
+            Button.test += new EventHandler(App.OnTestButton);
+
+            Button.test -= OnTestButton;
+            Button.test -= new EventHandler(OnTestButton);
+            Button.test -= new EventHandler(App.OnTestButton);
+
+            _btn.aaa += OnAAAButton;
+            _btn.aaa += new EventHandler(OnAAAButton);
+            _btn.aaa += new EventHandler(this.OnAAAButton);
+
+            _btn.aaa -= OnAAAButton;
+            _btn.aaa -= new EventHandler(OnAAAButton);
+            _btn.aaa -= new EventHandler(this.OnAAAButton);
+
+        }
+
+        private void OnAAAButton(object sender, EventArgs e) {
+        }
+
+        private void OnClickButton(object sender, EventArgs e) {
+        }
+
+        private static void OnTestButton(object sender, EventArgs e) {
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Generics/Baseline.txt b/tests/TestCases/Expression/Generics/Baseline.txt
new file mode 100644
index 000000000..dfc6b78b0
--- /dev/null
+++ b/tests/TestCases/Expression/Generics/Baseline.txt
@@ -0,0 +1,50 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Foo
+
+test.Foo = function() {
+    this._numbers = [];
+    var s = this._numbers[10].format('{0}');
+    var s2 = this._numbers.getEnumerator().current.format('{0}');
+    var s3 = this._numbers.reduce(function(accumulated, item) {
+        return accumulated + item;
+    }, 0).format('{0}');
+    var s4 = encodeURIComponent(this._func(10));
+    var f2 = this._func;
+    f2(11).trim();
+    var d = {};
+    var s5 = $.extend(d, d)['abc'].format('{0}');
+    var keys = Object.getKeyCount(d);
+    var b = Object.keyExists(d, 'abc');
+    delete d.abc;
+    var $dict1 = d;
+    for (var $key2 in $dict1) {
+        var de = { key: $key2, value: $dict1[$key2] };
+    }
+    $.ajax('http://example.com').success(function(html) {
+        alert(html);
+    });
+    var json = '';
+    var f = JSON.parse(json).setup().run().cleanup();
+    var name = document.getElementById('nameTB').value;
+}
+test.Foo.prototype = {
+    _numbers: null,
+    _func: null,
+    
+    cleanup: function() {
+        return this;
+    },
+    
+    run: function() {
+        return this;
+    },
+    
+    setup: function() {
+        return this;
+    }
+}
+
+
+test.Foo.registerClass('test.Foo');
diff --git a/tests/TestCases/Expression/Generics/Code.cs b/tests/TestCases/Expression/Generics/Code.cs
new file mode 100644
index 000000000..df438a2a2
--- /dev/null
+++ b/tests/TestCases/Expression/Generics/Code.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.Html;
+using System.Runtime.CompilerServices;
+using System.Serialization;
+using jQueryApi;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class Foo {
+    
+        public List<int> _numbers;
+        public Func<int, string> _func;
+        
+        public Foo() {
+            _numbers = new List<int>();
+            
+            string s = _numbers[10].Format("{0}");
+            string s2 = _numbers.GetEnumerator().Current.Format("{0}");
+            string s3 = _numbers.Reduce<int>(delegate(int accumulated, int item) { return accumulated + item; }, 0).Format("{0}");
+            
+            string s4 = _func(10).EncodeUriComponent();
+            
+            Func<int, string> f2 = _func;
+            f2(11).Trim();
+            
+            Dictionary<string, int> d = new Dictionary<string, int>();
+            string s5 = jQuery.ExtendDictionary<string, int>(d, d)["abc"].Format("{0}");
+            int keys = d.Count;
+            bool b = d.ContainsKey("abc");
+            d.Remove("abc");
+            
+            foreach (KeyValuePair<string, int> de in d) {
+            }
+            
+            jQuery.AjaxRequest<string>("http://example.com").Success(delegate(string html) {
+                Window.Alert(html);
+            });
+            
+            string json = "";
+            Foo f = Json.ParseData<Foo>(json).Setup().Run().Cleanup();
+            
+            string name = Document.GetElementById("nameTB").As<InputElement>().Value;
+        }
+        
+        public Foo Cleanup() {
+            return this;
+        }
+        
+        public Foo Run() {
+            return this;
+        }
+        
+        public Foo Setup() {
+            return this;
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/GetType/Baseline.txt b/tests/TestCases/Expression/GetType/Baseline.txt
new file mode 100644
index 000000000..382bddf0c
--- /dev/null
+++ b/tests/TestCases/Expression/GetType/Baseline.txt
@@ -0,0 +1,22 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    get_foo: function() {
+        return 0;
+    },
+    
+    test: function(x) {
+        var t = Type.getInstanceType(x);
+        var t2 = Type.getInstanceType(x.toString());
+        var t3 = Type.getInstanceType(this.get_foo());
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/GetType/Code.cs b/tests/TestCases/Expression/GetType/Code.cs
new file mode 100644
index 000000000..3697cfa03
--- /dev/null
+++ b/tests/TestCases/Expression/GetType/Code.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class App {
+
+        private int Foo { get { return 0; } }
+
+        public void Test(object x) {
+            Type t = x.GetType();
+            Type t2 = x.ToString().GetType();
+            Type t3 = Foo.GetType();
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/GlobalMethods/Baseline.txt b/tests/TestCases/Expression/GlobalMethods/Baseline.txt
new file mode 100644
index 000000000..405080a19
--- /dev/null
+++ b/tests/TestCases/Expression/GlobalMethods/Baseline.txt
@@ -0,0 +1,25 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        eval('[ 1, 2 ]');
+        foo();
+        setTimeout(foo, 0);
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Util
+
+window.foo = function() {
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/GlobalMethods/Code.cs b/tests/TestCases/Expression/GlobalMethods/Code.cs
new file mode 100644
index 000000000..c6b5e47ba
--- /dev/null
+++ b/tests/TestCases/Expression/GlobalMethods/Code.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class App {
+
+        public void Test(int arg) {
+            Script.Eval("[ 1, 2 ]");
+            Util.Foo();
+            Script.SetTimeout(Util.Foo, 0);
+        }
+    }
+
+    [GlobalMethods]
+    public static class Util {
+
+        public static void Foo() {
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/InlineScript/Baseline.txt b/tests/TestCases/Expression/InlineScript/Baseline.txt
new file mode 100644
index 000000000..0de43d7db
--- /dev/null
+++ b/tests/TestCases/Expression/InlineScript/Baseline.txt
@@ -0,0 +1,21 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        arg + 1;
+        var i = arg + 1;
+        var j = arg + 1;
+        var k = arg + 1;
+        var a = 10;
+        alert(a + a);
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/InlineScript/Code.cs b/tests/TestCases/Expression/InlineScript/Code.cs
new file mode 100644
index 000000000..ccaee7a64
--- /dev/null
+++ b/tests/TestCases/Expression/InlineScript/Code.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class App {
+
+        private const string ScriptTemplate = "alert({0} + {1})";
+
+        public void Test(int arg) {
+            Script.Literal("arg + 1");
+
+            int i = (int)Script.Literal("arg + 1");
+            int j = (int)Script.Literal("{0} + 1", arg);
+            int k = (int)Script.Literal("{0} + {1}", arg, 1);
+
+            int a = 10;
+
+            Script.Literal(ScriptTemplate, a, a);
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/LateBound/Baseline.txt b/tests/TestCases/Expression/LateBound/Baseline.txt
new file mode 100644
index 000000000..8ade21051
--- /dev/null
+++ b/tests/TestCases/Expression/LateBound/Baseline.txt
@@ -0,0 +1,44 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var o;
+        var b;
+        o[arg]();
+        o.xyz();
+        o['Proxy-Connection']();
+        o.xyz(0);
+        o.xyz(0, arg);
+        b = (typeof(o[arg]) === 'function');
+        b = (typeof(o.xyz) === 'function');
+        b = (typeof(Object.xyz) === 'function');
+        o[arg] = 0;
+        o.abc = 0;
+        o['Proxy-Connection'] = 0;
+        var v = o[arg];
+        v = o.abc;
+        v = o['Proxy-Connection'];
+        b = (arg in o);
+        b = ('abc' in o);
+        b = ('abc' in Object);
+        delete o.xyz;
+        delete o['Proxy-Connection'];
+        delete o[arg];
+        var t = typeof(o);
+        if (typeof(o) === 'object') {
+        }
+        if ((typeof(o.execute) === 'function')) {
+        }
+        globalMethod();
+        globalMethod('xyz');
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/LateBound/Code.cs b/tests/TestCases/Expression/LateBound/Code.cs
new file mode 100644
index 000000000..adb7b25a7
--- /dev/null
+++ b/tests/TestCases/Expression/LateBound/Code.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class App {
+
+        public void Test(string arg) {
+            Object o;
+            bool b;
+
+            Script.InvokeMethod(o, arg);
+            Script.InvokeMethod(o, "xyz");
+            Script.InvokeMethod(o, "Proxy-Connection");
+            Script.InvokeMethod(o, "xyz", 0);
+            Script.InvokeMethod(o, "xyz", 0, arg);
+
+            b = Script.HasMethod(o, arg);
+            b = Script.HasMethod(o, "xyz");
+            b = Script.HasMethod(typeof(Object), "xyz");            
+
+            Script.SetField(o, arg, 0);
+            Script.SetField(o, "abc", 0);
+            Script.SetField(o, "Proxy-Connection", 0);
+
+            object v = Script.GetField(o, arg);
+            v = Script.GetField(o, "abc");
+            v = Script.GetField(o, "Proxy-Connection");
+
+            b = Script.HasField(o, arg);
+            b = Script.HasField(o, "abc");
+            b = Script.HasField(typeof(Object), "abc");
+
+            Script.DeleteField(o, "xyz");
+            Script.DeleteField(o, "Proxy-Connection");
+            Script.DeleteField(o, arg);
+            
+            Type t = Script.GetScriptType(o);
+
+            if (Script.GetScriptType(o) == "object") {
+            }
+
+            if (Script.HasMethod(o, "execute")) {
+            }
+
+            Script.InvokeMethod(null, "globalMethod");
+            Script.InvokeMethod(null, "globalMethod", "xyz");
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Literals/Baseline.txt b/tests/TestCases/Expression/Literals/Baseline.txt
new file mode 100644
index 000000000..619e4cb34
--- /dev/null
+++ b/tests/TestCases/Expression/Literals/Baseline.txt
@@ -0,0 +1,40 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var i = 0;
+        i = -1;
+        i = 1;
+        i = 1000000;
+        var n = 10000;
+        var f = 1;
+        var d = 1.01;
+        var d2 = 0.5;
+        var d3 = -0.5;
+        var b = true;
+        b = false;
+        var ch = '\n';
+        ch = 'a';
+        var s = 'Hello';
+        var s2 = 'Hello\r\n';
+        var s3 = 'abc' + '123';
+        var s4 = "abc\"def'xyz";
+        var s5 = 'abc\u00a9';
+        var s6 = "abc'xyz";
+        var s7 = 'abc"xyz';
+        var t = test.App;
+        var t2 = Number;
+        var t3 = Number;
+        var t4 = Object;
+        var items = [ 1, 2, 3 ];
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/Literals/Code.cs b/tests/TestCases/Expression/Literals/Code.cs
new file mode 100644
index 000000000..d66b6d1ce
--- /dev/null
+++ b/tests/TestCases/Expression/Literals/Code.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class App {
+
+        public void Test(int arg) {
+            int i = 0;
+            i = -1;
+            i = 1;
+            i = 1000000;
+
+            long n = 10000L;
+            float f = 1f;
+            double d = 1.01;
+            double d2 = .5;
+            double d3 = -.5;
+
+            bool b = true;
+            b = false;
+
+            char ch = '\n';
+            ch = 'a';
+            string s = "Hello";
+            string s2 = "Hello\r\n";
+            string s3 = "abc" + "123";
+            string s4 = "abc\"def'xyz";
+            string s5 = "abc\u00A9";
+            string s6 = "abc'xyz";
+            string s7 = "abc\"xyz";
+
+            Type t = typeof(App);
+            Type t2 = typeof(Int32);
+            Type t3 = typeof(int);
+            Type t4 = typeof(Dictionary);
+
+            int[] items = new int[] { 1, 2, 3 };
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Locals/Baseline.txt b/tests/TestCases/Expression/Locals/Baseline.txt
new file mode 100644
index 000000000..e1c82be80
--- /dev/null
+++ b/tests/TestCases/Expression/Locals/Baseline.txt
@@ -0,0 +1,31 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var x;
+        var i = x.length;
+        while (i >= 0) {
+            var x2 = x.substring(0);
+            for (var j = 0; j < 1; j++) {
+            }
+            var j = x2;
+            i = j.length;
+        }
+        while (i >= 0) {
+            var x2 = '...';
+        }
+    },
+    
+    test2: function(arg1, arg2) {
+        arg2 = arg1;
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/Locals/Code.cs b/tests/TestCases/Expression/Locals/Code.cs
new file mode 100644
index 000000000..36f783c66
--- /dev/null
+++ b/tests/TestCases/Expression/Locals/Code.cs
@@ -0,0 +1,33 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class App {
+
+        public void Test(int arg) {
+            string x;
+
+            int i = x.Length;
+            while (i >= 0) {
+                string x2 = x.Substring(0);
+
+                for (int j = 0; j < 1; j++) {
+                }
+                string j = x2;
+                i = j.Length;
+            }
+
+            while (i >= 0) {
+                string x2 = "...";
+            }
+        }
+
+        public void Test2(int arg1, int arg2) {
+            arg2 = arg1;
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Members/Baseline.txt b/tests/TestCases/Expression/Members/Baseline.txt
new file mode 100644
index 000000000..1cab1c449
--- /dev/null
+++ b/tests/TestCases/Expression/Members/Baseline.txt
@@ -0,0 +1,108 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.IFoo
+
+test.IFoo = function() { };
+test.IFoo.registerInterface('test.IFoo');
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.BApp
+
+test.BApp = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+    test.App.initializeBase(this);
+}
+test.App.prototype = {
+    _value: 0,
+    _value2: 0,
+    
+    get_XYZ: function() {
+        return 1;
+    },
+    set_XYZ: function(value) {
+        return value;
+    },
+    
+    test: function(arg) {
+        var s = '';
+        var n = s.length;
+        var n2 = Number.MAX_VALUE;
+        var m = 0;
+        n = this.get_XYZ();
+        n = this.get_XYZ();
+        this.set_XYZ(n);
+        this.set_XYZ(n);
+        var a;
+        n = a.get_XYZ();
+        a.set_XYZ(n);
+        n = this._value;
+        n = this._value;
+        this._value = n;
+        this._value = n;
+        n = test.App.myDefault;
+        n = test.App.myDefault;
+        n = 3;
+        n = 3;
+        n = 3;
+        n = 3;
+        n = 3;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.DApp
+
+test.DApp = function() {
+    test.DApp.initializeBase(this);
+}
+test.DApp.prototype = {
+    
+    test2: function() {
+        var n = this.get_XYZ();
+        n = this.get_XYZ();
+        n = test.DApp.callBaseMethod(this, 'get_XYZ');
+        this.set_XYZ(n);
+        this.set_XYZ(n);
+        test.DApp.callBaseMethod(this, 'set_XYZ', [ n ]);
+        this._value2 = n;
+        this._value2 = n;
+        this._value2 = n;
+        n = test.App.myDefault2;
+        n = test.App.myDefault2;
+        n = 3;
+        n = 3;
+        n = 3;
+        n = 3;
+        n = 3;
+        n = 3;
+    },
+    
+    test3: function() {
+        var i = [ 1, 2 ];
+        i[0] = 1;
+        i[1] = i[0];
+        i[i[0]] = 20;
+    },
+    
+    test4: function(foo) {
+        foo.bar();
+    }
+}
+
+
+test.BApp.registerClass('test.BApp');
+test.App.registerClass('test.App', test.BApp);
+test.DApp.registerClass('test.DApp', test.App);
+test.BApp.myConstant = 3;
+test.App.myConstant2 = 3;
+test.App.myDefault = 1;
+test.App.myDefault2 = 2;
diff --git a/tests/TestCases/Expression/Members/Code.cs b/tests/TestCases/Expression/Members/Code.cs
new file mode 100644
index 000000000..a6eb46815
--- /dev/null
+++ b/tests/TestCases/Expression/Members/Code.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    enum Mode { A = 0, B = 1 }
+
+    public interface IFoo {
+        void Bar();
+    }
+
+    public class BApp {
+        protected const int MyConstant = 3;
+    }
+
+    public class App : BApp {
+
+        protected const int MyConstant2 = 3;
+        private static int MyDefault = 1;
+        protected static int MyDefault2 = 2;
+
+        private int _value;
+        protected int _value2;
+
+        public int XYZ {
+            get { return 1; }
+            set { }
+        }
+
+        public void Test(int arg) {
+            string s = String.Empty;
+            int n = s.Length;
+
+            int n2 = Number.MAX_VALUE;
+            Mode m = Mode.A;
+
+            n = XYZ;
+            n = this.XYZ;
+
+            XYZ = n;
+            this.XYZ = n;
+
+            App a;
+            n = a.XYZ;
+            a.XYZ = n;
+
+            n = _value;
+            n = this._value;
+
+            _value = n;
+            this._value = n;
+
+            n = MyDefault;
+            n = App.MyDefault;
+            n = MyConstant;
+            n = App.MyConstant;
+            n = BApp.MyConstant;
+            n = MyConstant2;
+            n = App.MyConstant2;
+        }
+    }
+
+    public class DApp : App {
+
+        public void Test2() {
+            int n = XYZ;
+            n = this.XYZ;
+            n = base.XYZ;
+
+            XYZ = n;
+            this.XYZ = n;
+            base.XYZ = n;
+
+            _value2 = n;
+            this._value2 = n;
+            base._value2 = n;
+
+            n = MyDefault2;
+            n = App.MyDefault2;
+
+            n = MyConstant;
+            n = App.MyConstant;
+            n = BApp.MyConstant;
+            n = DApp.MyConstant;
+            n = MyConstant2;
+            n = DApp.MyConstant2;
+        }
+
+        public void Test3() {
+            int[] i = new int[] { 1, 2 };
+            i[0] = 1;
+            i[1] = i[0];
+            i[i[0]] = 20;
+        }
+
+        public void Test4(IFoo foo) {
+            foo.Bar();
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/New/Baseline.txt b/tests/TestCases/Expression/New/Baseline.txt
new file mode 100644
index 000000000..b3353d230
--- /dev/null
+++ b/tests/TestCases/Expression/New/Baseline.txt
@@ -0,0 +1,62 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Point
+
+test.$create_Point = function(x, y) {
+    var $o = { };
+    $o.x = x;
+    $o.y = y;
+    return $o;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Foo
+
+test.Foo = function(i, j) {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Bar
+
+test.Bar = function(i, j, f) {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Test
+
+test.Test = function() {
+}
+test.Test.main = function() {
+    var f = new test.Foo(0, 1);
+    var b = new test.Bar(0, 1, new test.Foo(0, 1));
+    var t = new test.Test();
+    var d = new Date('3/9/1976');
+    var items = [];
+    var items2 = [ 1, 2 ];
+    var items3 = [ 4, 5 ];
+    var items4 = new Array(5);
+    var list = [];
+    var list2 = new Array(5);
+    var list3 = ['abc', 'def', 'ghi'];
+    var list4 = [1, 2, 3];
+    var dates = [ new Date('1/1/2006'), new Date('1/1/2005') ];
+    var p = test.$create_Point(0, 0);
+    var cd = {};
+    var cd2 = { abc: 123, def: true };
+    var o1 = new test.Test();
+    var type1 = test.Foo;
+    var o2 = new type1(1, 2);
+    var o3 = new test.Bar(1, 2, o2);
+    var f1 = new Function("alert('hello');");
+    var f2 = new Function('s', 'alert(s);');
+    var f3 = new Function('greeting', 'name', "alert(greeting + ' ' + name + '!');");
+}
+
+
+test.Foo.registerClass('test.Foo');
+test.Bar.registerClass('test.Bar');
+test.Test.registerClass('test.Test');
diff --git a/tests/TestCases/Expression/New/Code.cs b/tests/TestCases/Expression/New/Code.cs
new file mode 100644
index 000000000..53ffcc3a2
--- /dev/null
+++ b/tests/TestCases/Expression/New/Code.cs
@@ -0,0 +1,79 @@
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class Foo {
+
+        public Foo(int i, int j) {
+        }
+    }
+
+    public class Bar {
+
+        public Bar(int i, int j, Foo f) {
+        }
+    }
+
+    public sealed class Point : Record {
+         int x;
+         int y;
+
+         public Point(int x, int y) {
+             this.x = x;
+             this.y = y;
+         }
+    }
+
+    [Imported]
+    [IgnoreNamespace]
+    [ScriptName("Object")]
+    public class CustomDictionary {
+    
+        public CustomDictionary() {
+        }
+        
+        public CustomDictionary(params object[] nameValueList) {
+        }
+    }
+
+    public class Test {
+
+        public static void Main() {
+            Foo f = new Foo(0, 1);
+            Bar b = new Bar(0, 1, new Foo(0, 1));
+            Test t = new Test();
+            Date d = new Date("3/9/1976");
+            int[] items = new Array();
+            int[] items2 = new int[] { 1, 2 };
+            int[] items3 = { 4, 5 };
+            int[] items4 = new int[5];
+            ArrayList list = new ArrayList();
+            ArrayList list2 = new ArrayList(5);
+            ArrayList list3 = new ArrayList("abc", "def", "ghi");
+            ArrayList list4 = new ArrayList(1, 2, 3);
+            Date[] dates = new Date[] {
+                             new Date("1/1/2006"),
+                             new Date("1/1/2005") };
+
+            Point p = new Point(0, 0);
+
+            CustomDictionary cd = new CustomDictionary();
+            CustomDictionary cd2 = new CustomDictionary("abc", 123, "def", true);
+
+            object o1 = Script.CreateInstance(typeof(Test));
+
+            Type type1 = typeof(Foo);
+            object o2 = Script.CreateInstance(type1, 1, 2);
+            object o3 = Script.CreateInstance(typeof(Bar), 1, 2, (Foo)o2);
+
+            Function f1 = new Function("alert('hello');");
+            Function f2 = new Function("alert(s);", "s");
+            Function f3 = new Function("alert(greeting + ' ' + name + '!');", "greeting", "name");
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Number/Baseline.txt b/tests/TestCases/Expression/Number/Baseline.txt
new file mode 100644
index 000000000..a5e215886
--- /dev/null
+++ b/tests/TestCases/Expression/Number/Baseline.txt
@@ -0,0 +1,19 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var i = parseInt('5');
+        var f = parseFloat('5.3');
+        var b1 = isNaN(0);
+        var b2 = isFinite(3);
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/Number/Code.cs b/tests/TestCases/Expression/Number/Code.cs
new file mode 100644
index 000000000..671b6e034
--- /dev/null
+++ b/tests/TestCases/Expression/Number/Code.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class App {
+
+        public void Test(int arg) {
+            int i = Number.ParseInt("5");
+            float f = Number.ParseFloat("5.3");
+            bool b1 = Number.IsNaN(0);
+            bool b2 = Number.IsFinite(3);
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Script/Baseline.txt b/tests/TestCases/Expression/Script/Baseline.txt
new file mode 100644
index 000000000..388a101cb
--- /dev/null
+++ b/tests/TestCases/Expression/Script/Baseline.txt
@@ -0,0 +1,19 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        arg = (arg || 10);
+        arg = (arg || 10 || 100);
+        var s = (arg || 10).format('{0}');
+        var b = !!arg;
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/Script/Code.cs b/tests/TestCases/Expression/Script/Code.cs
new file mode 100644
index 000000000..f65f9111f
--- /dev/null
+++ b/tests/TestCases/Expression/Script/Code.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class App {
+
+        public void Test(int arg) {
+            arg = Script.Value(arg, 10);
+            arg = Script.Value(arg, 10, 100);
+            string s = Script.Value(arg, 10).Format("{0}");
+            bool b = Script.Boolean(arg);
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/String/Baseline.txt b/tests/TestCases/Expression/String/Baseline.txt
new file mode 100644
index 000000000..9db6e2f66
--- /dev/null
+++ b/tests/TestCases/Expression/String/Baseline.txt
@@ -0,0 +1,23 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var s = 'Hello';
+        var s2;
+        s2 = escape(s);
+        s = unescape(s2);
+        s2 = encodeURI(s);
+        s = decodeURI(s2);
+        s2 = encodeURIComponent(s);
+        s = decodeURIComponent(s2);
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/String/Code.cs b/tests/TestCases/Expression/String/Code.cs
new file mode 100644
index 000000000..89fd1daf2
--- /dev/null
+++ b/tests/TestCases/Expression/String/Code.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class App {
+
+        public void Test(int arg) {
+            string s = "Hello";
+            string s2;
+
+            s2 = s.Escape();
+            s = s2.Unescape();
+            s2 = s.EncodeUri();
+            s = s2.DecodeUri();
+            s2 = s.EncodeUriComponent();
+            s = s2.DecodeUriComponent();
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Truthy/Baseline.txt b/tests/TestCases/Expression/Truthy/Baseline.txt
new file mode 100644
index 000000000..a9c401c86
--- /dev/null
+++ b/tests/TestCases/Expression/Truthy/Baseline.txt
@@ -0,0 +1,64 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var i;
+        var j;
+        var f;
+        var o;
+        var s;
+        if (!i) {
+        }
+        if (!!i) {
+        }
+        if (i === 1) {
+        }
+        if (i === j) {
+        }
+        if (!!s.length) {
+        }
+        if (!s) {
+        }
+        if (!!s) {
+        }
+        if (!s) {
+        }
+        if (!!s) {
+        }
+        if (!!f) {
+        }
+        if (!f) {
+        }
+        if (!f) {
+        }
+        if (!!f) {
+        }
+        if (f === f) {
+        }
+        if (o == null) {
+        }
+        if (o != null) {
+        }
+        if ((s + s) != null) {
+        }
+        if ((s + s) == null) {
+        }
+        if (!!(i % 2)) {
+        }
+        if (!(i % 2)) {
+        }
+        if (!(i % 2)) {
+        }
+        if (!i++) {
+        }
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/Truthy/Code.cs b/tests/TestCases/Expression/Truthy/Code.cs
new file mode 100644
index 000000000..82958126a
--- /dev/null
+++ b/tests/TestCases/Expression/Truthy/Code.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class App {
+
+        public void Test(int arg) {
+            int i;
+            int j;
+            bool f;
+            object o;
+            string s;
+
+            if (i == 0) {
+            }
+            if (i != 0) {
+            }
+            if (i == 1) {
+            }
+            if (i == j) {
+            }
+            if (s.Length != 0) {
+            }
+            if (s == "") {
+            }
+            if (s != "") {
+            }
+            if (s == String.Empty) {
+            }
+            if (s != String.Empty) {
+            }
+
+            if (f == true) {
+            }
+            if (f != true) {
+            }
+            if (f == false) {
+            }
+            if (f != false) {
+            }
+            if (f == f) {
+            }
+
+            if (o == null) {
+            }
+            if (o != null) {
+            }
+
+            if ((s + s) != null) {
+            }
+            if ((s + s) == null) {
+            }
+            
+            if (i % 2 != 0) {
+            }
+            if (i % 2 == 0) {
+            }
+            if ((i % 2) == 0) {
+            }
+            if (i++ == 0) {
+            }
+        }
+    }
+}
diff --git a/tests/TestCases/Expression/Unary/Baseline.txt b/tests/TestCases/Expression/Unary/Baseline.txt
new file mode 100644
index 000000000..cbe26248b
--- /dev/null
+++ b/tests/TestCases/Expression/Unary/Baseline.txt
@@ -0,0 +1,52 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Data
+
+test.Data = function() {
+}
+test.Data.prototype = {
+    _value: 0,
+    
+    get_value: function() {
+        return this._value;
+    },
+    set_value: function(value) {
+        this._value = value;
+        return value;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var xyz = ~arg;
+        var f = (!arg);
+        f = !f;
+        var m = arg;
+        m++;
+        var n = ++m;
+        m--;
+        n = --m;
+        n = -m;
+        n = m;
+        n = 1;
+        n = 1 + (2);
+        var s = (!f).toString();
+        var num = 1.01;
+        s = (~num).toExponential();
+        var d = new test.Data();
+        d.set_value(d.get_value() + 1) - 1;
+        d.set_value(d.get_value() + 1);
+    }
+}
+
+
+test.Data.registerClass('test.Data');
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Expression/Unary/Code.cs b/tests/TestCases/Expression/Unary/Code.cs
new file mode 100644
index 000000000..d53553ce8
--- /dev/null
+++ b/tests/TestCases/Expression/Unary/Code.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ExpressionTests {
+
+    public class Data {
+        private int _value;
+
+        public int Value {
+            get { return _value; }
+            set { _value = value; }
+        }
+    }
+
+    public class App {
+
+        public void Test(int arg) {
+            int xyz = ~arg;
+            bool f = (arg == 0);
+            f = !f;
+
+            int m = arg;
+            m++;
+            int n = ++m;
+
+            m--;
+            n = --m;
+
+            n = -m;
+            n = +m;
+            n = +1;
+            n = 1 + (+2);
+
+            string s = (!f).ToString();
+            float num = 1.01;
+            s = (~num).ToExponential();
+
+            Data d = new Data();
+            d.Value++;
+            ++d.Value;
+        }
+    }
+}
diff --git a/tests/TestCases/Library/jQuery/Baseline.txt b/tests/TestCases/Library/jQuery/Baseline.txt
new file mode 100644
index 000000000..79797f338
--- /dev/null
+++ b/tests/TestCases/Library/jQuery/Baseline.txt
@@ -0,0 +1,39 @@
+////////////////////////////////////////////////////////////////////////////////
+// MyApp
+
+window.MyApp = function MyApp() {
+}
+MyApp._alertData = function MyApp$_alertData(url) {
+    $.ajax({ url: url, type: 'GET', dataType: 'html', contentType: 'application/json', processData: false, success: function(result, textData, xhr) {
+        var s = xhr.responseText;
+        alert(s);
+        xyz(s);
+    }, error: function(xhr, textData, e) {
+        console.log(xhr.status);
+    } });
+}
+MyApp.postData = function MyApp$postData(url, data, succesCallback, errorCallback, returnType, requestType) {
+    returnType = returnType || 'text';
+    requestType = requestType || 'POST';
+    $.ajax({ cache: false, data: data, dataType: returnType, error: function(req, textStatus, error) {
+        if (!ss.isNullOrUndefined(errorCallback)) {
+            errorCallback(req, textStatus, error);
+        }
+    }, success: function(dataSuccess, textStatus, request) {
+        if (ss.isNullOrUndefined(succesCallback)) {
+            $(document).append(dataSuccess);
+        }
+        else {
+            succesCallback(dataSuccess, textStatus, request);
+        }
+    }, type: requestType, url: url });
+}
+
+
+MyApp.registerClass('MyApp');
+(function () {
+    $('div').addClass('foo');
+    $('span').addClass('bar').addClass('baz');
+    var o = $('.special').foo();
+    $('.special').html('<span></span>');
+})();
diff --git a/tests/TestCases/Library/jQuery/Code.cs b/tests/TestCases/Library/jQuery/Code.cs
new file mode 100644
index 000000000..d8b662da0
--- /dev/null
+++ b/tests/TestCases/Library/jQuery/Code.cs
@@ -0,0 +1,68 @@
+using System;
+using System.Html;
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+using jQueryApi;
+
+[assembly: ScriptAssembly("test")]
+
+[Imported]
+[IgnoreNamespace]
+public class FooObject : jQueryObject {
+    
+    public FooObject Foo() {
+        return this;
+    }
+}
+
+public sealed class MyApp {
+
+    static MyApp() {
+        jQuery.Select("div").AddClass("foo");
+        jQuery.Select("span").AddClass("bar").AddClass("baz");
+
+        jQueryObject o = jQuery.Select(".special").Plugin<FooObject>().Foo();
+        jQuery.Select(".special").Html("<span></span>").Plugin<FooObject>();
+    }
+
+    private static void AlertData(string url) {
+        jQuery.Ajax(new jQueryAjaxOptions(
+            "url", url,
+            "type", "GET",
+            "dataType", "html",
+            "contentType", "application/json",
+            "processData", false,
+            "success", (AjaxRequestCallback)delegate(object result, string textData, jQueryXmlHttpRequest xhr) {
+                string s = xhr.ResponseText;
+                Window.Alert(s);
+                Script.InvokeMethod(null, "xyz", s);
+            },
+            "error", (AjaxErrorCallback)delegate(jQueryXmlHttpRequest xhr, string textData, Exception e) {
+                Debug.WriteLine(xhr.Status);
+            }));
+    }
+
+    public static void PostData(string url, object data, AjaxRequestCallback succesCallback, AjaxErrorCallback errorCallback, string returnType, string requestType) {
+        returnType = returnType ?? "text";
+        requestType = requestType ?? "POST";
+
+        jQuery.Ajax(new jQueryAjaxOptions(
+            "cache", false,
+            "data", data,
+            "dataType", returnType,
+            "error", (AjaxErrorCallback)delegate(jQueryXmlHttpRequest req, string textStatus, Exception error) {
+                if (!Script.IsNullOrUndefined(errorCallback))
+                    errorCallback(req, textStatus, error);
+            },
+            "success", (AjaxRequestCallback)delegate(object dataSuccess, string textStatus, jQueryXmlHttpRequest request) {
+                if (Script.IsNullOrUndefined(succesCallback)) {
+                    jQuery.Document.Append((string)dataSuccess);
+                }
+                else {
+                    succesCallback(dataSuccess, textStatus, request);
+                }
+            },
+            "type", requestType,
+            "url", url));
+    }
+}
diff --git a/tests/TestCases/Member/Constructors/Baseline.txt b/tests/TestCases/Member/Constructors/Baseline.txt
new file mode 100644
index 000000000..e2cf6043f
--- /dev/null
+++ b/tests/TestCases/Member/Constructors/Baseline.txt
@@ -0,0 +1,43 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClass
+
+test.MyClass = function() {
+    this._value = 1;
+}
+test.MyClass.prototype = {
+    _value: 0
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClass2
+
+test.MyClass2 = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClass3
+
+test.MyClass3 = function(arg, arg2) {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClass4
+
+test.MyClass4 = function(arg, arg2, arg3) {
+    test.MyClass4.initializeBase(this, [ arg, arg2 ]);
+}
+
+
+test.MyClass.registerClass('test.MyClass');
+test.MyClass2.registerClass('test.MyClass2');
+test.MyClass3.registerClass('test.MyClass3');
+test.MyClass4.registerClass('test.MyClass4', test.MyClass3);
+test.MyClass2.x = null;
+test.MyClass2.x = 'Hello';
+test.MyClass3.c = null;
+test.MyClass3.c = new test.MyClass();
diff --git a/tests/TestCases/Member/Constructors/Code.cs b/tests/TestCases/Member/Constructors/Code.cs
new file mode 100644
index 000000000..4e9a188eb
--- /dev/null
+++ b/tests/TestCases/Member/Constructors/Code.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace MemberTests {
+
+    public class MyClass {
+
+        private int _value;
+
+        public MyClass() {
+            _value = 1;
+        }
+    }
+
+    public class MyClass2 {
+
+        private static string x;
+
+        static MyClass() {
+            x = "Hello";
+        }
+    }
+
+    public class MyClass3 {
+
+        public static MyClass c;
+
+        static MyClass() {
+            c = new MyClass();
+        }
+
+        public MyClass3(int arg, int arg2) {
+        }
+    }
+
+    public class MyClass4 : MyClass3 {
+
+        public MyClass4(int arg, int arg2, int arg3) : base(arg, arg2) {
+        }
+    }
+}
diff --git a/tests/TestCases/Member/Events/Baseline.txt b/tests/TestCases/Member/Events/Baseline.txt
new file mode 100644
index 000000000..797417702
--- /dev/null
+++ b/tests/TestCases/Member/Events/Baseline.txt
@@ -0,0 +1,55 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.EventArgs
+
+test.EventArgs = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Button
+
+test.Button = function() {
+}
+test.Button.add_test = function(value) {
+    test.Button.__test = ss.Delegate.combine(test.Button.__test, value);
+}
+test.Button.remove_test = function(value) {
+    test.Button.__test = ss.Delegate.remove(test.Button.__test, value);
+}
+test.Button.prototype = {
+    _aaa: null,
+    
+    add_click: function(value) {
+        this.__click = ss.Delegate.combine(this.__click, value);
+    },
+    remove_click: function(value) {
+        this.__click = ss.Delegate.remove(this.__click, value);
+    },
+    
+    __click: null,
+    
+    add_aaa: function(value) {
+        if (this._aaa == null) {
+            this._aaa = value;
+        }
+        else {
+            this._aaa = ss.Delegate.combine(this._aaa, value);
+        }
+    },
+    remove_aaa: function(value) {
+        this._aaa = ss.Delegate.remove(this._aaa, value);
+    },
+    
+    performClick: function() {
+        if (this.__click != null) {
+            this.__click(this, new test.EventArgs());
+        }
+    }
+}
+
+
+test.EventArgs.registerClass('test.EventArgs');
+test.Button.registerClass('test.Button');
+test.Button.__test = null;
diff --git a/tests/TestCases/Member/Events/Code.cs b/tests/TestCases/Member/Events/Code.cs
new file mode 100644
index 000000000..6c041f3e4
--- /dev/null
+++ b/tests/TestCases/Member/Events/Code.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace MemberTests {
+
+    public class EventArgs {
+    }
+
+    public delegate void EventHandler(object sender, EventArgs e);
+
+    public class Button {
+
+        private EventHandler _aaa;
+
+        public event EventHandler Click;
+
+        public static event EventHandler test;
+
+        public event EventHandler aaa {
+            add {
+                if (_aaa == null) {
+                    _aaa = value;
+                }
+                else {
+                    _aaa = (EventHandler)Delegate.Combine(_aaa, value);
+                }
+            }
+            remove {
+                _aaa = (EventHandler)Delegate.Remove(_aaa, value);
+            }
+        }
+
+        public void PerformClick() {
+            if (Click != null) {
+                Click(this, new EventArgs());
+            }
+        }
+    }
+}
diff --git a/tests/TestCases/Member/Fields/Baseline.txt b/tests/TestCases/Member/Fields/Baseline.txt
new file mode 100644
index 000000000..1de533a92
--- /dev/null
+++ b/tests/TestCases/Member/Fields/Baseline.txt
@@ -0,0 +1,71 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Mode
+
+test.Mode = function() { };
+test.Mode.prototype = {
+    a: 0, 
+    b: 1
+}
+test.Mode.registerEnum('test.Mode', false);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Point
+
+test.$create_Point = function(x, y) {
+    var $o = { };
+    $o.x = x;
+    $o.y = y;
+    return $o;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Test
+
+test.Test = function() {
+    this._value = 2006;
+    this.s = 'aaa';
+    this.s = 'bbb';
+    this.s = 'aaa';
+}
+test.Test.prototype = {
+    _value: 0,
+    _uintValue: 0,
+    _dblValue: 0,
+    _enumValue: 0,
+    _boolValue: false,
+    s: null
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+    this._t = new test.Test();
+}
+test.App.prototype = {
+    _i: 5,
+    
+    doTest: function() {
+        var t = new test.Test();
+        t.s = 'World';
+        var i = 1;
+        test.Test.done = true;
+        var p = test.$create_Point(1, 10);
+        p.x = p.y;
+    }
+}
+
+
+test.Test.registerClass('test.Test');
+test.App.registerClass('test.App');
+test.Test.greeting = 'Hello!';
+test.Test.myNumber = 1;
+test.Test.defaultValue = 'aaa';
+test.Test.done = false;
+test.Test.XYZ = 1;
+test.Test.key = {};
diff --git a/tests/TestCases/Member/Fields/Code.cs b/tests/TestCases/Member/Fields/Code.cs
new file mode 100644
index 000000000..945bc9b78
--- /dev/null
+++ b/tests/TestCases/Member/Fields/Code.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace MemberTests {
+
+    public enum Mode { A = 0, B = 1 };
+
+    public class Test {
+
+        public static readonly string Greeting = "Hello!";
+        public const int MyNumber = 1;
+
+        public const string DefaultValue = "aaa";
+        private const string DefaultPrivateValue = "bbb";
+
+        public static bool done;
+
+        protected static int XYZ = 1;
+        private static readonly object key = new object();
+
+        private int _value;
+        private uint _uintValue;
+        private double _dblValue;
+        private Mode _enumValue;
+        private bool _boolValue;
+        public string s;
+
+        public Test() {
+            _value = 2006;
+            s = DefaultValue;
+            s = DefaultPrivateValue;
+            s = Test.DefaultValue;
+        }
+    }
+
+    internal sealed class Point : Record {
+         public int x;
+         public int y;
+
+         public Point(int x, int y) {
+             this.x = x;
+             this.y = y;
+         }
+    }
+
+    public class App {
+
+        private Test _t = new Test();
+        private int _i = 5;
+
+        public void DoTest() {
+            Test t = new Test();
+
+            t.s = "World";
+            int i = Test.MyNumber;
+
+            Test.done = true;
+
+            Point p = new Point(1, 10);
+            p.x = p.y;
+        }
+    }
+}
diff --git a/tests/TestCases/Member/Indexers/Baseline.txt b/tests/TestCases/Member/Indexers/Baseline.txt
new file mode 100644
index 000000000..d671d39ca
--- /dev/null
+++ b/tests/TestCases/Member/Indexers/Baseline.txt
@@ -0,0 +1,207 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.IIndexable
+
+test.IIndexable = function() { };
+test.IIndexable.registerInterface('test.IIndexable');
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Normal
+
+test.Normal = function() {
+    var i = this.get_item('name');
+    this.set_item('name', i + 1);
+}
+test.Normal.prototype = {
+    n: 0,
+    get_item: function(name) {
+        return this.n;
+    },
+    set_item: function(name, value) {
+        this.n = value;
+        return value;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.GetterOnly
+
+test.GetterOnly = function() {
+    var i = this.get_item('name');
+}
+test.GetterOnly.prototype = {
+    n: 0,
+    get_item: function(name) {
+        return this.n;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.VirtualIndexer
+
+test.VirtualIndexer = function() {
+    var i = this.get_item('name');
+    this.set_item('name', i + 1);
+}
+test.VirtualIndexer.prototype = {
+    n: 0,
+    get_item: function(name) {
+        return this.n;
+    },
+    set_item: function(name, value) {
+        this.n = value;
+        return value;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.OverriddenIndexer
+
+test.OverriddenIndexer = function() {
+    test.OverriddenIndexer.initializeBase(this);
+    var i = this.get_item('name');
+    this.set_item('name', i + 1);
+    var j = test.OverriddenIndexer.callBaseMethod(this, 'get_item', [ 'name' ]);
+    test.OverriddenIndexer.callBaseMethod(this, 'set_item', [ 'name', 43 ]);
+}
+test.OverriddenIndexer.prototype = {
+    get_item: function(name) {
+        return test.OverriddenIndexer.callBaseMethod(this, 'get_item', [ name ]) + 1;
+    },
+    set_item: function(name, value) {
+        test.OverriddenIndexer.callBaseMethod(this, 'set_item', [ name, value - 1 ]);
+        return value;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.AbstractIndexer
+
+test.AbstractIndexer = function() {
+    var i = this.get_item('name');
+    this.set_item('name', i + 1);
+}
+test.AbstractIndexer.prototype = {
+    n: 0,
+
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.ImplementedIndexer
+
+test.ImplementedIndexer = function() {
+    test.ImplementedIndexer.initializeBase(this);
+    var i = this.get_item('name');
+    this.set_item('name', i + 1);
+}
+test.ImplementedIndexer.prototype = {
+    n: 0,
+
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MultipleArgs
+
+test.MultipleArgs = function() {
+    var i = this.get_item('name', 'name2', 'name3');
+    this.set_item('name', 'name2', 'name3', i + 1);
+}
+test.MultipleArgs.prototype = {
+    n: 0,
+    get_item: function(first, middle, last) {
+        var value = first + middle + last;
+        return value.length;
+    },
+    set_item: function(first, middle, last, value) {
+        this.n = value;
+        return value;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.ImplementedIndexer2
+
+test.ImplementedIndexer2 = function() {
+}
+test.ImplementedIndexer2.prototype = {
+    get_item: function(index) {
+        return 0;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Test
+
+test.Test = function() {
+    var ma = new test.MultipleArgs();
+    ma.set_item('1', '2', '3', ma.get_item('3', '2', '1'));
+    var ii = new test.ImplementedIndexer();
+    ii.set_item('big', ii.get_item('small'));
+    var ai = ii;
+    ai.set_item('small', ai.get_item('big'));
+    var indexable = new test.ImplementedIndexer2();
+    var o = indexable.get_item(0);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.A
+
+test.A = function() {
+}
+test.A.prototype = {
+    get_item: function(name) {
+        return name;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.B
+
+test.B = function() {
+    test.B.initializeBase(this);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.C
+
+test.C = function() {
+    test.C.initializeBase(this);
+}
+test.C.main = function() {
+    var c = new test.C();
+    c.set_item('a', c.get_item('b'));
+    var a = c;
+    a.set_item('b', a.get_item('c'));
+}
+test.C.prototype = {
+    get_item: function(name) {
+        return name;
+    }
+}
+
+
+test.Normal.registerClass('test.Normal');
+test.GetterOnly.registerClass('test.GetterOnly');
+test.VirtualIndexer.registerClass('test.VirtualIndexer');
+test.OverriddenIndexer.registerClass('test.OverriddenIndexer', test.VirtualIndexer);
+test.AbstractIndexer.registerClass('test.AbstractIndexer');
+test.ImplementedIndexer.registerClass('test.ImplementedIndexer', test.AbstractIndexer);
+test.MultipleArgs.registerClass('test.MultipleArgs');
+test.ImplementedIndexer2.registerClass('test.ImplementedIndexer2', null, test.IIndexable);
+test.Test.registerClass('test.Test');
+test.A.registerClass('test.A');
+test.B.registerClass('test.B', test.A);
+test.C.registerClass('test.C', test.B);
diff --git a/tests/TestCases/Member/Indexers/Code.cs b/tests/TestCases/Member/Indexers/Code.cs
new file mode 100644
index 000000000..4278413ba
--- /dev/null
+++ b/tests/TestCases/Member/Indexers/Code.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace MemberTests {
+
+    public class Normal {
+
+        private int n;
+
+        public Normal() {
+            int i = this["name"];
+            this["name"] = i + 1;
+        }
+
+        private int this[string name] {
+            get { return n; }
+            set { n = value; }
+        }
+    }
+
+    public class GetterOnly {
+
+        private int n;
+
+        public GetterOnly() {
+            int i = this["name"];
+        }
+
+        private int this[string name] {
+            get { return n; }
+        }
+    }
+
+    public class VirtualIndexer {
+
+        private int n;
+
+        public VirtualIndexer() {
+            int i = this["name"];
+            this["name"] = i + 1;
+        }
+
+        protected virtual int this[string name] {
+            get { return n; }
+            set { n = value; }
+        }
+    }
+
+    public class OverriddenIndexer : VirtualIndexer {
+
+        public OverriddenIndexer() {
+            int i = this["name"];
+            this["name"] = i + 1;
+
+            int j = base["name"];
+            base["name"] = 43;
+        }
+
+        protected override int this[string name] {
+            get { return base[name] + 1; }
+            set { base[name] = value - 1; }
+        }
+    }
+
+    public abstract class AbstractIndexer {
+
+        private int n;
+
+        public AbstractIndexer() {
+            int i = this["name"];
+            this["name"] = i + 1;
+        }
+
+        public abstract int this[string name] {
+            get;
+        }
+    }
+
+    public sealed class ImplementedIndexer : AbstractIndexer {
+
+        private int n;
+
+        public ImplementedIndexer() {
+            int i = this["name"];
+            this["name"] = i + 1;
+        }
+
+        public abstract int this[string name] {
+            get {
+                return n / 4;
+            }
+        }
+    }
+
+    public class MultipleArgs {
+
+        private int n;
+
+        public MultipleArgs() {
+            int i = this["name", "name2", "name3"];
+            this["name", "name2","name3"] = i + 1;
+        }
+
+        public int this[string first, string middle, string last] {
+            get { string value = first + middle + last; return value.Length; }
+            set { n = value; }
+        }
+    }
+
+    public interface IIndexable {
+
+        public object this[int index] {
+            get;
+        }
+    }
+
+    public class ImplementedIndexer2 : IIndexable {
+
+        public object this[int index] {
+            get { return 0; }
+        }
+    }
+
+    public class Test {
+
+        public Test() {
+
+            MultipleArgs ma = new MultipleArgs();
+            ma["1", "2", "3"] = ma["3", "2", "1"];
+
+            ImplementedIndexer ii = new ImplementedIndexer();
+            ii["big"] = ii["small"];
+
+            AbstractIndexer ai = ii;
+            ai["small"] = ai["big"];
+
+            IIndexable indexable = new ImplementedIndexer2();
+            object o = indexable[0];
+        }
+    }
+
+    public class A {
+
+        public virtual string this[string name] {
+            get {
+                return name;
+            }
+        }
+    }
+
+    public class B : A {
+    }
+
+    public class C : B {
+
+        public static void Main() {
+            C c = new C();
+            c["a"] = c["b"];
+
+            A a = c;
+            a["b"] = a["c"];
+        }
+
+        public override string this[string name] {
+            get {
+                return name;
+            }
+        }
+    }
+}
diff --git a/tests/TestCases/Member/Methods/Baseline.txt b/tests/TestCases/Member/Methods/Baseline.txt
new file mode 100644
index 000000000..37ca16502
--- /dev/null
+++ b/tests/TestCases/Member/Methods/Baseline.txt
@@ -0,0 +1,94 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Test
+
+test.Test = function() {
+}
+test.Test.prototype = {
+    
+    do1: function() {
+    },
+    
+    do2: function() {
+        return 0;
+    },
+    
+    do3: function(i, j) {
+        return i;
+    },
+    
+    run: function() {
+        this.do1();
+        var v = this.do2();
+        var s = String.fromCharCode(0);
+        s = String.fromCharCode(32, 65, 66);
+        var i = s.indexOf('A');
+        i = s.indexOf('A', 1);
+    },
+    
+    toString: function() {
+        window.m1();
+        var x = new test.X();
+        $.fn.extend(x, 10);
+        return null;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Foo
+
+window.doStuff = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Bar
+
+window.m1 = function() {
+}
+window.m2 = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.FooBar
+
+window.doStuff2 = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.FooBar2
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.X
+
+test.X = function() {
+}
+test.X.prototype = {
+    
+    update: function(i) {
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Plugin
+
+$.fn.extend = function(x, i) {
+    x.update(i);
+    return x;
+}
+
+
+test.Test.registerClass('test.Test');
+test.X.registerClass('test.X');
+alert('Startup code in FooBar');
+(function () {
+    var timeStamp = new Date().getMilliseconds();
+    alert('Startup code in FooBar: ' + timeStamp);
+})();
diff --git a/tests/TestCases/Member/Methods/Code.cs b/tests/TestCases/Member/Methods/Code.cs
new file mode 100644
index 000000000..8f7c37b86
--- /dev/null
+++ b/tests/TestCases/Member/Methods/Code.cs
@@ -0,0 +1,95 @@
+using System;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace MemberTests {
+
+    public abstract class Test {
+
+        public void Do1() {
+        }
+
+        public int Do2() {
+            return 0;
+        }
+
+        public object Do3(int i, int j) {
+            return i;
+        }
+
+        public void Run() {
+            Do1();
+            int v = Do2();
+
+            string s = String.FromCharCode(0);
+            s = String.FromCharCode(32, 65, 66);
+            int i = s.IndexOf('A');
+            i = s.IndexOf('A', 1);
+        }
+
+        public abstract object getRunOptions();
+
+        public override string ToString() {
+            Bar.M1();
+
+            X x = new X();
+            Plugin.Extend(x, 10);
+
+            return null;
+        }
+    }
+
+    [GlobalMethods]
+    public static class Foo {
+
+        public static void DoStuff() {
+        }
+    }
+
+    [Mixin("window")]
+    public static class Bar {
+
+        public static void M1() {
+        }
+
+        public static void M2() {
+        }
+    }
+
+    [GlobalMethods]
+    public static class FooBar {
+    
+        static FooBar() {
+            Window.Alert("Startup code in FooBar");
+        }
+
+        public static void DoStuff2() {
+        }
+    }
+
+    [GlobalMethods]
+    public static class FooBar2 {
+    
+        static FooBar2() {
+            int timeStamp = (new Date()).GetMilliseconds();
+            Window.Alert("Startup code in FooBar: " + timeStamp);
+        }
+    }
+
+    public class X {
+
+        public void Update(int i) { }
+    }
+
+    [Mixin("$.fn")]
+    public static class Plugin {
+
+        public static X Extend(X x, int i) {
+            x.Update(i);
+            return x;
+        }
+    }
+}
diff --git a/tests/TestCases/Member/Overloads/Baseline.txt b/tests/TestCases/Member/Overloads/Baseline.txt
new file mode 100644
index 000000000..2abc04b74
--- /dev/null
+++ b/tests/TestCases/Member/Overloads/Baseline.txt
@@ -0,0 +1,34 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Test
+
+test.Test = function(name) {
+}
+test.Test.doSomething = function(o) {
+}
+test.Test.prototype = {
+    
+    invoke: function(successCallback, errorCallback, context) {
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+    test.Test.doSomething();
+    test.Test.doSomething(null);
+    var t1 = new test.Test();
+    var t2 = new test.Test('test');
+    var cb1 = null;
+    var cb2 = null;
+    t1.invoke(cb1);
+    t1.invoke(cb1, cb2);
+    t2.invoke(cb1, cb2, t1);
+}
+
+
+test.Test.registerClass('test.Test');
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Member/Overloads/Code.cs b/tests/TestCases/Member/Overloads/Code.cs
new file mode 100644
index 000000000..a45d93b1d
--- /dev/null
+++ b/tests/TestCases/Member/Overloads/Code.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace MemberTests {
+
+    public delegate void Callback();
+    
+    public abstract class Test {
+
+        [AlternateSignature]
+        public extern Test();
+
+        public Test(string name) {
+        }
+
+        [AlternateSignature]
+        public static extern void DoSomething();
+
+        public static void DoSomething(object o) {
+        }
+
+        [AlternateSignature]
+        public extern void Invoke(Callback successCallback);
+
+        [AlternateSignature]
+        public extern void Invoke(Callback successCallback, Callback errorCallback);
+
+        public void Invoke(Callback successCallback, Callback errorCallback, object context) {
+        }
+    }
+
+    public class App {
+
+        public App() {
+            Test.DoSomething();
+            Test.DoSomething(null);
+
+            Test t1 = new Test();
+            Test t2 = new Test("test");
+            Callback cb1 = null;
+            Callback cb2 = null;
+
+            t1.Invoke(cb1);
+            t1.Invoke(cb1, cb2);
+            t2.Invoke(cb1, cb2, t1);
+        }
+    }
+}
diff --git a/tests/TestCases/Member/Properties/Baseline.txt b/tests/TestCases/Member/Properties/Baseline.txt
new file mode 100644
index 000000000..dadd20526
--- /dev/null
+++ b/tests/TestCases/Member/Properties/Baseline.txt
@@ -0,0 +1,57 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Test
+
+test.Test = function() {
+    this.set_XYZ(1);
+    this.set_XYZ(this.get_name().length);
+    this.set_XYZ(this.get_name().length);
+    var v = test.Test.get_staticProp();
+    v = test.Test.get_staticProp();
+}
+test.Test.get_staticProp = function() {
+    return 2006;
+}
+test.Test.set_staticProp = function(value) {
+    return value;
+}
+test.Test.prototype = {
+    
+    get_XYZ: function() {
+        return 0;
+    },
+    set_XYZ: function(value) {
+        return value;
+    },
+    
+    get_isFoo: function() {
+        return true;
+    },
+    
+    get_name: function() {
+        return 'nk';
+    },
+    
+    get_isInitialized: function() {
+        return false;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Test2
+
+test.Test2 = function() {
+    test.Test2.initializeBase(this);
+    var n = test.Test2.callBaseMethod(this, 'get_XYZ');
+    if (n === this.get_XYZ()) {
+    }
+    if (this.get_XYZ() === n) {
+    }
+    n = test.Test.get_staticProp();
+}
+
+
+test.Test.registerClass('test.Test');
+test.Test2.registerClass('test.Test2', test.Test);
diff --git a/tests/TestCases/Member/Properties/Code.cs b/tests/TestCases/Member/Properties/Code.cs
new file mode 100644
index 000000000..52f18604b
--- /dev/null
+++ b/tests/TestCases/Member/Properties/Code.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace MemberTests {
+
+    public class Test {
+
+        public static int StaticProp {
+            get { return 2006; }
+            set { }
+        }
+
+        public int XYZ {
+            get { return 0; }
+            set { }
+        }
+
+        public bool IsFoo {
+            get { return true; }
+        }
+
+        protected string Name { get { return "nk"; } }
+
+        private bool IsInitialized { get { return false; } }
+
+        public Test() {
+            XYZ = 1;
+            this.XYZ = this.Name.Length;
+            this.XYZ = Name.Length;
+
+            int v = StaticProp;
+            v = Test.StaticProp;
+        }
+    }
+
+    public class Test2 : Test {
+
+        public Test2() {
+            int n = base.XYZ;
+            if (n == XYZ) {
+            }
+            if (XYZ == n) {
+            }
+
+            n = Test.StaticProp;
+        }
+    }
+}
diff --git a/tests/TestCases/Member/StaticConstructors/Baseline.txt b/tests/TestCases/Member/StaticConstructors/Baseline.txt
new file mode 100644
index 000000000..652b197b3
--- /dev/null
+++ b/tests/TestCases/Member/StaticConstructors/Baseline.txt
@@ -0,0 +1,64 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Behavior
+
+test.Behavior = function(e, name) {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClass
+
+test.MyClass = function(d) {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClassEmpty
+
+test.MyClassEmpty = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClassSimple
+
+test.MyClassSimple = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClassSimpleMulti
+
+test.MyClassSimpleMulti = function() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyBehavior
+
+test.MyBehavior = function(element) {
+    test.MyBehavior.initializeBase(this, [ element, 'myBehavior' ]);
+}
+
+
+test.Behavior.registerClass('test.Behavior');
+test.MyClass.registerClass('test.MyClass');
+test.MyClassEmpty.registerClass('test.MyClassEmpty');
+test.MyClassSimple.registerClass('test.MyClassSimple');
+test.MyClassSimpleMulti.registerClass('test.MyClassSimpleMulti');
+test.MyBehavior.registerClass('test.MyBehavior', test.Behavior);
+test.MyClass.instance = null;
+test.MyClass.instance = new test.MyClass(Date.get_now());
+alert('simple static ctor');
+alert('simple static ctor with multiple statements');
+document.getElementById('foo').innerHTML = '...';
+(function () {
+    var e = document.body;
+    var b = true;
+    if (!b) {
+        return;
+    }
+    new test.MyBehavior(e);
+})();
diff --git a/tests/TestCases/Member/StaticConstructors/Code.cs b/tests/TestCases/Member/StaticConstructors/Code.cs
new file mode 100644
index 000000000..0d8be9b09
--- /dev/null
+++ b/tests/TestCases/Member/StaticConstructors/Code.cs
@@ -0,0 +1,66 @@
+using System;
+using System.Html;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace MemberTests {
+
+    public abstract class Behavior {
+    
+        protected Behavior(Element e, string name) {
+        }
+    }
+
+    public sealed class MyClass {
+
+        public static readonly MyClass Instance;
+
+        static MyClass() {
+            Instance = new MyClass(Date.Now);
+        }
+
+        private MyClass(Date d) {
+        }
+    }
+
+    public sealed class MyClassEmpty {
+
+        static MyClassEmpty() {
+        }
+    }
+
+    public sealed class MyClassSimple {
+
+        static MyClassSimple() {
+            Window.Alert("simple static ctor");
+        }
+    }
+
+    public sealed class MyClassSimpleMulti {
+
+        static MyClassSimpleMulti() {
+            Window.Alert("simple static ctor with multiple statements");
+            Document.GetElementById("foo").InnerHTML = "...";
+        }
+    }
+
+    public sealed class MyBehavior : Behavior {
+
+        static MyBehavior() {
+            Element e = Document.Body;
+
+            bool b = true;
+
+            if (!b) {
+                return;
+            }
+
+            new MyBehavior(e);
+        }
+
+        private MyBehavior(Element element) : base(element, "myBehavior") {
+        }
+    }
+}
diff --git a/tests/TestCases/Statement/Exceptions/Baseline.txt b/tests/TestCases/Statement/Exceptions/Baseline.txt
new file mode 100644
index 000000000..53ab15055
--- /dev/null
+++ b/tests/TestCases/Statement/Exceptions/Baseline.txt
@@ -0,0 +1,43 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        if (arg == null) {
+            throw new Error('null');
+        }
+    },
+    
+    test2: function() {
+        try {
+        }
+        catch (e) {
+        }
+        try {
+        }
+        catch (e) {
+        }
+        finally {
+        }
+        try {
+        }
+        finally {
+        }
+        try {
+        }
+        catch ($e1) {
+        }
+        try {
+        }
+        catch ($e2) {
+        }
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Statement/Exceptions/Code.cs b/tests/TestCases/Statement/Exceptions/Code.cs
new file mode 100644
index 000000000..7ccc3ca05
--- /dev/null
+++ b/tests/TestCases/Statement/Exceptions/Code.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace StatementTests {
+
+    public class App {
+
+        public void Test(string arg) {
+            if (arg == null) {
+                throw new Exception("null");
+            }
+        }
+
+        public void Test2() {
+            try {
+            }
+            catch (Exception e) {
+            }
+
+            try {
+            }
+            catch (Exception e) {
+            }
+            finally {
+            }
+
+            try {
+            }
+            finally {
+            }
+
+            try {
+            }
+            catch {
+            }
+
+            try {
+            }
+            catch {
+            }
+        }
+    }
+}
diff --git a/tests/TestCases/Statement/Expression/Baseline.txt b/tests/TestCases/Statement/Expression/Baseline.txt
new file mode 100644
index 000000000..d66592a2d
--- /dev/null
+++ b/tests/TestCases/Statement/Expression/Baseline.txt
@@ -0,0 +1,19 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var x;
+        arg = x.length;
+        arg++;
+        x = arg.toString();
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Statement/Expression/Code.cs b/tests/TestCases/Statement/Expression/Code.cs
new file mode 100644
index 000000000..bbd8aad1f
--- /dev/null
+++ b/tests/TestCases/Statement/Expression/Code.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace StatementTests {
+
+    public class App {
+
+        public void Test(int arg) {
+            string x;
+
+            arg = x.Length;
+            arg++;
+            x = arg.ToString();
+        }
+    }
+}
diff --git a/tests/TestCases/Statement/For/Baseline.txt b/tests/TestCases/Statement/For/Baseline.txt
new file mode 100644
index 000000000..7a9f4d6b6
--- /dev/null
+++ b/tests/TestCases/Statement/For/Baseline.txt
@@ -0,0 +1,32 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        for (var i = 0; i < 10; i++) {
+        }
+        var x = 10;
+        var y = 100;
+        for (; x < y; x++) {
+        }
+        for (; x < y; ) {
+        }
+        for (var j = 1, k = 1; ; j++, k--) {
+        }
+        for (x = 1; x < 100; ) {
+        }
+        for (x = arg; x < 100; x++) {
+        }
+        for (x = 1; x < 2; x++) {
+            var z = x;
+        }
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Statement/For/Code.cs b/tests/TestCases/Statement/For/Code.cs
new file mode 100644
index 000000000..fdd58b2b3
--- /dev/null
+++ b/tests/TestCases/Statement/For/Code.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace StatementTests {
+
+    public class App {
+
+        public void Test(int arg) {
+            for (int i = 0; i < 10; i++) {
+            }
+
+            int x = 10;
+            int y = 100;
+            for (; x < y; x++) {
+            }
+
+            for (; x < y; ) {
+            }
+
+            for (int j = 1, k = 1; ; j++, k--) {
+            }
+
+            for (x = 1; x < 100; ) {
+            }
+
+            for (x = arg; x < 100; x++) {
+            }
+
+            for (x = 1; x < 2; x++) {
+                int z = x;
+            }
+        }
+    }
+}
diff --git a/tests/TestCases/Statement/Foreach/Baseline.txt b/tests/TestCases/Statement/Foreach/Baseline.txt
new file mode 100644
index 000000000..5132203ec
--- /dev/null
+++ b/tests/TestCases/Statement/Foreach/Baseline.txt
@@ -0,0 +1,56 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Set
+
+test.Set = function() {
+}
+test.Set.prototype = {
+    _items: null,
+    
+    getEnumerator: function() {
+        return this._items.getEnumerator();
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var items = [ 1, 2, 3 ];
+        var sum = 0;
+        var $enum1 = ss.IEnumerator.getEnumerator(items);
+        while ($enum1.moveNext()) {
+            var i = $enum1.current;
+            sum += i;
+        }
+        var d = {};
+        var $dict2 = d;
+        for (var $key3 in $dict2) {
+            var entry = { key: $key3, value: $dict2[$key3] };
+            var s = entry.key + ' = ' + entry.value;
+        }
+        var s = new test.Set();
+        var $enum4 = ss.IEnumerator.getEnumerator(s);
+        while ($enum4.moveNext()) {
+            var o = $enum4.current;
+            this.doStuff(o);
+        }
+    },
+    
+    doStuff: function(o) {
+        var $dict1 = o;
+        for (var $key2 in $dict1) {
+            var entry = { key: $key2, value: $dict1[$key2] };
+        }
+    }
+}
+
+
+test.Set.registerClass('test.Set', null, ss.IEnumerable);
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Statement/Foreach/Code.cs b/tests/TestCases/Statement/Foreach/Code.cs
new file mode 100644
index 000000000..99848e49d
--- /dev/null
+++ b/tests/TestCases/Statement/Foreach/Code.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace StatementTests {
+
+    public class Set : IEnumerable {
+
+        private int[] _items;
+
+        public IEnumerator GetEnumerator() {
+            return _items.GetEnumerator();
+        }
+    }
+
+    public class App {
+
+        public void Test(int arg) {
+            int[] items = new int[] { 1, 2, 3 };
+            int sum = 0;
+
+            foreach (int i in items) {
+                sum += i;
+            }
+
+            Dictionary d = new Dictionary();
+
+            foreach (DictionaryEntry entry in d) {
+                string s = entry.Key + " = " + entry.Value;
+            }
+
+            Set s = new Set();
+            foreach (object o in s) {
+                DoStuff(o);
+            }
+        }
+
+        private void DoStuff(object o) {
+            foreach (DictionaryEntry entry in Dictionary.GetDictionary(o)) {
+            }
+        }
+    }
+}
diff --git a/tests/TestCases/Statement/IfElse/Baseline.txt b/tests/TestCases/Statement/IfElse/Baseline.txt
new file mode 100644
index 000000000..7baef40b1
--- /dev/null
+++ b/tests/TestCases/Statement/IfElse/Baseline.txt
@@ -0,0 +1,34 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    testMethod: function(boolValue, numValue) {
+        if (boolValue) {
+        }
+        if (boolValue) {
+            boolValue = false;
+        }
+        if (boolValue) {
+        }
+        else {
+        }
+        if (numValue === 1) {
+        }
+        else if (numValue === 2) {
+        }
+        if (numValue === 1) {
+        }
+        else if (numValue === 2) {
+        }
+        else {
+        }
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Statement/IfElse/Code.cs b/tests/TestCases/Statement/IfElse/Code.cs
new file mode 100644
index 000000000..9fe6d6a5b
--- /dev/null
+++ b/tests/TestCases/Statement/IfElse/Code.cs
@@ -0,0 +1,37 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace StatementTests {
+
+    public class App {
+
+        public void TestMethod(bool boolValue, int numValue) {
+            if (boolValue) {
+            }
+
+            if (boolValue) {
+                boolValue = false;
+            }
+
+            if (boolValue) {
+            }
+            else {
+            }
+
+            if (numValue == 1) {
+            }
+            else if (numValue == 2) {
+            }
+
+            if (numValue == 1) {
+            }
+            else if (numValue == 2) {
+            }
+            else {
+            }
+        }
+    }
+}
diff --git a/tests/TestCases/Statement/Return/Baseline.txt b/tests/TestCases/Statement/Return/Baseline.txt
new file mode 100644
index 000000000..b5654610d
--- /dev/null
+++ b/tests/TestCases/Statement/Return/Baseline.txt
@@ -0,0 +1,31 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test1: function(arg) {
+        return 0;
+    },
+    
+    test2: function(arg) {
+        return arg;
+    },
+    
+    test3: function(a) {
+        if (a) {
+            return;
+        }
+        var i;
+        switch (i) {
+            case 0:
+                return;
+        }
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Statement/Return/Code.cs b/tests/TestCases/Statement/Return/Code.cs
new file mode 100644
index 000000000..001285eae
--- /dev/null
+++ b/tests/TestCases/Statement/Return/Code.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace StatementTests {
+
+    public class App {
+
+        public int Test1(int arg) {
+            return 0;
+        }
+
+        public int Test2(int arg) {
+            return arg;
+        }
+
+        public void Test3(bool a) {
+            if (a) {
+                return;
+            }
+
+            int i;
+            switch (i) {
+                case 0:
+                    return;
+            }
+        }
+    }
+}
diff --git a/tests/TestCases/Statement/Switch/Baseline.txt b/tests/TestCases/Statement/Switch/Baseline.txt
new file mode 100644
index 000000000..5a6622784
--- /dev/null
+++ b/tests/TestCases/Statement/Switch/Baseline.txt
@@ -0,0 +1,59 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Mode
+
+test.Mode = function() { };
+test.Mode.prototype = {
+    foo: 0, 
+    bar: 1
+}
+test.Mode.registerEnum('test.Mode', false);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg, m) {
+        var i;
+        switch (i) {
+            case 0:
+                i = 0;
+                break;
+            case 1:
+                i = 2;
+                break;
+            case 2:
+                break;
+            case 3:
+            case 4:
+                i = 4;
+                break;
+            default:
+                i = 5;
+                break;
+        }
+        switch (arg) {
+            case 0:
+                i = 0;
+                break;
+            case 1:
+            default:
+                i = 2;
+                break;
+        }
+        switch (m) {
+            case 0:
+                break;
+            case 1:
+                break;
+        }
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Statement/Switch/Code.cs b/tests/TestCases/Statement/Switch/Code.cs
new file mode 100644
index 000000000..b6d4a1096
--- /dev/null
+++ b/tests/TestCases/Statement/Switch/Code.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace StatementTests {
+
+    public enum Mode { Foo = 0, Bar = 1 }
+
+    public class App {
+
+        public void Test(int arg, Mode m) {
+            int i;
+
+            switch (i) {
+                case 0:
+                    i = 0;
+                    break;
+                case 1:
+                    i = 2;
+                    break;
+                case 2:
+                    break;
+                case 3: case 4:
+                    i = 4;
+                    break;
+                default:
+                    i = 5;
+                    break;
+            }
+
+            switch (arg) {
+                case 0:
+                    i = 0;
+                    break;
+                case 1: default:
+                    i = 2;
+                    break;
+            }
+
+            switch (m) {
+                case Mode.Foo:
+                    break;
+                case Mode.Bar:
+                    break;
+            }
+        }
+    }
+}
diff --git a/tests/TestCases/Statement/Variables/Baseline.txt b/tests/TestCases/Statement/Variables/Baseline.txt
new file mode 100644
index 000000000..f93ecac15
--- /dev/null
+++ b/tests/TestCases/Statement/Variables/Baseline.txt
@@ -0,0 +1,37 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function() {
+        var i = 0;
+        var b = true;
+        var x = i + 10;
+        var y, z;
+        var a = 1, c, d, e = c;
+    },
+    
+    test2: function(arg) {
+        var a = 1;
+        var b = arg;
+        while (a < b) {
+            var x = a - b;
+            a++;
+        }
+        while (a >= b) {
+            var x = 'Hello World';
+            var foo = x.length;
+        }
+    },
+    
+    test3: function(arg1, arg2) {
+        var value = arg1 + arg2;
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Statement/Variables/Code.cs b/tests/TestCases/Statement/Variables/Code.cs
new file mode 100644
index 000000000..d910b4c08
--- /dev/null
+++ b/tests/TestCases/Statement/Variables/Code.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace StatementTests {
+
+    public class App {
+
+        public void Test() {
+            int i = 0;
+            bool b = true;
+            int x = i + 10;
+            int y, z;
+
+            int a = 1, c, d, e = c;
+        }
+
+        public void Test2(int arg) {
+            int a = 1;
+            int b = arg;
+
+            while (a < b) {
+                int x = a - b;
+                a++;
+            }
+
+            while (a >= b) {
+                string x = "Hello World";
+                int foo = x.Length;
+            }
+        }
+
+        public void Test3(int arg1, int arg2) {
+            int value = arg1 + arg2;
+        }
+    }
+}
diff --git a/tests/TestCases/Statement/While/Baseline.txt b/tests/TestCases/Statement/While/Baseline.txt
new file mode 100644
index 000000000..0b07a14db
--- /dev/null
+++ b/tests/TestCases/Statement/While/Baseline.txt
@@ -0,0 +1,29 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+}
+test.App.prototype = {
+    
+    test: function(arg) {
+        var i;
+        while (i < arg) {
+        }
+        while (i < arg) {
+            i++;
+        }
+        while (arg === i) {
+            break;
+        }
+        do {
+            i--;
+        } while (i > 0);
+        do {
+        } while (!!i);
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Statement/While/Code.cs b/tests/TestCases/Statement/While/Code.cs
new file mode 100644
index 000000000..38f52deec
--- /dev/null
+++ b/tests/TestCases/Statement/While/Code.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace StatementTests {
+
+    public class App {
+
+        public void Test(int arg) {
+            int i;
+            while (i < arg) {
+            }
+
+            while (i < arg) {
+                i++;
+            }
+
+            while (arg == i) {
+                break;
+            }
+
+            do {
+               i--;
+            } while (i > 0);
+
+            do {
+            } while (i != 0);
+        }
+    }
+}
diff --git a/tests/TestCases/Type/Classes/Baseline.txt b/tests/TestCases/Type/Classes/Baseline.txt
new file mode 100644
index 000000000..a64e404af
--- /dev/null
+++ b/tests/TestCases/Type/Classes/Baseline.txt
@@ -0,0 +1,45 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.FooBarBaz
+
+test.FooBarBaz = function test_FooBarBaz() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClass
+
+test.MyClass = function test_MyClass() {
+    test.FooBarBaz = new test.FooBarBaz();
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClass2
+
+test.MyClass2 = function test_MyClass2() {
+    test.MyClass2.initializeBase(this);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClass3
+
+test.MyClass3 = function test_MyClass3() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClass4
+
+test.MyClass4 = function test_MyClass4() {
+    test.MyClass4.initializeBase(this);
+}
+
+
+test.FooBarBaz.registerClass('test.FooBarBaz');
+test.MyClass.registerClass('test.MyClass');
+test.MyClass2.registerClass('test.MyClass2', test.MyClass);
+test.MyClass3.registerClass('test.MyClass3', null, ss.IDisposable);
+test.MyClass4.registerClass('test.MyClass4', test.MyClass, ss.IDisposable);
diff --git a/tests/TestCases/Type/Classes/Code.cs b/tests/TestCases/Type/Classes/Code.cs
new file mode 100644
index 000000000..f08eff4f6
--- /dev/null
+++ b/tests/TestCases/Type/Classes/Code.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace TypeTests {
+
+    [ScriptName("FooBarBaz")]
+    public class Foo {
+    }
+
+    public class MyClass {
+        public MyClass() { Foo = new Foo(); }
+    }
+
+    public class MyClass2 : MyClass {
+    }
+
+    public class MyClass3 : IDisposable {
+    }
+
+    public class MyClass4 : MyClass, IDisposable {
+    }
+}
diff --git a/tests/TestCases/Type/Delegates/Baseline.txt b/tests/TestCases/Type/Delegates/Baseline.txt
new file mode 100644
index 000000000..de838d13c
--- /dev/null
+++ b/tests/TestCases/Type/Delegates/Baseline.txt
@@ -0,0 +1,10 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.EventArgs
+
+test.EventArgs = function test_EventArgs() {
+}
+
+
+test.EventArgs.registerClass('test.EventArgs');
diff --git a/tests/TestCases/Type/Delegates/Code.cs b/tests/TestCases/Type/Delegates/Code.cs
new file mode 100644
index 000000000..538b4e3c9
--- /dev/null
+++ b/tests/TestCases/Type/Delegates/Code.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace TypeTests {
+
+    public class EventArgs {
+    }
+
+    public delegate void Foo();
+
+    public delegate void EventHandler(object sender, EventArgs e);
+}
diff --git a/tests/TestCases/Type/Enumerator/Baseline.txt b/tests/TestCases/Type/Enumerator/Baseline.txt
new file mode 100644
index 000000000..7f1c0c25d
--- /dev/null
+++ b/tests/TestCases/Type/Enumerator/Baseline.txt
@@ -0,0 +1,49 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App1
+
+test.App1 = function test_App1() {
+}
+test.App1.prototype = {
+    
+    getEnumerator: function test_App1$getEnumerator() {
+        return null;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function test_App() {
+}
+test.App.prototype = {
+    
+    test1: function test_App$test1(arg) {
+    },
+    
+    test: function test_App$test(arg) {
+        var a;
+        var b;
+        var s = new Array(5);
+        var a1 = a.getEnumerator();
+        a1 = b.getEnumerator();
+        a1 = s.getEnumerator();
+        var $enum1 = ss.IEnumerator.getEnumerator(s);
+        while ($enum1.moveNext()) {
+            var str = $enum1.current;
+            var s1 = str;
+        }
+        var app1;
+        var $enum2 = ss.IEnumerator.getEnumerator(app1);
+        while ($enum2.moveNext()) {
+            var str = $enum2.current;
+            var s1 = str;
+        }
+    }
+}
+
+
+test.App1.registerClass('test.App1', null, ss.IEnumerable);
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Type/Enumerator/Code.cs b/tests/TestCases/Type/Enumerator/Code.cs
new file mode 100644
index 000000000..ba46929b5
--- /dev/null
+++ b/tests/TestCases/Type/Enumerator/Code.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace TypeTests {
+
+    public class App1 : IEnumerable {
+        public IEnumerator GetEnumerator() {
+            return null;
+        }
+    }
+
+    public class App {
+
+        public void Test1(int arg) {
+        }
+        
+        public void Test(int arg) {
+            Array a;
+            ArrayList b;
+            string[] s = new string[5];
+            IEnumerable a1 = a.GetEnumerator();
+            a1 = b.GetEnumerator();
+            a1 = s.GetEnumerator();
+            foreach (string str in s) {
+                string s1 = str;
+            }
+            
+           App1 app1;
+           foreach (string str in app1) {
+                string s1 = str;
+            }
+        }
+    }
+}
diff --git a/tests/TestCases/Type/Enums/Baseline.txt b/tests/TestCases/Type/Enums/Baseline.txt
new file mode 100644
index 000000000..5287edb4d
--- /dev/null
+++ b/tests/TestCases/Type/Enums/Baseline.txt
@@ -0,0 +1,126 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Colors
+
+test.Colors = function() { };
+test.Colors.prototype = {
+    red: 0, 
+    green: 1, 
+    blue: 2
+}
+test.Colors.registerEnum('test.Colors', false);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Sequence
+
+test.Sequence = function() { };
+test.Sequence.prototype = {
+    item1: 1, 
+    item2: 2, 
+    item3: 3, 
+    item4: 5
+}
+test.Sequence.registerEnum('test.Sequence', false);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Mode
+
+test.Mode = function() { };
+test.Mode.prototype = {
+    Public: 1, 
+    Protected: 2, 
+    Private: 4
+}
+test.Mode.registerEnum('test.Mode', true);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.UInt32Mask
+
+test.UInt32Mask = function() { };
+test.UInt32Mask.prototype = {
+    v: 4026531840, 
+    a: 4278190080
+}
+test.UInt32Mask.registerEnum('test.UInt32Mask', false);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.ShortMask
+
+test.ShortMask = function() { };
+test.ShortMask.prototype = {
+    v: 1, 
+    a: 4096
+}
+test.ShortMask.registerEnum('test.ShortMask', false);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Errors
+
+test.Errors = function() { };
+test.Errors.prototype = {
+    S_OK: 0, 
+    S_FALSE: 1, 
+    E_FAIL: -1
+}
+test.Errors.registerEnum('test.Errors', false);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Size
+
+test.Size = function() { };
+test.Size.prototype = {
+    small: 'small', 
+    Medium: 'Medium', 
+    large: 'large'
+}
+test.Size.registerEnum('test.Size', false);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function test_App() {
+}
+test.App.main = function test_App$main() {
+    var m = 1;
+    m = 1 | 4;
+    var c = 0;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App2
+
+test.App2 = function test_App2() {
+}
+test.App2.prototype = {
+    _httpMethod: null,
+    _sortMode: null,
+    
+    run: function test_App2$run() {
+        var method = 'POST';
+        this.run1('GET');
+        this.run2('status');
+        this.run2('Group');
+        this.run2('Ct');
+        var s = 'Medium';
+    },
+    
+    run1: function test_App2$run1(m) {
+        var s = m;
+    },
+    
+    run2: function test_App2$run2(m) {
+    }
+}
+
+
+test.App.registerClass('test.App');
+test.App2.registerClass('test.App2');
diff --git a/tests/TestCases/Type/Enums/Code.cs b/tests/TestCases/Type/Enums/Code.cs
new file mode 100644
index 000000000..581b62b0d
--- /dev/null
+++ b/tests/TestCases/Type/Enums/Code.cs
@@ -0,0 +1,107 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace TypeTests {
+
+    public enum Colors {
+        Red = 0, Green = 1, Blue = 2
+    }
+
+    public enum Sequence {
+        Item1 = 1, Item2 = 2, Item3 = 3, Item4 = 5
+    }
+
+    [Flags]
+    public enum Mode {
+        [PreserveCase]
+        Public = 1,
+        [PreserveCase]
+        Protected = 2,
+        [PreserveCase]
+        Private = 4
+    }
+
+    public enum UInt32Mask : uint {
+
+        V = 0xF0000000,
+        A = 0xFF000000
+    }
+
+    public enum ShortMask : short {
+        V = 0x0001,
+        A = 0x1000
+    }
+
+    public enum Errors {
+
+        [PreserveCase]
+        S_OK = 0,
+        [PreserveCase]
+        S_FALSE = 1,
+        [PreserveCase]
+        E_FAIL = -1
+    }
+
+    public class App {
+        public static void Main() {
+            Mode m = Mode.Public;
+            m = Mode.Public | Mode.Private;
+
+            Colors c = Colors.Red;
+        }
+    }
+
+    [NamedValues]
+    [Imported]
+    public enum HttpMethod {
+        GET = 0,
+        POST = 1,
+        PUT = 2,
+        DELETE = 3,
+    }
+
+    [NamedValues]
+    internal enum SortMode {
+        Status = 1,
+        [PreserveCase]
+        Group = 2,
+        [ScriptName("Ct")]
+        Count = 3
+    }
+
+    [NamedValues]
+    public enum Size {
+        Small = 0,
+        [PreserveCase]
+        Medium = 1,
+        Large = 2,
+    }
+
+    public class App2 {
+
+        private HttpMethod httpMethod;
+        private SortMode sortMode;
+
+        public void Run() {
+
+           HttpMethod method = HttpMethod.POST;
+
+           Run1(HttpMethod.GET);
+           Run2(SortMode.Status);
+           Run2(SortMode.Group);
+           Run2(SortMode.Count);
+
+           string s = Size.Medium.ToString();
+        }
+
+        public void Run1(HttpMethod m) {
+           string s = m.ToString();
+        }
+
+        public void Run2(SortMode m) {
+        }
+    }
+}
diff --git a/tests/TestCases/Type/Globals/Baseline.txt b/tests/TestCases/Type/Globals/Baseline.txt
new file mode 100644
index 000000000..735befa49
--- /dev/null
+++ b/tests/TestCases/Type/Globals/Baseline.txt
@@ -0,0 +1,77 @@
+////////////////////////////////////////////////////////////////////////////////
+// MyRecord
+
+window.$create_MyRecord = function MyRecord() { return {}; }
+
+
+////////////////////////////////////////////////////////////////////////////////
+// MyEnum
+
+window.MyEnum = function() { };
+MyEnum.prototype = {
+}
+MyEnum.registerEnum('MyEnum', false);
+
+
+////////////////////////////////////////////////////////////////////////////////
+// IXyzInterface
+
+window.IXyzInterface = function() { };
+IXyzInterface.prototype = {
+
+}
+IXyzInterface.registerInterface('IXyzInterface');
+
+
+////////////////////////////////////////////////////////////////////////////////
+// MyClass
+
+window.MyClass = function MyClass() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// MyClass2
+
+window.MyClass2 = function MyClass2() {
+    MyClass2.initializeBase(this);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// MyClass3
+
+window.MyClass3 = function MyClass3() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// MyClass4
+
+window.MyClass4 = function MyClass4() {
+    MyClass4.initializeBase(this);
+}
+MyClass4.prototype = {
+    
+    someMethod: function MyClass4$someMethod() {
+        var xyz = null;
+        var c2 = new MyClass2();
+        xyz = Type.safeCast(c2, IXyzInterface);
+    }
+}
+
+
+Type.registerNamespace('Foo');
+
+////////////////////////////////////////////////////////////////////////////////
+// Foo.MyClass
+
+Foo.MyClass = function Foo_MyClass() {
+}
+
+
+MyClass.registerClass('MyClass');
+MyClass2.registerClass('MyClass2', MyClass);
+MyClass3.registerClass('MyClass3', null, ss.IDisposable);
+MyClass4.registerClass('MyClass4', MyClass, ss.IDisposable);
+Foo.MyClass.registerClass('Foo.MyClass');
diff --git a/tests/TestCases/Type/Globals/Code.cs b/tests/TestCases/Type/Globals/Code.cs
new file mode 100644
index 000000000..f949c127f
--- /dev/null
+++ b/tests/TestCases/Type/Globals/Code.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+
+public class MyClass {
+}
+
+public class MyClass2 : MyClass {
+}
+
+public class MyClass3 : IDisposable {
+}
+
+public class MyClass4 : MyClass, IDisposable {
+
+    public void SomeMethod() {
+
+        IXyzInterface xyz = null;
+        MyClass2 c2 = new MyClass2();
+
+        xyz = c2 as IXyzInterface;
+    }
+}
+
+public sealed class MyRecord : Record {
+}
+
+public enum MyEnum {
+}
+
+namespace Foo {
+
+    public class MyClass {
+    }
+}
+
+public interface IXyzInterface {
+}
diff --git a/tests/TestCases/Type/Imported/Baseline.txt b/tests/TestCases/Type/Imported/Baseline.txt
new file mode 100644
index 000000000..09cd0aed4
--- /dev/null
+++ b/tests/TestCases/Type/Imported/Baseline.txt
@@ -0,0 +1,17 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function() {
+    var elem = document.getElementById('foo');
+    var s = elem.myString;
+    elem['Smith'] = elem['Joe'];
+    var n = parseInt(5.5);
+    var parser = new DOMParser();
+    var doc = parser.parseFromString('<markup></markup>', 'text/xml');
+    var d = Date.parseDate('1/1/2010');
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Type/Imported/Code.cs b/tests/TestCases/Type/Imported/Code.cs
new file mode 100644
index 000000000..9798fa743
--- /dev/null
+++ b/tests/TestCases/Type/Imported/Code.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Html;
+using System.Runtime.CompilerServices;
+using System.Xml;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace TypeTests {
+
+    [IgnoreNamespace]
+    [Imported]
+    public sealed class MyElement : Element {
+
+        private MyElement() { }
+
+        [IntrinsicProperty]
+        public string myString {
+            get { return null; }
+            set { }
+        }
+
+        [IntrinsicProperty]
+        public string this[string name] {
+            get { return null; }
+            set { }
+        }
+    }
+
+    public class App {
+
+        public App() {
+            MyElement elem = (MyElement)Document.GetElementById("foo");
+            string s = elem.myString;
+
+            elem["Smith"] = elem["Joe"];
+
+            int n = Math.Truncate(5.5);
+            XmlDocumentParser parser = new XmlDocumentParser();
+            XmlDocument doc = parser.ParseFromString("<markup></markup>", "text/xml");
+            Date d = Date.Parse("1/1/2010");
+        }
+    }
+}
diff --git a/tests/TestCases/Type/Interfaces/Baseline.txt b/tests/TestCases/Type/Interfaces/Baseline.txt
new file mode 100644
index 000000000..e4e79d061
--- /dev/null
+++ b/tests/TestCases/Type/Interfaces/Baseline.txt
@@ -0,0 +1,85 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.IMarker
+
+test.IMarker = function() { };
+test.IMarker.prototype = {
+
+}
+test.IMarker.registerInterface('test.IMarker');
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.ISerializable
+
+test.ISerializable = function() { };
+test.ISerializable.prototype = {
+    serialize : null
+}
+test.ISerializable.registerInterface('test.ISerializable');
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.IRunnable
+
+test.IRunnable = function() { };
+test.IRunnable.prototype = {
+    get_canRun : null,
+    run : null
+}
+test.IRunnable.registerInterface('test.IRunnable');
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyObject
+
+test.MyObject = function test_MyObject() {
+}
+test.MyObject.prototype = {
+    
+    dispose: function test_MyObject$dispose() {
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyObject2
+
+test.MyObject2 = function test_MyObject2() {
+    test.MyObject2.initializeBase(this);
+}
+test.MyObject2.prototype = {
+    
+    get_canRun: function test_MyObject2$get_canRun() {
+        return true;
+    },
+    
+    run: function test_MyObject2$run() {
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Foo
+
+test.Foo = function test_Foo() {
+}
+test.Foo.prototype = {
+    
+    get_canRun: function test_Foo$get_canRun() {
+        return true;
+    },
+    
+    run: function test_Foo$run() {
+    },
+    
+    serialize: function test_Foo$serialize() {
+        return null;
+    }
+}
+
+
+test.MyObject.registerClass('test.MyObject', null, ss.IDisposable);
+test.MyObject2.registerClass('test.MyObject2', test.MyObject, test.IRunnable);
+test.Foo.registerClass('test.Foo', null, test.IMarker, test.ISerializable, test.IRunnable);
diff --git a/tests/TestCases/Type/Interfaces/Code.cs b/tests/TestCases/Type/Interfaces/Code.cs
new file mode 100644
index 000000000..2616cecc5
--- /dev/null
+++ b/tests/TestCases/Type/Interfaces/Code.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace TypeTests {
+
+    public class MyObject : IDisposable {
+
+        public void dispose() {
+        }
+    }
+
+    public interface IMarker {
+    }
+
+    public interface ISerializable {
+
+        object serialize();
+    }
+
+    public interface IRunnable {
+
+        bool canRun { get; }
+
+        void run();
+    }
+
+    public class MyObject2 : MyObject, IRunnable {
+
+        public bool canRun { get { return true; } }
+
+        public void run() { }
+    }
+
+    public class Foo : IMarker, ISerializable, IRunnable {
+
+        public bool canRun { get { return true; } }
+
+        public void run() { }
+
+        public object serialize() { return null; }
+    }
+}
diff --git a/tests/TestCases/Type/Namespaces/Baseline.txt b/tests/TestCases/Type/Namespaces/Baseline.txt
new file mode 100644
index 000000000..5a6b1ac68
--- /dev/null
+++ b/tests/TestCases/Type/Namespaces/Baseline.txt
@@ -0,0 +1,95 @@
+Type.registerNamespace('TypeTests.Sub1.Sub2');
+
+////////////////////////////////////////////////////////////////////////////////
+// TypeTests.Sub1.Sub2.MyClass
+
+TypeTests.Sub1.Sub2.MyClass = function TypeTests_Sub1_Sub2_MyClass() {
+    var yc = new TypeTests.Sub1.YourClass();
+    yc.run();
+}
+
+
+Type.registerNamespace('TypeTests.Sub1');
+
+////////////////////////////////////////////////////////////////////////////////
+// TypeTests.Sub1.YourClass
+
+TypeTests.Sub1.YourClass = function TypeTests_Sub1_YourClass() {
+}
+TypeTests.Sub1.YourClass.prototype = {
+    
+    run: function TypeTests_Sub1_YourClass$run() {
+    }
+}
+
+
+Type.registerNamespace('TypeTests');
+
+////////////////////////////////////////////////////////////////////////////////
+// TypeTests.YourClass
+
+TypeTests.YourClass = function TypeTests_YourClass() {
+}
+
+
+Type.registerNamespace('MyApp.Foo');
+
+////////////////////////////////////////////////////////////////////////////////
+// MyApp.Foo.MyClass
+
+MyApp.Foo.MyClass = function MyApp_Foo_MyClass() {
+}
+
+
+Type.registerNamespace('MyApp');
+
+////////////////////////////////////////////////////////////////////////////////
+// MyApp.Test
+
+MyApp.Test = function MyApp_Test() {
+    var c = new TypeTests.Sub1.Sub2.MyClass();
+}
+
+
+Type.registerNamespace('MyCompany');
+
+////////////////////////////////////////////////////////////////////////////////
+// MyCompany.Utility
+
+MyCompany.Utility = function MyCompany_Utility() {
+}
+MyCompany.Utility.prototype = {
+    
+    run: function MyCompany_Utility$run() {
+    }
+}
+
+
+Type.registerNamespace('MyCompany.MyProduct');
+
+////////////////////////////////////////////////////////////////////////////////
+// MyCompany.MyProduct.Utility
+
+MyCompany.MyProduct.Utility = function MyCompany_MyProduct_Utility() {
+}
+
+
+Type.registerNamespace('MyCompany.MyProduct.MyComponent');
+
+////////////////////////////////////////////////////////////////////////////////
+// MyCompany.MyProduct.MyComponent.Component
+
+MyCompany.MyProduct.MyComponent.Component = function MyCompany_MyProduct_MyComponent_Component() {
+    var u = new MyCompany.Utility();
+    u.run();
+}
+
+
+TypeTests.Sub1.Sub2.MyClass.registerClass('TypeTests.Sub1.Sub2.MyClass');
+TypeTests.Sub1.YourClass.registerClass('TypeTests.Sub1.YourClass');
+TypeTests.YourClass.registerClass('TypeTests.YourClass');
+MyApp.Foo.MyClass.registerClass('MyApp.Foo.MyClass');
+MyApp.Test.registerClass('MyApp.Test');
+MyCompany.Utility.registerClass('MyCompany.Utility');
+MyCompany.MyProduct.Utility.registerClass('MyCompany.MyProduct.Utility');
+MyCompany.MyProduct.MyComponent.Component.registerClass('MyCompany.MyProduct.MyComponent.Component');
diff --git a/tests/TestCases/Type/Namespaces/Code.cs b/tests/TestCases/Type/Namespaces/Code.cs
new file mode 100644
index 000000000..2c2fb0f68
--- /dev/null
+++ b/tests/TestCases/Type/Namespaces/Code.cs
@@ -0,0 +1,76 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+
+namespace TypeTests.Sub1.Sub2 {
+
+    public class MyClass {
+
+        public MyClass() {
+            YourClass yc = new YourClass();
+            yc.Run();
+        }
+    }
+}
+
+namespace TypeTests.Sub1 {
+
+    public class YourClass {
+
+        public void Run() {
+        }
+    }
+}
+
+namespace TypeTests {
+
+    public class YourClass {
+    }
+}
+
+namespace MyApp.Foo {
+
+    public class MyClass {
+    }
+}
+
+namespace MyApp {
+
+    using TypeTests.Sub1.Sub2;
+
+    public class Test {
+
+        public Test() {
+            MyClass c = new MyClass();
+        }
+    }
+}
+
+namespace MyCompany {
+
+    public class Utility {
+
+        public void Run() {
+        }
+    }
+}
+
+namespace MyCompany.MyProduct {
+
+    public class Utility {
+    }
+}
+
+namespace MyCompany.MyProduct.MyComponent {
+
+    using MyCompany;
+
+    public class Component {
+
+        public Component() {
+            Utility u = new Utility();
+            u.Run();
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/TestCases/Type/Nullable/Baseline.txt b/tests/TestCases/Type/Nullable/Baseline.txt
new file mode 100644
index 000000000..d0014eccd
--- /dev/null
+++ b/tests/TestCases/Type/Nullable/Baseline.txt
@@ -0,0 +1,32 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function test_App() {
+}
+test.App.prototype = {
+    
+    method: function test_App$method() {
+        var i = 10;
+        var b = true;
+        var flag;
+        var num;
+        var num2;
+        var num3 = 100;
+        var xyz = false;
+        var ch;
+        var hasValue = ss.isValue(xyz) || ss.isValue(num3);
+        var num3_ = num3;
+        var f = (ss.isValue(flag)) ? flag : true;
+        xyz = true;
+        num2 = 10;
+        num = 1;
+        var boolVal = (flag || false);
+        var textVal = (ch || '');
+        var numVal = (num3 || 0);
+    }
+}
+
+
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Type/Nullable/Code.cs b/tests/TestCases/Type/Nullable/Code.cs
new file mode 100644
index 000000000..3701ba0b4
--- /dev/null
+++ b/tests/TestCases/Type/Nullable/Code.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace TypeTests {
+
+    public class App {
+    
+        public void Method() {
+            int i = 10;
+            bool b = true;
+            bool? flag;
+            int? num;
+            Nullable<int> num2;
+            Nullable<int> num3 = new Nullable<int>(100);
+            Nullable<bool> xyz = false;
+            char? ch;            
+            
+            bool hasValue = xyz.HasValue || num3.HasValue;
+            int num3_ = num3.Value;
+            bool f = flag.HasValue ? flag.Value : true;
+            
+            xyz = true;
+            num2 = 10;
+            num = 1;
+            
+            bool boolVal = flag.GetValueOrDefault();
+            char textVal = ch.GetValueOrDefault();
+            int numVal = num3.GetValueOrDefault();
+        }
+    }
+}
diff --git a/tests/TestCases/Type/Partials/Baseline.txt b/tests/TestCases/Type/Partials/Baseline.txt
new file mode 100644
index 000000000..5474356d1
--- /dev/null
+++ b/tests/TestCases/Type/Partials/Baseline.txt
@@ -0,0 +1,147 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.IMyInterface
+
+test.IMyInterface = function() { };
+test.IMyInterface.prototype = {
+    start : null,
+    Stop : null,
+    resume : null
+}
+test.IMyInterface.registerInterface('test.IMyInterface');
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.EmptyClass
+
+test.EmptyClass = function test_EmptyClass() {
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test._singleMemberClass
+
+test._singleMemberClass = function test__singleMemberClass() {
+}
+test._singleMemberClass.prototype = {
+    
+    run: function test__singleMemberClass$run() {
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.DerivedMemberClass
+
+test.DerivedMemberClass = function test_DerivedMemberClass() {
+    test.DerivedMemberClass.initializeBase(this);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MergedMembersClass
+
+test.MergedMembersClass = function test_MergedMembersClass() {
+}
+test.MergedMembersClass.prototype = {
+    foo: false,
+    bar: null,
+    
+    testMethod: function test_MergedMembersClass$testMethod() {
+        return null;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.DerivedMergedMembersClass
+
+test.DerivedMergedMembersClass = function test_DerivedMergedMembersClass() {
+    test.DerivedMergedMembersClass.initializeBase(this);
+    this.name = this.bar + this.bar + 'Name';
+}
+test.DerivedMergedMembersClass.prototype = {
+    name: null,
+    value: null,
+    
+    testMethod: function test_DerivedMergedMembersClass$testMethod() {
+        return null;
+    },
+    
+    testMethod2: function test_DerivedMergedMembersClass$testMethod2() {
+        return this.get_item('foo');
+    },
+    
+    someMethod: function test_DerivedMergedMembersClass$someMethod() {
+        var e1 = document.getElementById(this.bar);
+        var e2 = document.getElementById(this.name);
+        var e3 = document.getElementById(this.bar);
+        var s = this.testMethod() + test.DerivedMergedMembersClass.callBaseMethod(this, 'testMethod');
+    },
+    get_item: function test_DerivedMergedMembersClass$get_item(s) {
+        return s;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClass
+
+test.MyClass = function test_MyClass() {
+}
+test.MyClass.prototype = {
+    
+    start: function test_MyClass$start() {
+    },
+    
+    Stop: function test_MyClass$Stop() {
+    },
+    
+    resume: function test_MyClass$resume() {
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test._someClass
+
+test._someClass = function test__someClass() {
+}
+test._someClass.prototype = {
+    
+    close: function test__someClass$close() {
+    },
+    
+    _cancel: function test__someClass$_cancel() {
+    },
+    
+    run: function test__someClass$run() {
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.App
+
+test.App = function test_App() {
+    var s;
+    s.run();
+    var d;
+    d.bar = d.name;
+    d.value = d.foo;
+    var mc;
+    mc.start();
+    mc.Stop();
+    mc.resume();
+}
+
+
+test.EmptyClass.registerClass('test.EmptyClass');
+test._singleMemberClass.registerClass('test._singleMemberClass');
+test.DerivedMemberClass.registerClass('test.DerivedMemberClass', test._singleMemberClass);
+test.MergedMembersClass.registerClass('test.MergedMembersClass');
+test.DerivedMergedMembersClass.registerClass('test.DerivedMergedMembersClass', test.MergedMembersClass);
+test.MyClass.registerClass('test.MyClass', null, test.IMyInterface);
+test._someClass.registerClass('test._someClass');
+test.App.registerClass('test.App');
diff --git a/tests/TestCases/Type/Partials/Code1.cs b/tests/TestCases/Type/Partials/Code1.cs
new file mode 100644
index 000000000..e6ca81a5f
--- /dev/null
+++ b/tests/TestCases/Type/Partials/Code1.cs
@@ -0,0 +1,110 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace TypeTests {
+
+    public partial class EmptyClass {
+    }
+
+    partial class EmptyClass {
+    }
+
+    partial class SingleMemberClass {
+    }
+
+    internal partial class SingleMemberClass {
+        public bool Run() {
+        }
+    }
+
+    public class DerivedMemberClass : SingleMemberClass {
+    }
+
+    public partial class MergedMembersClass {
+        public bool Foo;
+    }
+
+    public partial class MergedMembersClass {
+        public string Bar;
+
+        public virtual string TestMethod() { return null; }
+    }
+
+    public partial class DerivedMergedMembersClass : MergedMembersClass {
+        public string Name;
+    }
+
+    public partial class DerivedMergedMembersClass {
+        public string Value;
+
+        public override string TestMethod() { return null; }
+
+        public string TestMethod2() {
+            return this["foo"];
+        }
+    }
+
+    public interface IMyInterface {
+        void Start();
+        [PreserveCase]
+        void Stop();
+        void Resume();
+    }
+
+    public partial class MyClass : IMyInterface {
+        public void Start() {
+        }
+
+        public void Stop() {
+        }
+    }
+
+    partial class ImportedClass {
+        public void Run() {
+        }
+    }
+
+
+    public partial class MyClass {
+        [PreserveCase]
+        public void Resume() {
+        }
+    }
+
+    [Imported]
+    internal partial class ImportedClass {
+    }
+
+    partial class SomeClass {
+        public bool Close() {
+	}
+
+        private void Cancel() {
+        }
+    }
+
+    internal partial class SomeClass {
+        public bool Run() {
+        }
+    }
+
+    public class App {
+
+        public App() {
+            SingleMemberClass s;
+            s.Run();
+
+            DerivedMergedMembersClass d;
+            d.Bar = d.Name;
+            d.Value = d.Foo;
+
+            MyClass mc;
+            mc.Start();
+            mc.Stop();
+            mc.Resume();
+        }
+    }
+}
diff --git a/tests/TestCases/Type/Partials/Code2.cs b/tests/TestCases/Type/Partials/Code2.cs
new file mode 100644
index 000000000..77e48ad1e
--- /dev/null
+++ b/tests/TestCases/Type/Partials/Code2.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Html;
+
+namespace TypeTests {
+
+    public partial class DerivedMergedMembersClass {
+
+        public DerivedMergedMembersClass() {
+            this.Name = this.Bar + base.Bar + "Name";
+        }
+
+        public string this[string s] {
+            get {
+                return s;
+            }
+        }
+
+        public void SomeMethod() {
+            Element e1 = Document.GetElementById(this.Bar);
+            Element e2 = Document.GetElementById(this.Name);
+            Element e3 = Document.GetElementById(base.Bar);
+
+            string s = TestMethod() + base.TestMethod();
+        }
+    }
+}
diff --git a/tests/TestCases/Type/Records/Baseline.txt b/tests/TestCases/Type/Records/Baseline.txt
new file mode 100644
index 000000000..d1c96ccc8
--- /dev/null
+++ b/tests/TestCases/Type/Records/Baseline.txt
@@ -0,0 +1,19 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Point
+
+test.$create_Point = function test_Point(x, y) {
+    var $o = { };
+    $o.x = x;
+    $o.y = y;
+    return $o;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// test.Pair
+
+test.$create_Pair = function test_Pair() { return {}; }
+
+
diff --git a/tests/TestCases/Type/Records/Code.cs b/tests/TestCases/Type/Records/Code.cs
new file mode 100644
index 000000000..c4dc87fcb
--- /dev/null
+++ b/tests/TestCases/Type/Records/Code.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace TypeTests {
+
+    public sealed class Point : Record {
+         public int x;
+         public int y;
+
+         public Point(int x, int y) {
+             this.x = x;
+             this.y = y;
+         }
+    }
+
+    public sealed class Pair : Record {
+        public object first;
+        public object second;
+    }
+}
diff --git a/tests/TestCases/Type/ScriptNamespaces/AppAssemblyInfo.cs b/tests/TestCases/Type/ScriptNamespaces/AppAssemblyInfo.cs
new file mode 100644
index 000000000..0b34758e9
--- /dev/null
+++ b/tests/TestCases/Type/ScriptNamespaces/AppAssemblyInfo.cs
@@ -0,0 +1,13 @@
+// AssemblyInfo.cs
+//
+// Assembly Metadata
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("My.App")]
+[assembly: AssemblyDescription("MyApp")]
+[assembly: ScriptAssembly("App")]
+[assembly: ScriptNamespace("MA")]
diff --git a/tests/TestCases/Type/ScriptNamespaces/AppBaseline.txt b/tests/TestCases/Type/ScriptNamespaces/AppBaseline.txt
new file mode 100644
index 000000000..b4aa6d17e
--- /dev/null
+++ b/tests/TestCases/Type/ScriptNamespaces/AppBaseline.txt
@@ -0,0 +1,65 @@
+Type.registerNamespace('MAF');
+
+Type.registerNamespace('MA');
+
+Type.registerNamespace('Test');
+
+////////////////////////////////////////////////////////////////////////////////
+// MAF.AppFeature
+
+MAF.AppFeature = function MAF_AppFeature(name) {
+    this._name = name;
+    this._feature = new MLF.Feature(name);
+}
+MAF.AppFeature.prototype = {
+    _name: null,
+    _feature: null,
+    
+    get_name: function MAF_AppFeature$get_name() {
+        return this._name;
+    },
+    set_name: function MAF_AppFeature$set_name(value) {
+        this._name = value;
+        return value;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// MA.MyApp
+
+MA.MyApp = function MA_MyApp(name, appFeatureName, libName, libFeatureName) {
+    this._name = name;
+    this._appfeature = new MAF.AppFeature(appFeatureName);
+    this._lib = new ML.MyLib('lib1', libName);
+    this._lib.set_feature(new MLF.Feature(libFeatureName));
+}
+MA.MyApp.prototype = {
+    _name: null,
+    _appfeature: null,
+    _lib: null,
+    
+    get_name: function MA_MyApp$get_name() {
+        return this._name;
+    },
+    
+    get_lib: function MA_MyApp$get_lib() {
+        return this._lib;
+    },
+    set_lib: function MA_MyApp$set_lib(value) {
+        this._lib = value;
+        return value;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Test.Foo
+
+Test.Foo = function Test_Foo() {
+}
+
+
+MAF.AppFeature.registerClass('MAF.AppFeature');
+MA.MyApp.registerClass('MA.MyApp');
+Test.Foo.registerClass('Test.Foo');
diff --git a/tests/TestCases/Type/ScriptNamespaces/AppFeature.cs b/tests/TestCases/Type/ScriptNamespaces/AppFeature.cs
new file mode 100644
index 000000000..5d400b007
--- /dev/null
+++ b/tests/TestCases/Type/ScriptNamespaces/AppFeature.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Runtime.CompilerServices;
+using My.Lib;
+
+namespace My.App {
+    [ScriptNamespace("MAF")]
+    public class AppFeature {
+        string _name;
+        Feature _feature;
+
+        public string Name {
+            get { return _name; }
+            set { _name = value; }
+        }
+
+        public AppFeature(string name) {
+            _name = name;
+            _feature = new Feature(name);            
+        }
+    }
+}
+
+
diff --git a/tests/TestCases/Type/ScriptNamespaces/AppFoo.1.cs b/tests/TestCases/Type/ScriptNamespaces/AppFoo.1.cs
new file mode 100644
index 000000000..7c5186043
--- /dev/null
+++ b/tests/TestCases/Type/ScriptNamespaces/AppFoo.1.cs
@@ -0,0 +1,8 @@
+using System;
+using My.Lib;
+
+namespace My.App {
+
+    public partial class Foo {
+    }
+}
diff --git a/tests/TestCases/Type/ScriptNamespaces/AppFoo.2.cs b/tests/TestCases/Type/ScriptNamespaces/AppFoo.2.cs
new file mode 100644
index 000000000..4c722f254
--- /dev/null
+++ b/tests/TestCases/Type/ScriptNamespaces/AppFoo.2.cs
@@ -0,0 +1,10 @@
+using System;
+using System.Runtime.CompilerServices;
+using My.Lib;
+
+namespace My.App {
+
+    [ScriptNamespace("Test")]
+    public partial class Foo {
+    }
+}
diff --git a/tests/TestCases/Type/ScriptNamespaces/AppMyApp.cs b/tests/TestCases/Type/ScriptNamespaces/AppMyApp.cs
new file mode 100644
index 000000000..19a8b434d
--- /dev/null
+++ b/tests/TestCases/Type/ScriptNamespaces/AppMyApp.cs
@@ -0,0 +1,28 @@
+using System;
+using My.Lib;
+
+namespace My.App {
+
+    public sealed class MyApp {
+
+        private string _name;
+        private AppFeature _appfeature;
+        private MyLib _lib;
+
+        public string Name {
+            get { return _name; }            
+        }
+
+        public MyLib Lib {
+            get { return _lib; }
+            set { _lib = value; }
+        }
+
+        public MyApp(string name, string appFeatureName, string libName, string libFeatureName) {
+            _name = name;
+            _appfeature = new AppFeature(appFeatureName);
+            _lib = new MyLib("lib1", libName);
+            _lib.Feature = new Feature(libFeatureName);
+        }
+    }
+}
diff --git a/tests/TestCases/Type/ScriptNamespaces/Lib.dll b/tests/TestCases/Type/ScriptNamespaces/Lib.dll
new file mode 100644
index 000000000..7f3c1a4e7
Binary files /dev/null and b/tests/TestCases/Type/ScriptNamespaces/Lib.dll differ
diff --git a/tests/TestCases/Type/ScriptNamespaces/Library.bat b/tests/TestCases/Type/ScriptNamespaces/Library.bat
new file mode 100644
index 000000000..479316237
--- /dev/null
+++ b/tests/TestCases/Type/ScriptNamespaces/Library.bat
@@ -0,0 +1 @@
+csc.exe /t:library /noconfig /nologo /nostdlib /r:..\..\..\..\bin\Debug\mscorlib.dll /out:Lib.dll Library*.cs
diff --git a/tests/TestCases/Type/ScriptNamespaces/LibraryAssemblyInfo.cs b/tests/TestCases/Type/ScriptNamespaces/LibraryAssemblyInfo.cs
new file mode 100644
index 000000000..f8716a28d
--- /dev/null
+++ b/tests/TestCases/Type/ScriptNamespaces/LibraryAssemblyInfo.cs
@@ -0,0 +1,11 @@
+// AssemblyInfo.cs
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: AssemblyTitle("My.Lib")]
+[assembly: AssemblyDescription("MyLib")]
+[assembly: ScriptAssembly("Lib")]
+[assembly: ScriptNamespace("ML")]
diff --git a/tests/TestCases/Type/ScriptNamespaces/LibraryBaseline.txt b/tests/TestCases/Type/ScriptNamespaces/LibraryBaseline.txt
new file mode 100644
index 000000000..a1f473456
--- /dev/null
+++ b/tests/TestCases/Type/ScriptNamespaces/LibraryBaseline.txt
@@ -0,0 +1,50 @@
+Type.registerNamespace('MLF');
+
+Type.registerNamespace('ML');
+
+////////////////////////////////////////////////////////////////////////////////
+// MLF.Feature
+
+MLF.Feature = function MLF_Feature(name) {
+    this._name = name;
+}
+MLF.Feature.prototype = {
+    _name: null,
+    
+    get_name: function MLF_Feature$get_name() {
+        return this._name;
+    },
+    set_name: function MLF_Feature$set_name(value) {
+        this._name = value;
+        return value;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// ML.MyLib
+
+ML.MyLib = function ML_MyLib(name, featureName) {
+    this._name = name;
+    this._feature = new MLF.Feature(featureName);
+}
+ML.MyLib.prototype = {
+    _name: null,
+    _feature: null,
+    
+    get_name: function ML_MyLib$get_name() {
+        return this._name;
+    },
+    
+    get_feature: function ML_MyLib$get_feature() {
+        return this._feature;
+    },
+    set_feature: function ML_MyLib$set_feature(value) {
+        this._feature = value;
+        return value;
+    }
+}
+
+
+MLF.Feature.registerClass('MLF.Feature');
+ML.MyLib.registerClass('ML.MyLib');
diff --git a/tests/TestCases/Type/ScriptNamespaces/LibraryFeature.cs b/tests/TestCases/Type/ScriptNamespaces/LibraryFeature.cs
new file mode 100644
index 000000000..fd362e263
--- /dev/null
+++ b/tests/TestCases/Type/ScriptNamespaces/LibraryFeature.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Runtime.CompilerServices;
+
+namespace My.Lib {
+    [ScriptNamespace("MLF")]
+    public class Feature {
+        string _name;
+
+        public string Name {
+            get { return _name; }
+            set { _name = value; }
+        }
+
+        public Feature(string name) {
+            _name = name;
+        }
+    }
+}
diff --git a/tests/TestCases/Type/ScriptNamespaces/LibraryMyLib.cs b/tests/TestCases/Type/ScriptNamespaces/LibraryMyLib.cs
new file mode 100644
index 000000000..220bfedaf
--- /dev/null
+++ b/tests/TestCases/Type/ScriptNamespaces/LibraryMyLib.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace My.Lib {
+
+    public sealed class MyLib {
+        private string _name;
+        private Feature _feature;
+
+        public MyLib(string name, string featureName) {
+            _name = name;
+            _feature = new Feature(featureName);
+        }
+
+        public string Name {
+            get { return _name; }
+        }
+        
+        public Feature Feature {
+            get { return _feature; }
+            set { _feature = value; }
+        }
+    }
+}
diff --git a/tests/TestCases/Type/UsingAlias/Baseline.txt b/tests/TestCases/Type/UsingAlias/Baseline.txt
new file mode 100644
index 000000000..fec6f793a
--- /dev/null
+++ b/tests/TestCases/Type/UsingAlias/Baseline.txt
@@ -0,0 +1,13 @@
+Type.registerNamespace('test');
+
+////////////////////////////////////////////////////////////////////////////////
+// test.MyClass
+
+test.MyClass = function test_MyClass() {
+    var body = document.body;
+    var head = document.getElementsByTagName('head')[0];
+    head.appendChild(body);
+}
+
+
+test.MyClass.registerClass('test.MyClass');
diff --git a/tests/TestCases/Type/UsingAlias/Code.cs b/tests/TestCases/Type/UsingAlias/Code.cs
new file mode 100644
index 000000000..b4510d699
--- /dev/null
+++ b/tests/TestCases/Type/UsingAlias/Code.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Html;
+using HtmlElement = System.Html.Element;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace TypeTests {
+
+    public class MyClass {
+
+        public MyClass() {
+            HtmlElement body = Document.Body;
+            HtmlElement head = Document.GetElementsByTagName("head")[0];
+            head.AppendChild(body);
+        }
+    }
+}
diff --git a/tests/TestCases/Validation/ConflictingTypes/Code.cs b/tests/TestCases/Validation/ConflictingTypes/Code.cs
new file mode 100644
index 000000000..d51b1b728
--- /dev/null
+++ b/tests/TestCases/Validation/ConflictingTypes/Code.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ValidationTests {
+
+    public class App {
+    }
+}
+
+namespace OtherTests {
+
+    public class App {
+    }
+}
diff --git a/tests/TestCases/Validation/CreateInstance/Code.cs b/tests/TestCases/Validation/CreateInstance/Code.cs
new file mode 100644
index 000000000..466ad9fde
--- /dev/null
+++ b/tests/TestCases/Validation/CreateInstance/Code.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ValidationTests {
+
+    public class Foo {
+
+        public Foo(int i, int j) {
+        }
+    }
+
+    public class Bar {
+
+        public Bar() {
+        }
+    }
+
+    public class Test {
+    
+        private static Type GetObjectType() {
+            return typeof(Foo);
+        }
+
+        private static Type OtherObjectType {
+            get {
+                return typeof(Bar);
+            }
+        }
+
+        public static void Main() {
+            object o1 = Script.CreateInstance(typeof(Bar));
+            object o2 = Script.CreateInstance(typeof(Foo), 0, 0);
+
+            object o3 = Script.CreateInstance(GetObjectType(), 1, 1);
+            object o4 = Script.CreateInstance(OtherObjectType);
+        }
+    }
+}
diff --git a/tests/TestCases/Validation/Exceptions/Code.cs b/tests/TestCases/Validation/Exceptions/Code.cs
new file mode 100644
index 000000000..cf8de7a90
--- /dev/null
+++ b/tests/TestCases/Validation/Exceptions/Code.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ValidationTests {
+
+    public class Test {
+
+        public void Foo() {
+            try {
+            }
+            catch (Exception e) {
+            }
+            catch (Object o) {
+            }
+            finally {
+            }
+        }
+
+        public void Foo2() {
+            try {
+            }
+            catch (Exception e) {
+                throw;
+            }
+            finally {
+            }
+        }
+
+        public void Foo3() {
+            try {
+            }
+            catch (Exception) {
+            }
+            finally {
+            }
+        }
+
+        public void Foo4() {
+            try {
+            }
+            catch {
+            }
+            finally {
+            }
+        }
+    }
+}
diff --git a/tests/TestCases/Validation/ImplicitEnums/Code.cs b/tests/TestCases/Validation/ImplicitEnums/Code.cs
new file mode 100644
index 000000000..88676860a
--- /dev/null
+++ b/tests/TestCases/Validation/ImplicitEnums/Code.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ValidationTests {
+
+    public enum Test {
+
+        A = 0,
+
+        B
+    }
+}
diff --git a/tests/TestCases/Validation/InlineScript/Code.cs b/tests/TestCases/Validation/InlineScript/Code.cs
new file mode 100644
index 000000000..738742e99
--- /dev/null
+++ b/tests/TestCases/Validation/InlineScript/Code.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ValidationTests {
+
+    public class App {
+
+        public void Test(int arg) {
+            int a = 10;
+            string scriptTemplate = "alert({0} + {1})";
+            
+            Script.Literal(scriptTemplate, a, a);
+        }
+    }
+}
diff --git a/tests/TestCases/Validation/Keywords/Code.cs b/tests/TestCases/Validation/Keywords/Code.cs
new file mode 100644
index 000000000..8c5d9e092
--- /dev/null
+++ b/tests/TestCases/Validation/Keywords/Code.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ValidationTests {
+
+    public class App {
+
+        public static void M1() {
+            int ss = 1;
+        }
+        
+        public static void M2() {
+            int instanceof = 1;
+        }
+    }
+}
diff --git a/tests/TestCases/Validation/NestedTypes/Code.cs b/tests/TestCases/Validation/NestedTypes/Code.cs
new file mode 100644
index 000000000..fdb94f884
--- /dev/null
+++ b/tests/TestCases/Validation/NestedTypes/Code.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ValidationTests {
+
+    public class Test {
+
+        public enum Foo {
+            A = 0, B = 1
+        }
+
+        public class TestEx {
+        }
+    }
+}
diff --git a/tests/TestCases/Validation/Overloads/Code.cs b/tests/TestCases/Validation/Overloads/Code.cs
new file mode 100644
index 000000000..9649431aa
--- /dev/null
+++ b/tests/TestCases/Validation/Overloads/Code.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ValidationTests {
+
+    public abstract class Test {
+
+        [AlternateSignature]
+        public static extern void DoSomething();
+
+        [AlternateSignature]
+        public extern void Invoke(Action successCallback);
+
+        [AlternateSignature]
+        public extern void Invoke(Action successCallback, Action errorCallback);
+
+        public static void Invoke(Action successCallback, Action errorCallback, object context) {
+        }
+    }
+}
diff --git a/tests/TestCases/Validation/Properties/Code.cs b/tests/TestCases/Validation/Properties/Code.cs
new file mode 100644
index 000000000..1ac164236
--- /dev/null
+++ b/tests/TestCases/Validation/Properties/Code.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ValidationTests {
+
+    public class Test {
+
+        public int Foo {
+            set {
+            }
+        }
+    }
+}
diff --git a/tests/TestCases/Validation/Unsupported/Code1.cs b/tests/TestCases/Validation/Unsupported/Code1.cs
new file mode 100644
index 000000000..7b745ae34
--- /dev/null
+++ b/tests/TestCases/Validation/Unsupported/Code1.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ValidationTests {
+
+    public class Test : IDisposable {
+
+        public Test() {
+        }
+
+        ~Test() {
+        }
+
+        public void Foo() {
+            using (new Test()) {
+            }
+        }
+    }
+
+    public interface IBase {
+    }
+
+    public interface IFoo : IBase {
+    }
+}
diff --git a/tests/TestCases/Validation/Unsupported/Code2.cs b/tests/TestCases/Validation/Unsupported/Code2.cs
new file mode 100644
index 000000000..edfac2735
--- /dev/null
+++ b/tests/TestCases/Validation/Unsupported/Code2.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Runtime.CompilerServices;
+
+[assembly: ScriptAssembly("test")]
+[assembly: ScriptNamespace("test")]
+
+namespace ValidationTests {
+
+    public class Test : IDisposable {
+
+        public Test() {
+            System.Diagnostics.Debug.Fail("...");
+        }
+    }
+}
diff --git a/tools/Preprocessor/Application.cs b/tools/Preprocessor/Application.cs
new file mode 100644
index 000000000..58e12ba6e
--- /dev/null
+++ b/tools/Preprocessor/Application.cs
@@ -0,0 +1,161 @@
+// Application.cs
+// Script#/Tools/Preprocessor
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+
+namespace ScriptSharp {
+
+    internal sealed class Application : IStreamResolver, IErrorHandler {
+
+        private static readonly string AboutTextFormat = @"
+Script# Preprocessor v{0} (Script minimizer/merger)
+Written by Nikhil Kothari.
+More information at http://projects.nikhilk.net/ScriptSharp.
+";
+
+        private static readonly string UsageText =
+@"Usage:
+sspp [/?] [/nologo] [/noMin] [/debug] [/browser:<browser_name>]
+     [/d:define_1,...define_n]
+     /input:<jsa file> /output:<js file>
+
+/nologo  - Suppresses the about information.
+/noMin   - Suppress the minimizer.
+           If minimization is turned on you can add /stripCommentsOnly
+           to only minimize comments, and leave spaces intact.
+/debug   - Turns on debug mode (defines the DEBUG preprocessor variable)
+           (implies /noMin)
+/d       - Allows you to define one or more additional preprocessor variables.
+/crlf    - Use Windows-style line breaks
+/input   - Specifies the input .jsa file (required)
+/output  - Specifies the output .js file (required)
+/?       - Shows usage information.";
+
+        private CommandLine _commandLine;
+
+        public Application(string[] args) {
+            _commandLine = new CommandLine(args);
+        }
+
+        public bool Execute() {
+            if (_commandLine.ShowHelp) {
+                ShowHelp();
+                return true;
+            }
+
+            List<string> predefinedVariables = new List<string>();
+            bool debug = false;
+            bool minimize = true;
+            bool stripCommentsOnly = false;
+            bool useWindowsLineBreaks = false;
+
+            if (_commandLine.Options.Contains("debug")) {
+                predefinedVariables.Add("DEBUG");
+                debug = true;
+            }
+
+            string definesArgument = (string)_commandLine.Options["d"];
+            if (definesArgument != null) {
+                string[] defines = definesArgument.Split(',');
+                predefinedVariables.AddRange(defines);
+            }
+
+            if (_commandLine.Options.Contains("noMin")) {
+                minimize = false;
+            }
+
+            if (minimize) {
+                if (_commandLine.Options.Contains("stripCommentsOnly")) {
+                    stripCommentsOnly = true;
+                }
+            }
+
+            if (_commandLine.Options.Contains("crlf")) {
+                useWindowsLineBreaks = true;
+            }
+
+            string inputFile = (string)_commandLine.Options["input"];
+            string outputFile = (string)_commandLine.Options["output"];
+
+            if (String.IsNullOrEmpty(inputFile)) {
+                ShowError("Input file was not specified.");
+                return false;
+            }
+            if (File.Exists(inputFile) == false) {
+                ShowError("The specified input file does not exist.");
+                return false;
+            }
+
+            PreprocessorOptions options = new PreprocessorOptions();
+            options.SourceFile = new FileInputStreamSource(inputFile);
+            options.TargetFile = new FileOutputStreamSource(outputFile);
+            options.DebugFlavor = debug;
+            options.Minimize = minimize;
+            options.StripCommentsOnly = stripCommentsOnly;
+            options.UseWindowsLineBreaks = useWindowsLineBreaks;
+            options.PreprocessorVariables = predefinedVariables;
+
+            try {
+                if (_commandLine.HideAbout == false) {
+                    Console.WriteLine(GetAboutString());
+                }
+
+                ScriptPreprocessor preprocessor = new ScriptPreprocessor(this, this);
+                preprocessor.Preprocess(options);
+
+                return true;
+            }
+            catch (Exception e) {
+                ShowError("Unhandled Exception: " + Environment.NewLine + e.Message);
+            }
+
+            return false;
+        }
+
+        private string GetAboutString() {
+            Version versionInfo = typeof(Application).Assembly.GetName().Version;
+            return String.Format(AboutTextFormat, versionInfo);
+        }
+
+        [STAThread]
+        public static int Main(string[] args) {
+            Application app = new Application(args);
+            bool success = app.Execute();
+
+            return success ? 0 : 1;
+        }
+
+        private void ShowError(string error) {
+            if (_commandLine.HideAbout == false) {
+                Console.WriteLine(GetAboutString());
+                Console.WriteLine();
+            }
+
+            Console.WriteLine(error);
+        }
+
+        private void ShowHelp() {
+            Console.WriteLine(GetAboutString());
+            Console.WriteLine(UsageText);
+        }
+
+        #region Implementation of IErrorHandler
+        void IErrorHandler.ReportError(string errorMessage, string location) {
+            ShowError("Error in input at " + location + ": " + errorMessage);
+        }
+        #endregion
+
+        #region Implementation of IStreamResolver
+        IStreamSource IStreamResolver.ResolveInclude(IStreamSource baseStream, string includePath) {
+            string resolvedPath = Path.Combine(Path.GetDirectoryName(Path.GetFullPath(baseStream.FullName)), includePath);
+            return new FileInputStreamSource(resolvedPath);
+        }
+        #endregion
+    }
+}
diff --git a/tools/Preprocessor/CommandLine.cs b/tools/Preprocessor/CommandLine.cs
new file mode 100644
index 000000000..28e421b9e
--- /dev/null
+++ b/tools/Preprocessor/CommandLine.cs
@@ -0,0 +1,134 @@
+// CommandLine.cs
+// Script#/Common
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.Globalization;
+using System.IO;
+
+namespace ScriptSharp {
+
+    internal sealed class CommandLine {
+
+        private string[] _arguments;
+        private IDictionary _options;
+        private bool _showHelp;
+        private bool _hideAbout;
+
+        public CommandLine(string[] args) {
+            if (args == null) {
+                throw new ArgumentNullException("args");
+            }
+            args = ExpandResponseFileArguments(args);
+
+            ArrayList argList = new ArrayList();
+
+            for (int i = 0; i < args.Length; i++) {
+                char c = args[i][0];
+                if ((c != '/') && (c != '-')) {
+                    argList.Add(args[i]);
+                }
+                else {
+                    int index = args[i].IndexOf(':');
+                    if (index == -1) {
+                        string option = args[i].Substring(1);
+                        if ((String.Compare(option, "help", StringComparison.OrdinalIgnoreCase) == 0) ||
+                            (String.Compare(option, "?", StringComparison.Ordinal) == 0)) {
+                            _showHelp = true;
+                        }
+                        else if (String.Compare(option, "nologo", StringComparison.OrdinalIgnoreCase) == 0) {
+                            _hideAbout = true;
+                        }
+                        else {
+                            Options[option] = String.Empty;
+                        }
+                    }
+                    else {
+                        string optionName = args[i].Substring(1, index - 1);
+                        string optionValue = args[i].Substring(index + 1);
+
+                        if (Options.Contains(optionName)) {
+                            object existingValue = Options[optionName];
+                            if (existingValue is string) {
+                                ArrayList valueList = new ArrayList();
+                                valueList.Add(existingValue);
+                                valueList.Add(optionValue);
+
+                                Options[optionName] = valueList;
+                            }
+                            else {
+                                Debug.Assert(existingValue is ArrayList);
+
+                                ArrayList valueList = (ArrayList)existingValue;
+                                valueList.Add(optionValue);
+                            }
+                        }
+                        else {
+                            Options[optionName] = optionValue;
+                        }
+                    }
+                }
+            }
+            _arguments = (string[])argList.ToArray(typeof(string));
+        }
+
+        public string[] Arguments {
+            get {
+                return _arguments;
+            }
+        }
+
+        public bool HideAbout {
+            get {
+                return _hideAbout;
+            }
+        }
+
+        public IDictionary Options {
+            get {
+                if (_options == null) {
+                    _options = new HybridDictionary(true);
+                }
+                return _options;
+            }
+        }
+
+        public bool ShowHelp {
+            get {
+                return _showHelp;
+            }
+        }
+
+        private string[] ExpandResponseFileArguments(string[] args) {
+            List<string> expandedArgs = new List<string>();
+
+            for (int i = 0; i < args.Length; i++) {
+                if ((args[i].Length > 1) && args[i].StartsWith("@")) {
+                    string responseFile = args[i].Substring(1);
+
+                    if (File.Exists(responseFile)) {
+                        using (TextReader reader = File.OpenText(responseFile)) {
+                            string line;
+                            while ((line = reader.ReadLine()) != null) {
+                                line = line.Trim();
+                                if (line.Length > 0) {
+                                    expandedArgs.Add(line);
+                                }
+                            }
+                        }
+                    }
+                }
+                else {
+                    expandedArgs.Add(args[i]);
+                }
+            }
+
+            return expandedArgs.ToArray();
+        }
+    }
+}
diff --git a/tools/Preprocessor/FileInputStreamSource.cs b/tools/Preprocessor/FileInputStreamSource.cs
new file mode 100644
index 000000000..7c28e26a7
--- /dev/null
+++ b/tools/Preprocessor/FileInputStreamSource.cs
@@ -0,0 +1,54 @@
+// FileInputStreamSource.cs
+// Script#/Common
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.IO;
+
+namespace ScriptSharp {
+
+    internal class FileInputStreamSource : IStreamSource {
+
+        private string _path;
+        private string _name;
+
+        public FileInputStreamSource(string path)
+            : this(path, path) {
+        }
+
+        public FileInputStreamSource(string path, string name) {
+            _path = path;
+            _name = name;
+        }
+
+        public string FullName {
+            get {
+                return Path.GetFullPath(_path);
+            }
+        }
+
+        public string Name {
+            get {
+                return _name;
+            }
+        }
+
+        public void CloseStream(Stream stream) {
+            Debug.Assert(stream != null);
+            Debug.Assert(stream is FileStream);
+
+            stream.Close();
+        }
+
+        public Stream GetStream() {
+            try {
+                return new FileStream(FullName, FileMode.Open, FileAccess.Read, FileShare.Read);
+            }
+            catch {
+                return null;
+            }
+        }
+    }
+}
diff --git a/tools/Preprocessor/FileOutputStreamSource.cs b/tools/Preprocessor/FileOutputStreamSource.cs
new file mode 100644
index 000000000..ea87a0ea9
--- /dev/null
+++ b/tools/Preprocessor/FileOutputStreamSource.cs
@@ -0,0 +1,61 @@
+// FileOutputStreamSource.cs
+// Script#/Common
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Diagnostics;
+using System.IO;
+
+namespace ScriptSharp {
+
+    internal class FileOutputStreamSource : IStreamSource {
+
+        private string _path;
+        private string _name;
+
+        public FileOutputStreamSource(string path)
+            : this(path, path) {
+        }
+
+        public FileOutputStreamSource(string path, string name) {
+            _path = path;
+            _name = name;
+        }
+
+        public string FullName {
+            get {
+                return Path.GetFullPath(_path);
+            }
+        }
+
+        public string Name {
+            get {
+                return _name;
+            }
+        }
+
+        public void CloseStream(Stream stream) {
+            Debug.Assert(stream != null);
+            Debug.Assert(stream is FileStream);
+
+            stream.Close();
+        }
+
+        public Stream GetStream() {
+            try {
+                string file = FullName;
+
+                string directory = Path.GetDirectoryName(file);
+                if (Directory.Exists(directory) == false) {
+                    Directory.CreateDirectory(directory);
+                }
+
+                return new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None);
+            }
+            catch {
+                return null;
+            }
+        }
+    }
+}
diff --git a/tools/Preprocessor/IErrorHandler.cs b/tools/Preprocessor/IErrorHandler.cs
new file mode 100644
index 000000000..789045d3e
--- /dev/null
+++ b/tools/Preprocessor/IErrorHandler.cs
@@ -0,0 +1,14 @@
+// IErrorHandler.cs
+// Script#/Core/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp {
+
+    public interface IErrorHandler {
+
+        void ReportError(string errorMessage, string location);
+    }
+}
diff --git a/tools/Preprocessor/IScriptInfo.cs b/tools/Preprocessor/IScriptInfo.cs
new file mode 100644
index 000000000..e913464e9
--- /dev/null
+++ b/tools/Preprocessor/IScriptInfo.cs
@@ -0,0 +1,15 @@
+// IScriptInfo.cs
+// Script#/Core/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.IO;
+
+namespace ScriptSharp {
+
+    internal interface IScriptInfo {
+
+        string GetValue(string name);
+    }
+}
diff --git a/tools/Preprocessor/IStreamResolver.cs b/tools/Preprocessor/IStreamResolver.cs
new file mode 100644
index 000000000..b88002f6c
--- /dev/null
+++ b/tools/Preprocessor/IStreamResolver.cs
@@ -0,0 +1,15 @@
+// IStreamResolver.cs
+// Script#/Core/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.IO;
+
+namespace ScriptSharp {
+
+    public interface IStreamResolver {
+
+        IStreamSource ResolveInclude(IStreamSource baseStream, string includePath);
+    }
+}
diff --git a/tools/Preprocessor/IStreamSource.cs b/tools/Preprocessor/IStreamSource.cs
new file mode 100644
index 000000000..74aa4e792
--- /dev/null
+++ b/tools/Preprocessor/IStreamSource.cs
@@ -0,0 +1,25 @@
+// IStreamSource.cs
+// Script#/Core/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.IO;
+
+namespace ScriptSharp {
+
+    public interface IStreamSource {
+
+        string FullName {
+            get;
+        }
+
+        string Name {
+            get;
+        }
+
+        void CloseStream(Stream stream);
+
+        Stream GetStream();
+    }
+}
diff --git a/tools/Preprocessor/Preprocessor.csproj b/tools/Preprocessor/Preprocessor.csproj
new file mode 100644
index 000000000..6abad217c
--- /dev/null
+++ b/tools/Preprocessor/Preprocessor.csproj
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.21022</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{35370E49-29C1-4121-A357-3CCE460B7CF5}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ScriptSharp</RootNamespace>
+    <AssemblyName>sspp</AssemblyName>
+    <SignAssembly>false</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\..\ScriptSharp.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>false</DelaySign>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CommandLine.cs" />
+    <Compile Include="FileInputStreamSource.cs" />
+    <Compile Include="FileOutputStreamSource.cs" />
+    <Compile Include="IErrorHandler.cs" />
+    <Compile Include="IScriptInfo.cs" />
+    <Compile Include="IStreamResolver.cs" />
+    <Compile Include="IStreamSource.cs" />
+    <Compile Include="PreprocessorOptions.cs" />
+    <Compile Include="Preprocessor\CondenserTextReader.cs" />
+    <Compile Include="Preprocessor\PreprocessorException.cs" />
+    <Compile Include="Preprocessor\PreprocessorTextReader.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Application.cs" />
+    <Compile Include="ScriptPreprocessor.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/tools/Preprocessor/Preprocessor.sln b/tools/Preprocessor/Preprocessor.sln
new file mode 100644
index 000000000..cd2cc6431
--- /dev/null
+++ b/tools/Preprocessor/Preprocessor.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Preprocessor", "Preprocessor.csproj", "{35370E49-29C1-4121-A357-3CCE460B7CF5}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{35370E49-29C1-4121-A357-3CCE460B7CF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35370E49-29C1-4121-A357-3CCE460B7CF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35370E49-29C1-4121-A357-3CCE460B7CF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35370E49-29C1-4121-A357-3CCE460B7CF5}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/tools/Preprocessor/Preprocessor/CondenserTextReader.cs b/tools/Preprocessor/Preprocessor/CondenserTextReader.cs
new file mode 100644
index 000000000..1295be2b1
--- /dev/null
+++ b/tools/Preprocessor/Preprocessor/CondenserTextReader.cs
@@ -0,0 +1,210 @@
+// CondenserTextReader.cs
+// Script#/Core/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+
+namespace ScriptSharp.Preprocessor {
+
+    internal sealed class CondenserTextReader : TextReader {
+
+        private PreprocessorTextReader _sourceTextReader;
+        private bool _stripCommentsOnly;
+
+        private int _peekedCharacter;
+        private int _lastCharacter;
+
+        private bool _inDoubleQuotedString;
+        private bool _inSingleQuotedString;
+        private bool _inStringEscape;
+        private bool _inRegex;
+        private bool _inRegexEscape;
+        private bool _inSignificantComment;
+        private bool _inSignificantCommentStart;
+
+        public CondenserTextReader(PreprocessorTextReader sourceTextReader, bool stripCommentsOnly) {
+            Debug.Assert(sourceTextReader != null);
+            _sourceTextReader = sourceTextReader;
+            _stripCommentsOnly = stripCommentsOnly;
+
+            _peekedCharacter = -1;
+            _lastCharacter = ' ';
+        }
+
+        private int GetNextCharacter() {
+            int ch = -1;
+
+            while (ch == -1) {
+                ch = _sourceTextReader.Read();
+
+                if (ch == -1) {
+                    break;
+                }
+
+                if (_inStringEscape) {
+                    _inStringEscape = false;
+                }
+                else if (_inRegexEscape) {
+                    _inRegexEscape = false;
+                }
+                else if (_inDoubleQuotedString) {
+                    if (ch == '"') {
+                        _inDoubleQuotedString = false;
+                    }
+                    else if (ch == '\\') {
+                        _inStringEscape = true;
+                    }
+                }
+                else if (_inSingleQuotedString) {
+                    if (ch == '\'') {
+                        _inSingleQuotedString = false;
+                    }
+                    else if (ch == '\\') {
+                        _inStringEscape = true;
+                    }
+                }
+                else if (_inRegex) {
+                    if (ch == '/') {
+                        _inRegex = false;
+                    }
+                    else if (ch == '\\') {
+                        _inRegexEscape = true;
+                    }
+                }
+                else if (_inSignificantComment) {
+                    if (_inSignificantCommentStart) {
+                        Debug.Assert(ch == '!');
+                        ch = '/';
+
+                        _inSignificantCommentStart = false;
+                    }
+                    if (ch == '\n') {
+                        _inSignificantComment = false;
+                    }
+                }
+                else {
+                    if ((_stripCommentsOnly == false) && ((ch == ' ') || (ch == '\t') || (ch == '\n'))) {
+                        if (ch == '\t') {
+                            ch = ' ';
+                        }
+                        if ((_lastCharacter == ' ') || (_lastCharacter == '\n') ||
+                            (IsSpaceSignificantAfter(_lastCharacter) == false) ||
+                            (IsSpaceSignificantBefore(_sourceTextReader.Peek()) == false)) {
+                            ch = -1;
+                        }
+                    }
+                    else if (ch == '\'') {
+                        _inSingleQuotedString = true;
+                    }
+                    else if (ch == '"') {
+                        _inDoubleQuotedString = true;
+                    }
+                    else if (ch == '/') {
+                        int nextChar = _sourceTextReader.Peek();
+                        if (nextChar == '/') {
+                            // Process single line comment to strip it out, unless the
+                            // comment is significant, i.e., //!
+
+                            // First consume the peeked '/', and then read until we see a new line
+                            // or end of input itself.
+                            _sourceTextReader.Read();
+
+                            nextChar = _sourceTextReader.Peek();
+                            if (nextChar == '!') {
+                                _inSignificantComment = true;
+                                _inSignificantCommentStart = true;
+                            }
+                            else {
+                                for (; ; ) {
+                                    ch = _sourceTextReader.Read();
+                                    if ((ch == '\n') || (ch == -1)) {
+                                        ch = -1;
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                        else if (nextChar == '*') {
+                            // Process multiline comment to strip it out.
+
+                            // First consume the peeked '*', and then read until we see the
+                            // */ comment terminator.
+                            _sourceTextReader.Read();
+                            for (; ; ) {
+                                ch = _sourceTextReader.Read();
+                                if (ch == '*') {
+                                    if (_sourceTextReader.Peek() == '/') {
+                                        _sourceTextReader.Read();
+
+                                        ch = -1;
+                                        break;
+                                    }
+                                }
+                                else if (ch == -1) {
+                                    RaiseError("Unterminated multiline comment.");
+                                }
+                            }
+                        }
+                        else {
+                            if ((_lastCharacter == '=') || (_lastCharacter == ':') ||
+                                (_lastCharacter == '(') || (_lastCharacter == ',')) {
+                                _inRegex = true;
+                            }
+                        }
+                    }
+                }
+            }
+
+            return ch;
+        }
+
+        private bool IsIdentifierCharacter(int ch) {
+            return ((ch == '_') || (ch == '$') || (ch > 127) ||
+                    ((ch >= 'a') && (ch <= 'z')) ||
+                    ((ch >= 'A') && (ch <= 'Z')) ||
+                    ((ch >= '0') && (ch <= '9')));
+        }
+
+        private bool IsSpaceSignificantAfter(int ch) {
+            return IsIdentifierCharacter(ch) || (ch == '\\') || (ch == '}');
+        }
+
+        private bool IsSpaceSignificantBefore(int ch) {
+            return IsIdentifierCharacter(ch);
+        }
+
+        public override int Peek() {
+            if (_peekedCharacter == -1) {
+                _peekedCharacter = GetNextCharacter();
+            }
+
+            return _peekedCharacter;
+        }
+
+        private void RaiseError(string errorMessage) {
+            throw new PreprocessorException(errorMessage, _sourceTextReader.CurrentLine, _sourceTextReader.CurrentFile, _sourceTextReader.CurrentLineNumber);
+        }
+
+        public override int Read() {
+            if (_peekedCharacter != -1) {
+                _lastCharacter = _peekedCharacter;
+                _peekedCharacter = -1;
+                return _lastCharacter;
+            }
+
+            _lastCharacter = GetNextCharacter();
+
+            if ((_lastCharacter == -1) && 
+                (_inDoubleQuotedString || _inSingleQuotedString)) {
+                RaiseError("Unterminated string.");
+            }
+
+            return _lastCharacter;
+        }
+    }
+}
diff --git a/tools/Preprocessor/Preprocessor/PreprocessorException.cs b/tools/Preprocessor/Preprocessor/PreprocessorException.cs
new file mode 100644
index 000000000..e6cf68676
--- /dev/null
+++ b/tools/Preprocessor/Preprocessor/PreprocessorException.cs
@@ -0,0 +1,48 @@
+// PreprocessorException.cs
+// Script#/Core/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+
+namespace ScriptSharp.Preprocessor {
+
+    internal sealed class PreprocessorException : Exception {
+
+        private int _line;
+        private string _sourceFile;
+        private string _sourceCode;
+
+        public PreprocessorException(string message, string sourceCode, string sourceFile, int line)
+            : base(message) {
+            _sourceFile = sourceFile;
+            _line = line;
+            _sourceCode = sourceCode;
+        }
+
+        public PreprocessorException(string message, Exception innerException, string sourceCode, string sourceFile, int line)
+            : base(message, innerException) {
+            _sourceFile = sourceFile;
+            _line = line;
+            _sourceCode = sourceCode;
+        }
+
+        public int Line {
+            get {
+                return _line;
+            }
+        }
+
+        public string SourceCode {
+            get {
+                return _sourceCode;
+            }
+        }
+
+        public string SourceFile {
+            get {
+                return _sourceFile;
+            }
+        }
+    }
+}
diff --git a/tools/Preprocessor/Preprocessor/PreprocessorTextReader.cs b/tools/Preprocessor/Preprocessor/PreprocessorTextReader.cs
new file mode 100644
index 000000000..ab754c356
--- /dev/null
+++ b/tools/Preprocessor/Preprocessor/PreprocessorTextReader.cs
@@ -0,0 +1,614 @@
+// PreprocessorTextReader.cs
+// Script#/Core/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using ScriptSharp;
+
+namespace ScriptSharp.Preprocessor {
+
+    internal sealed class PreprocessorTextReader : TextReader {
+
+        private TextWriter _skipPreprocessingWriter;
+
+        private IStreamSource _source;
+        private IStreamResolver _includeResolver;
+        private IScriptInfo _scriptInfo;
+
+        private Dictionary<string, string> _definedVariables;
+        private Stack<Instruction> _activeInstructions;
+
+        private string _currentLine;
+        private int _currentLinePosition;
+
+        private int _lineCounter;
+
+        private Stream _sourceStream;
+        private TextReader _sourceTextReader;
+
+        private IStreamSource _include;
+        private Stream _includeStream;
+        private TextReader _includeTextReader;
+        private int _includeLineCounter;
+
+        public PreprocessorTextReader(IStreamSource source, ICollection<string> predefinedVariables, IStreamResolver includeResolver, IScriptInfo scriptInfo) {
+            Debug.Assert(source != null);
+
+            _source = source;
+            _includeResolver = includeResolver;
+            _scriptInfo = scriptInfo;
+
+            _definedVariables = new Dictionary<string, string>();
+            _activeInstructions = new Stack<Instruction>();
+
+            if ((predefinedVariables != null) && (predefinedVariables.Count != 0)) {
+                foreach (string s in predefinedVariables) {
+                    _definedVariables[s] = String.Empty;
+                }
+            }
+
+            _currentLinePosition = -1;
+        }
+
+        internal string CurrentFile {
+            get {
+                if (_includeTextReader != null) {
+                    return _include.FullName;
+                }
+                return _source.FullName;
+            }
+        }
+
+        internal string CurrentLine {
+            get {
+                return _currentLine;
+            }
+        }
+
+        internal int CurrentLineNumber {
+            get {
+                if (_includeTextReader != null) {
+                    return _includeLineCounter;
+                }
+                return _lineCounter;
+            }
+        }
+
+        private void ClearLine() {
+            _currentLinePosition = -1;
+            _currentLine = null;
+        }
+
+        public override void Close() {
+            if (_includeStream != null) {
+                _include.CloseStream(_includeStream);
+                _includeStream = null;
+            }
+            if (_sourceStream != null) {
+                _source.CloseStream(_sourceStream);
+                _sourceStream = null;
+            }
+
+            base.Close();
+        }
+
+        private bool EnsureLine() {
+            if (_currentLine == null) {
+                Debug.Assert(_currentLinePosition == -1);
+
+                _currentLine = GetNextLine();
+                if (_currentLine != null) {
+                    _currentLinePosition = 0;
+                    return true;
+                }
+                else {
+                    if (_activeInstructions.Count != 0) {
+                        RaiseError("Unterminated '#if' instruction was detected.");
+                    }
+
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        private string GetNextLine() {
+            string line = null;
+
+            while (line == null) {
+                if (_includeTextReader != null) {
+                    line = _includeTextReader.ReadLine();
+                    _includeLineCounter++;
+
+                    if (line == null) {
+                        _includeTextReader = null;
+                        _includeLineCounter = 0;
+
+                        _include.CloseStream(_includeStream);
+                        _includeStream = null;
+                        _include = null;
+                    }
+                }
+                if (line == null) {
+                    line = _sourceTextReader.ReadLine();
+                    _lineCounter++;
+                }
+
+                if (line == null) {
+                    break;
+                }
+
+                string trimmedLine = line.TrimStart(' ', '\t');
+
+                bool isActive = true;
+                if (_activeInstructions.Count != 0) {
+                    Instruction currentInstruction = _activeInstructions.Peek();
+                    isActive = currentInstruction.IsActive;
+                }
+
+                if (trimmedLine.StartsWith("##")) {
+                    if (isActive == false) {
+                        line = null;
+                    }
+                    if (line != null) {
+                        line = ProcessSingleLineInstruction(trimmedLine);
+                    }
+                }
+                else if (trimmedLine.StartsWith("#include[as-is] ")) {
+                    if (isActive == false) {
+                        line = null;
+                    }
+
+                    if (line != null) {
+                        _currentLine = line;
+                        if (_includeResolver != null) {
+                            ProcessIncludeInstruction(trimmedLine, /* skipPreprocessing */ true);
+                            line = null;
+                        }
+                        else {
+                            RaiseError("Includes are not supported in this file.");
+                        }
+                    }
+                }
+                else if (trimmedLine.StartsWith("#include ")) {
+                    if (isActive == false) {
+                        line = null;
+                    }
+
+                    if (line != null) {
+                        _currentLine = line;
+                        if (_includeResolver != null) {
+                            if (_includeStream == null) {
+                                ProcessIncludeInstruction(trimmedLine, /* skipPreprocessing */ false);
+                                line = null;
+                            }
+                            else {
+                                RaiseError("Nested includes are not supported.");
+                            }
+                        }
+                        else {
+                            RaiseError("Includes are not supported in this file.");
+                        }
+                    }
+                }
+                else if (trimmedLine.StartsWith("#")) {
+                    if ((isActive == false) &&
+                        (trimmedLine.StartsWith("#elseif ") == false) &&
+                        (trimmedLine.StartsWith("#elif ") == false) &&
+                        (trimmedLine.StartsWith("#else") == false) &&
+                        (trimmedLine.StartsWith("#endif") == false)) {
+                        line = null;
+                    }
+
+                    if (line != null) {
+                        ProcessInstruction(trimmedLine);
+                        line = null;
+                    }
+                }
+                else {
+                    if (isActive == false) {
+                        line = null;
+                    }
+                }
+            }
+
+            return ProcessInlineInstruction(line);
+        }
+
+        public bool Initialize(TextWriter skipPreprocessingWriter) {
+            _skipPreprocessingWriter = skipPreprocessingWriter;
+
+            _sourceStream = _source.GetStream();
+            if (_sourceStream == null) {
+                return false;
+            }
+
+            _sourceTextReader = new StreamReader(_sourceStream);
+            return true;
+        }
+
+        private string ParseInstructionVariable(string instructionLine, int startIndex, out int endIndex) {
+            endIndex = -1;
+
+            int i = startIndex;
+            while (i < instructionLine.Length) {
+                char ch = instructionLine[i];
+                if ((ch != ' ') && (ch != '\t')) {
+                    break;
+                }
+                i++;
+            }
+
+            if (i < instructionLine.Length) {
+                int j = i;
+                while (j < instructionLine.Length) {
+                    char ch = instructionLine[j];
+                    if ((ch == ' ') || (ch == '\t')) {
+                        break;
+                    }
+                    j++;
+                }
+
+                endIndex = j;
+                return instructionLine.Substring(i, j - i);
+            }
+
+            return null;
+        }
+
+        public override int Peek() {
+            if (EnsureLine() == false) {
+                return -1;
+            }
+
+            int ch;
+            if (_currentLinePosition == _currentLine.Length) {
+                ch = '\n';
+            }
+            else {
+                ch = _currentLine[_currentLinePosition];
+            }
+
+            return ch;
+        }
+
+        private void ProcessIncludeInstruction(string instructionLine, bool skipPreprocessing) {
+            Debug.Assert(_includeStream == null);
+            Debug.Assert(_includeTextReader == null);
+
+            bool included = false;
+            int beginQuoteIndex = instructionLine.IndexOf('"');
+            int endQuoteIndex = 0;
+
+            if (beginQuoteIndex > 0) {
+                endQuoteIndex = instructionLine.IndexOf('"', beginQuoteIndex + 1);
+            }
+
+            if (endQuoteIndex > 0) {
+                Exception resolveException = null;
+                string includePath = instructionLine.Substring(beginQuoteIndex + 1, endQuoteIndex - beginQuoteIndex - 1);
+                try {
+                    _include = _includeResolver.ResolveInclude(_source, includePath);
+
+                    if (_include != null) {
+                        _includeStream = _include.GetStream();
+                        if (_includeStream != null) {
+                            _includeTextReader = new StreamReader(_includeStream);
+                            _includeLineCounter = 0;
+
+                            if (skipPreprocessing) {
+                                string includeText = _includeTextReader.ReadToEnd();
+                                _skipPreprocessingWriter.Write(includeText);
+
+                                _include.CloseStream(_includeStream);
+                                _includeTextReader = null;
+                                _includeStream = null;
+
+                                included = true;
+                            }
+                        }
+                    }
+                }
+                catch (Exception e) {
+                    resolveException = e;
+                }
+
+                if ((included == false) && (_includeTextReader == null)) {
+                    RaiseError("Unable to resolve or open included file '" + includePath + "'", resolveException);
+                }
+            }
+            else {
+                RaiseError("Invalid #include instruction.");
+            }
+        }
+
+        private string ProcessInlineInstruction(string line) {
+            if (String.IsNullOrEmpty(line)) {
+                return line;
+            }
+
+            int inlineInstructionIndex;
+
+            // Processes inline instructions within the line such as
+            // ... #= XYZ ## ...
+            inlineInstructionIndex = line.IndexOf("#=");
+            while (inlineInstructionIndex >= 0) {
+                int variableEndIndex;
+                string variable = ParseInstructionVariable(line, inlineInstructionIndex + 2, out variableEndIndex);
+                if (variable == null) {
+                    RaiseError("Variable name was missing after '#=' instruction.");
+                    continue;
+                }
+
+                string value = _scriptInfo.GetValue(variable);
+                if (value == null) {
+                    RaiseError("Unknown variable name, '" + variable + "' after '#=' instruction.");
+                    continue;
+                }
+
+                int inlineInstructionEndIndex = line.IndexOf("##", variableEndIndex);
+                if (inlineInstructionEndIndex < 0) {
+                    RaiseError("Invalid instruction. Missing ending '##' after '#='.");
+                    continue;
+                }
+
+                if (line.Length > inlineInstructionEndIndex + 2) {
+                    line = line.Substring(0, inlineInstructionIndex) + value + line.Substring(inlineInstructionEndIndex + 2);
+                }
+                else {
+                    line = line.Substring(0, inlineInstructionIndex) + value;
+                }
+
+                inlineInstructionIndex = line.IndexOf("#=");
+            }
+
+            // Processes inline instructions within the line such as
+            // ... #? DEBUG ... ## ...
+            inlineInstructionIndex = line.IndexOf("#?");
+            while (inlineInstructionIndex >= 0) {
+                int variableEndIndex;
+                string variable = ParseInstructionVariable(line, inlineInstructionIndex + 2, out variableEndIndex);
+                if (variable == null) {
+                    RaiseError("Variable name was missing after '#?' instruction.");
+                    continue;
+                }
+
+                int inlineInstructionEndIndex = line.IndexOf("##", variableEndIndex);
+                if (inlineInstructionEndIndex < 0) {
+                    RaiseError("Invalid instruction. Missing ending '##' after '#?'.");
+                    continue;
+                }
+
+                if (_definedVariables.ContainsKey(variable)) {
+                    int scriptIndex = variableEndIndex + 1;
+                    if (line.Length > scriptIndex) {
+                        line = line.Remove(inlineInstructionEndIndex, 2);
+                        line = line.Remove(inlineInstructionIndex, variableEndIndex - inlineInstructionIndex);
+                    }
+                    else {
+                        RaiseError("No script was present on the line after the '##' instruction.");
+                    }
+                }
+                else {
+                    // Update the line to be everything except for the inline instruction
+                    line = line.Remove(inlineInstructionIndex, inlineInstructionEndIndex - inlineInstructionIndex + 2);
+                }
+
+                inlineInstructionIndex = line.IndexOf("#?");
+            }
+
+            return line;
+        }
+
+        private void ProcessInstruction(string instructionLine) {
+            int dummy;
+            if (instructionLine.StartsWith("#define ")) {
+                string variableName = ParseInstructionVariable(instructionLine, 8, out dummy);
+                if (variableName == null) {
+                    RaiseError("Missing variable following the '#define' instruction.");
+                }
+                if (_definedVariables.ContainsKey(variableName)) {
+                    RaiseError("Duplicate definition of variable '" + variableName + "'.");
+                }
+
+                _definedVariables[variableName] = String.Empty;
+            }
+            else if (instructionLine.StartsWith("#undefine ")) {
+                string variableName = ParseInstructionVariable(instructionLine, 10, out dummy);
+
+                if (variableName == null) {
+                    RaiseError("Missing variable following the '#undefine' instruction.");
+                }
+                if (_definedVariables.ContainsKey(variableName) == false) {
+                    RaiseError("The variable '" + variableName + "' has not been defined yet.");
+                }
+
+                _definedVariables.Remove(variableName);
+            }
+            else if (instructionLine.StartsWith("#if ")) {
+                string variableName = ParseInstructionVariable(instructionLine, 4, out dummy);
+
+                if (variableName == null) {
+                    RaiseError("Missing variable following the '#if' instruction.");
+                }
+
+                Instruction instruction = new Instruction();
+                _activeInstructions.Push(instruction);
+
+                instruction.AddVariable(variableName, _definedVariables);
+            }
+            else if (instructionLine.StartsWith("#elseif ") ||
+                     instructionLine.StartsWith("#elif ")) {
+                string variableName = ParseInstructionVariable(instructionLine, 8, out dummy);
+                if (variableName == null) {
+                    RaiseError("Missing variable following the '#elif' instruction.");
+                }
+
+                if (_activeInstructions.Count == 0) {
+                    RaiseError("Unexpected '#elif' instruction.");
+                }
+
+                Instruction currentInstruction = _activeInstructions.Peek();
+                bool added = currentInstruction.AddVariable(variableName, _definedVariables);
+
+                if (added == false) {
+                    RaiseError("The specified '" + variableName + "' has already been used, or an '#else' instruction has already been specified.");
+                }
+            }
+            else if (instructionLine.StartsWith("#else")) {
+                if (_activeInstructions.Count == 0) {
+                    RaiseError("Unexpected '#else' instruction.");
+                }
+
+                Instruction currentInstruction = _activeInstructions.Peek();
+                bool added = currentInstruction.AddVariable(null, _definedVariables);
+
+                if (added == false) {
+                    RaiseError("Only a single '#else' instruction is allowed for a given '#if' instruction.");
+                }
+            }
+            else if (instructionLine.StartsWith("#endif")) {
+                if (_activeInstructions.Count == 0) {
+                    RaiseError("Unexpected '#endif' instruction.");
+                }
+
+                _activeInstructions.Pop();
+            }
+        }
+
+        private string ProcessSingleLineInstruction(string instructionLine) {
+            string scriptLine = null;
+
+            int variableEndIndex;
+            string variable = ParseInstructionVariable(instructionLine, 2, out variableEndIndex);
+            if (variable == null) {
+                RaiseError("Variable name was missing after '##' instruction.");
+            }
+
+            if (_definedVariables.ContainsKey(variable)) {
+                int scriptIndex = variableEndIndex + 1;
+                if (instructionLine.Length > scriptIndex) {
+                    scriptLine = instructionLine.Substring(scriptIndex);
+                }
+                else {
+                    RaiseError("No script was present on the line after the '##' instruction.");
+                }
+            }
+
+            return scriptLine;
+        }
+
+        private void RaiseError(string errorMessage) {
+            RaiseError(errorMessage, null);
+        }
+
+        private void RaiseError(string errorMessage, Exception innerException) {
+            string path = CurrentFile;
+            int lineNumber = CurrentLineNumber;
+
+            if (_includeStream != null) {
+                _includeStream.Close();
+                _includeStream = null;
+
+                _includeTextReader = null;
+            }
+
+            if (innerException == null) {
+                throw new PreprocessorException(errorMessage, _currentLine, path, lineNumber);
+            }
+            else {
+                throw new PreprocessorException(errorMessage, _currentLine, path, lineNumber);
+            }
+        }
+
+        public override int Read() {
+            if (EnsureLine() == false) {
+                return -1;
+            }
+
+            int ch;
+            if (_currentLinePosition == _currentLine.Length) {
+                ch = '\n';
+                ClearLine();
+            }
+            else {
+                ch = _currentLine[_currentLinePosition];
+                _currentLinePosition++;
+            }
+
+            return ch;
+        }
+
+
+        private sealed class Instruction {
+
+            private ArrayList _variables;
+            private bool _active;
+            private bool _activated;
+            private bool _canAddVariables;
+
+            public Instruction() {
+                _variables = new ArrayList();
+                _canAddVariables = true;
+            }
+
+            public bool IsActive {
+                get {
+                    return _active;
+                }
+            }
+
+            public bool AddVariable(string variable, Dictionary<string, string> definedVariables) {
+                if (variable == null) {
+                    if (_canAddVariables == false) {
+                        // already seen #else
+                        return false;
+                    }
+
+                    _canAddVariables = false;
+                    if (_activated == false) {
+                        // #else should be active if no other block was activated
+                        _active = true;
+                        _activated = true;
+                    }
+                    else {
+                        _active = false;
+                    }
+                    return true;
+                }
+                else {
+                    if (_canAddVariables == false) {
+                        // already seen #else
+                        return false;
+                    }
+
+                    if (_variables.Contains(variable)) {
+                        // duplicate use of same variable
+                        return false;
+                    }
+
+                    _variables.Add(variable);
+                    if (_active) {
+                        // no longer active
+                        _active = false;
+                    }
+                    else if (_activated == false) {
+                        if (definedVariables.ContainsKey(variable)) {
+                            // variable is defined, so the block becomes activated
+                            _active = true;
+                            _activated = true;
+                        }
+                    }
+
+                    return true;
+                }
+            }
+        }
+    }
+}
diff --git a/tools/Preprocessor/PreprocessorOptions.cs b/tools/Preprocessor/PreprocessorOptions.cs
new file mode 100644
index 000000000..394b005a2
--- /dev/null
+++ b/tools/Preprocessor/PreprocessorOptions.cs
@@ -0,0 +1,93 @@
+// PreprocessorOptions.cs
+// Script#/Core/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+
+namespace ScriptSharp {
+
+    /// <summary>
+    /// Script# pre-processor options.
+    /// </summary>
+    public sealed class PreprocessorOptions {
+
+        private ICollection<string> _preprocessorVariables;
+        private IStreamSource _sourceFile;
+        private IStreamSource _targetFile;
+        private bool _stripCommentsOnly;
+        private bool _useWindowsLineBreaks;
+        private bool _debug;
+        private bool _minimize;
+
+        public bool DebugFlavor {
+            get {
+                return _debug;
+            }
+            set {
+                _debug = value;
+            }
+        }
+
+        public bool Minimize {
+            get {
+                if (!DebugFlavor) {
+                    return _minimize;
+                }
+                return false;
+            }
+            set {
+                _minimize = value;
+            }
+        }
+
+        public ICollection<string> PreprocessorVariables {
+            get {
+                return _preprocessorVariables;
+            }
+            set {
+                _preprocessorVariables = value;
+            }
+        }
+
+        public IStreamSource SourceFile {
+            get {
+                return _sourceFile;
+            }
+            set {
+                _sourceFile = value;
+            }
+        }
+
+        public bool StripCommentsOnly {
+            get {
+                return _stripCommentsOnly;
+            }
+            set {
+                _stripCommentsOnly = value;
+            }
+        }
+
+        public IStreamSource TargetFile {
+            get {
+                return _targetFile;
+            }
+            set {
+                _targetFile = value;
+            }
+        }
+
+        public bool UseWindowsLineBreaks {
+            get {
+                return _useWindowsLineBreaks;
+            }
+            set {
+                _useWindowsLineBreaks = value;
+            }
+        }
+    }
+}
diff --git a/tools/Preprocessor/Properties/AssemblyInfo.cs b/tools/Preprocessor/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..9cf9073a4
--- /dev/null
+++ b/tools/Preprocessor/Properties/AssemblyInfo.cs
@@ -0,0 +1,21 @@
+// AssemblyInfo.cs
+// Script#/Tools/Preprocessor
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("sspp")]
+[assembly: AssemblyDescription("Script# Preprocessor")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("http://www.scriptsharp.com")]
+[assembly: AssemblyProduct("Script#")]
+[assembly: AssemblyCopyright("Copyright © 2012")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+[assembly: AssemblyVersion("0.7.0.0")]
+[assembly: AssemblyFileVersion("0.7.4.0")]
+[assembly: CLSCompliant(true)]
diff --git a/tools/Preprocessor/ScriptPreprocessor.cs b/tools/Preprocessor/ScriptPreprocessor.cs
new file mode 100644
index 000000000..430f9816d
--- /dev/null
+++ b/tools/Preprocessor/ScriptPreprocessor.cs
@@ -0,0 +1,85 @@
+// ScriptSharpPreprocessor.cs
+// Script#/Core/ScriptSharp
+// This source code is subject to terms and conditions of the Apache License, Version 2.0.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.IO;
+using ScriptSharp.Preprocessor;
+
+namespace ScriptSharp {
+
+    public sealed class ScriptPreprocessor {
+
+        private IScriptInfo _scriptInfo;
+        private IStreamResolver _includeResolver;
+        private IErrorHandler _errorHandler;
+
+        public ScriptPreprocessor()
+            : this(null, null, null) {
+        }
+
+        public ScriptPreprocessor(IStreamResolver includeResolver, IErrorHandler errorHandler)
+            : this(includeResolver, errorHandler, null) {
+        }
+
+        internal ScriptPreprocessor(IStreamResolver includeResolver, IErrorHandler errorHandler, IScriptInfo scriptInfo) {
+            _scriptInfo = scriptInfo;
+            _includeResolver = includeResolver;
+            _errorHandler = errorHandler;
+        }
+
+        public void Preprocess(PreprocessorOptions options) {
+            Stream outputStream = options.TargetFile.GetStream();
+            StreamWriter outputWriter = null;
+
+            PreprocessorTextReader preprocessor = null;
+            try {
+                if (outputStream != null) {
+                    outputWriter = new StreamWriter(outputStream);
+                    preprocessor = new PreprocessorTextReader(options.SourceFile,
+                                                              options.PreprocessorVariables,
+                                                              _includeResolver,
+                                                              _scriptInfo);
+
+                    TextReader contentReader = preprocessor;
+                    if (options.Minimize) {
+                        contentReader = new CondenserTextReader(preprocessor, options.StripCommentsOnly);
+                    }
+
+                    if (preprocessor.Initialize(outputWriter)) {
+                        int ch;
+                        while ((ch = contentReader.Read()) != -1) {
+                            if (options.UseWindowsLineBreaks && (ch == '\n')) {
+                                outputWriter.Write('\r');
+                            }
+                            outputWriter.Write((char)ch);
+                        }
+                    }
+                }
+            }
+            catch (PreprocessorException pe) {
+                if (_errorHandler != null) {
+                    _errorHandler.ReportError(pe.Message, pe.SourceFile + " (" + pe.Line + ", 1)");
+                }
+
+                if (pe.InnerException != null) {
+                    throw pe.InnerException;
+                }
+            }
+            finally {
+                if (preprocessor != null) {
+                    preprocessor.Close();
+                }
+                if (outputWriter != null) {
+                    outputWriter.Flush();
+                }
+                if (outputStream != null) {
+                    options.TargetFile.CloseStream(outputStream);
+                }
+            }
+        }
+    }
+}
diff --git a/tools/ZipBuilder/ICSharpCode.SharpZipLib.dll b/tools/ZipBuilder/ICSharpCode.SharpZipLib.dll
new file mode 100644
index 000000000..77bafe8ba
Binary files /dev/null and b/tools/ZipBuilder/ICSharpCode.SharpZipLib.dll differ
diff --git a/tools/ZipBuilder/Properties/AssemblyInfo.cs b/tools/ZipBuilder/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..83f6f94e8
--- /dev/null
+++ b/tools/ZipBuilder/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("ZipBuilder")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("ZipBuilder")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("377347e8-925a-4e89-88d8-f70ac23ea93a")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/tools/ZipBuilder/Zip.cs b/tools/ZipBuilder/Zip.cs
new file mode 100644
index 000000000..cdf2ce970
--- /dev/null
+++ b/tools/ZipBuilder/Zip.cs
@@ -0,0 +1,272 @@
+/*
+Copyright © 2005 Paul Welter. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+*/
+
+using System;
+using System.Globalization;
+using System.IO;
+using ICSharpCode.SharpZipLib.Checksums;
+using ICSharpCode.SharpZipLib.Zip;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace MSBuild.Community.Tasks {
+
+    /// <summary>
+    /// Create a zip file with the files specified.
+    /// </summary>
+    /// <example>Create a zip file
+    /// <code><![CDATA[
+    /// <ItemGroup>
+    ///     <ZipFiles Include="**\*.*" Exclude="*.zip" />
+    /// </ItemGroup>
+    /// <Target Name="Zip">
+    ///     <Zip Files="@(ZipFiles)" 
+    ///         ZipFileName="MSBuild.Community.Tasks.zip" />
+    /// </Target>
+    /// ]]></code>
+    /// Create a zip file using a working directory.
+    /// <code><![CDATA[
+    /// <ItemGroup>
+    ///     <RepoFiles Include="D:\svn\repo\**\*.*" />
+    /// </ItemGroup>
+    /// <Target Name="Zip">
+    ///     <Zip Files="@(RepoFiles)" 
+    ///         WorkingDirectory="D:\svn\repo" 
+    ///         ZipFileName="D:\svn\repo.zip" />
+    /// </Target>
+    /// ]]></code>
+    /// </example>
+    public sealed class Zip : Task {
+
+        private string _zipFileName;
+        private int _zipLevel;
+        private bool _flatten;
+        private string _comment;
+        private string _workingDirectory;
+
+        private ITaskItem[] _files;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="T:Zip"/> class.
+        /// </summary>
+        public Zip() {
+            _zipLevel = 6;
+        }
+
+        /// <summary>
+        /// Gets or sets the name of the zip file.
+        /// </summary>
+        /// <value>The name of the zip file.</value>
+        [Required]
+        public string ZipFileName {
+            get {
+                return _zipFileName;
+            }
+            set {
+                _zipFileName = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the zip level.
+        /// </summary>
+        /// <value>The zip level.</value>
+        /// <remarks>0 - store only to 9 - means best compression</remarks>
+        public int ZipLevel {
+            get {
+                return _zipLevel;
+            }
+            set {
+                _zipLevel = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the files to zip.
+        /// </summary>
+        /// <value>The files to zip.</value>
+        [Required]
+        public ITaskItem[] Files {
+            get {
+                return _files;
+            }
+            set {
+                _files = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether this <see cref="T:Zip"/> is flatten.
+        /// </summary>
+        /// <value><c>true</c> if flatten; otherwise, <c>false</c>.</value>
+        /// <remarks>
+        /// Flattening the zip means that all directories will be removed 
+        /// and the files will be place at the root of the zip file
+        /// </remarks>
+        public bool Flatten {
+            get {
+                return _flatten;
+            }
+            set {
+                _flatten = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the comment.
+        /// </summary>
+        /// <value>The comment.</value>
+        public string Comment {
+            get {
+                return _comment;
+            }
+            set {
+                _comment = value;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the working directory for the zip file.
+        /// </summary>
+        /// <value>The working directory.</value>
+        /// <remarks>
+        /// The working directory is the base of the zip file.  
+        /// All files will be made relative from the working directory.
+        /// </remarks>
+        [Required]
+        public string WorkingDirectory {
+            get {
+                return _workingDirectory;
+            }
+            set {
+                _workingDirectory = value;
+            }
+        }
+
+        /// <summary>
+        /// When overridden in a derived class, executes the task.
+        /// </summary>
+        /// <returns>
+        /// true if the task successfully executed; otherwise, false.
+        /// </returns>
+        public override bool Execute() {
+            return ZipFiles();
+        }
+
+        private bool ZipFiles() {
+            Crc32 crc = new Crc32();
+            ZipOutputStream zs = null;
+
+            try {
+                string zipFileName = Path.GetFullPath(_zipFileName);
+                string outputDirectory = Path.GetDirectoryName(zipFileName);
+
+                string baseDirectory = null;
+                if (String.IsNullOrEmpty(_workingDirectory) == false) {
+                    baseDirectory = Path.GetFullPath(_workingDirectory);
+                }
+
+                if (Directory.Exists(outputDirectory) == false) {
+                    Directory.CreateDirectory(outputDirectory);
+                }
+
+                Log.LogMessage("Creating zip file \"{0}\".", zipFileName);
+
+                using (zs = new ZipOutputStream(File.Create(zipFileName))) {
+                    // make sure level in range
+                    _zipLevel = Math.Max(0, _zipLevel);
+                    _zipLevel = Math.Min(9, _zipLevel);
+
+                    zs.SetLevel(_zipLevel);
+                    if (!String.IsNullOrEmpty(_comment)) {
+                        zs.SetComment(_comment);
+                    }
+
+                    byte[] buffer = new byte[32768];
+
+                    // add files to zip
+                    foreach (ITaskItem fileItem in _files) {
+                        string name = Path.GetFullPath(fileItem.ItemSpec);
+
+                        FileInfo file = new FileInfo(name);
+                        if (!file.Exists) {
+                            Log.LogWarning("File Not Found: {0}.", file.FullName);
+                            continue;
+                        }
+
+                        // clean up name
+                        if (_flatten) {
+                            name = file.Name;
+                        }
+                        else if (!String.IsNullOrEmpty(baseDirectory) &&
+                                 name.StartsWith(baseDirectory, StringComparison.OrdinalIgnoreCase)) {
+                            name = name.Substring(baseDirectory.Length);
+                        }
+                        name = ZipEntry.CleanName(name, true);
+
+                        ZipEntry entry = new ZipEntry(name);
+                        entry.DateTime = file.LastWriteTime;
+                        entry.Size = file.Length;
+
+                        using (FileStream fs = file.OpenRead()) {
+                            crc.Reset();
+                            long len = fs.Length;
+                            while (len > 0) {
+                                int readSoFar = fs.Read(buffer, 0, buffer.Length);
+                                crc.Update(buffer, 0, readSoFar);
+                                len -= readSoFar;
+                            }
+                            entry.Crc = crc.Value;
+                            zs.PutNextEntry(entry);
+
+                            len = fs.Length;
+                            fs.Seek(0, SeekOrigin.Begin);
+                            while (len > 0) {
+                                int readSoFar = fs.Read(buffer, 0, buffer.Length);
+                                zs.Write(buffer, 0, readSoFar);
+                                len -= readSoFar;
+                            }
+                        }
+                        Log.LogMessage("  added \"{0}\".", name);
+                    }
+                    zs.Finish();
+                }
+                Log.LogMessage("Created zip file \"{0}\" successfully.", _zipFileName);
+                return true;
+            }
+            catch (Exception exc) {
+                Log.LogErrorFromException(exc);
+                return false;
+            }
+            finally {
+                if (zs != null) {
+                    zs.Close();
+                }
+            }
+        }
+    }
+}
diff --git a/tools/ZipBuilder/ZipBuilder.csproj b/tools/ZipBuilder/ZipBuilder.csproj
new file mode 100644
index 000000000..1fe86ed06
--- /dev/null
+++ b/tools/ZipBuilder/ZipBuilder.csproj
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DDF9AE80-2CE9-4AFF-8899-31BAE1DC0B99}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>ScriptSharp.ZipBuilder</RootNamespace>
+    <AssemblyName>ScriptSharp.Internal.ZipBuilder</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>..\bin\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>none</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="ICSharpCode.SharpZipLib">
+      <HintPath>.\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Build.Framework" />
+    <Reference Include="Microsoft.Build.Utilities.v4.0" />
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Zip.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/tools/ZipBuilder/ZipBuilder.sln b/tools/ZipBuilder/ZipBuilder.sln
new file mode 100644
index 000000000..0305aaf3f
--- /dev/null
+++ b/tools/ZipBuilder/ZipBuilder.sln
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZipBuilder", "ZipBuilder.csproj", "{DDF9AE80-2CE9-4AFF-8899-31BAE1DC0B99}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DDF9AE80-2CE9-4AFF-8899-31BAE1DC0B99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DDF9AE80-2CE9-4AFF-8899-31BAE1DC0B99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DDF9AE80-2CE9-4AFF-8899-31BAE1DC0B99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DDF9AE80-2CE9-4AFF-8899-31BAE1DC0B99}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/tools/bin/ICSharpCode.SharpZipLib.dll b/tools/bin/ICSharpCode.SharpZipLib.dll
new file mode 100644
index 000000000..77bafe8ba
Binary files /dev/null and b/tools/bin/ICSharpCode.SharpZipLib.dll differ
diff --git a/tools/bin/ScriptSharp.Internal.ZipBuilder.dll b/tools/bin/ScriptSharp.Internal.ZipBuilder.dll
new file mode 100644
index 000000000..455e08997
Binary files /dev/null and b/tools/bin/ScriptSharp.Internal.ZipBuilder.dll differ
diff --git a/tools/bin/VsSDK/CreateExpInstance.exe b/tools/bin/VsSDK/CreateExpInstance.exe
new file mode 100644
index 000000000..80a17a7ce
Binary files /dev/null and b/tools/bin/VsSDK/CreateExpInstance.exe differ
diff --git a/tools/bin/VsSDK/CreateExpInstance.exe.config b/tools/bin/VsSDK/CreateExpInstance.exe.config
new file mode 100644
index 000000000..a243d8d15
--- /dev/null
+++ b/tools/bin/VsSDK/CreateExpInstance.exe.config
@@ -0,0 +1,12 @@
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <probing privatePath="complus\sdk\bin;PrimaryInteropAssemblies;vspkgs"/>
+      <dependentAssembly>
+        <assemblyIdentity name="EnvDTE" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="7.0.3300.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
+
diff --git a/tools/bin/VsSDK/CreatePkgDef.exe b/tools/bin/VsSDK/CreatePkgDef.exe
new file mode 100644
index 000000000..54171951a
Binary files /dev/null and b/tools/bin/VsSDK/CreatePkgDef.exe differ
diff --git a/tools/bin/VsSDK/CreatePkgDef.exe.config b/tools/bin/VsSDK/CreatePkgDef.exe.config
new file mode 100644
index 000000000..67aaba783
--- /dev/null
+++ b/tools/bin/VsSDK/CreatePkgDef.exe.config
@@ -0,0 +1,15 @@
+<configuration>
+  <startup>
+    <supportedRuntime version="v4.0"/>
+  </startup>
+  <runtime>
+    <loadFromRemoteSources enabled="true" />
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="EnvDTE" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="7.0.3300.0" newVersion="8.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
+
diff --git a/tools/bin/VsSDK/Microsoft.VsSDK.Build.Tasks.dll b/tools/bin/VsSDK/Microsoft.VsSDK.Build.Tasks.dll
new file mode 100644
index 000000000..9b38bfdf5
Binary files /dev/null and b/tools/bin/VsSDK/Microsoft.VsSDK.Build.Tasks.dll differ
diff --git a/tools/bin/VsSDK/Microsoft.VsSDK.Common.targets b/tools/bin/VsSDK/Microsoft.VsSDK.Common.targets
new file mode 100644
index 000000000..fd9be0cdc
--- /dev/null
+++ b/tools/bin/VsSDK/Microsoft.VsSDK.Common.targets
@@ -0,0 +1,187 @@
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<!--
+*************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+This code is licensed under the Visual Studio SDK license terms.
+THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
+ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
+IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
+*************************************************************************
+-->
+
+
+
+
+
+
+
+
+
+
+
+  <UsingTask TaskName="FindVsSDKInstallation" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="VSCTCompiler" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="CreateMenuPkgDef" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+
+  <!--
+    Set the general properties for this installation of the SDK
+  -->
+  <PropertyGroup>
+    <VsSDKVersion>10.0</VsSDKVersion>
+    <VSSDKTargetPlatformVersion>10.0</VSSDKTargetPlatformVersion>
+    <VSSDKTargetsPath>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VsSDKVersion)\VSSDK</VSSDKTargetsPath>
+    <VSSDKTargetPlatformRegRoot>Software\Microsoft\VisualStudio\$(VSSDKTargetPlatformVersion)</VSSDKTargetPlatformRegRoot>
+    <VSSDKTargetPlatformRegRootSuffix Condition="'$(VSSDKTargetPlatformRegRootSuffix)' == ''">Exp</VSSDKTargetPlatformRegRootSuffix>
+  </PropertyGroup>
+
+  <Target Name="FindSDKInstallation"
+        Condition="'$(VsSDKInstall)'==''">
+    <FindVsSDKInstallation SDKVersion="$(VsSDKVersion)">
+      <Output TaskParameter="InstallationPath" PropertyName="VsSDKInstall" />
+      <Output TaskParameter="IncludesPath" PropertyName="VsSDKIncludes" />
+      <Output TaskParameter="ToolsPath" PropertyName="VsSDKToolsPath" />
+    </FindVsSDKInstallation>
+  </Target>
+
+  <!--
+    =======================================================================================================
+                                                VSCT Compilation
+    =======================================================================================================
+  -->
+  <PropertyGroup>
+    <VSCTCompileDependsOn>$(VSCTCompileDependsOn);FindSDKInstallation</VSCTCompileDependsOn>
+    <!--Make sure that the __CTC__ macro is defined. This macro is used in common headers
+        like vsshids.h, so we need it for every VSCT compilation.-->
+    <__internal_VSCTDefinitions>__CTC__;_CTC_GUIDS_;$(VSCTDefinitions)</__internal_VSCTDefinitions>
+    <VsctVerboseOutput Condition="'$(VsctVerboseOutput)' == ''">false</VsctVerboseOutput>
+  </PropertyGroup>
+
+  <Target Name="VSCTCompile"
+          DependsOnTargets="$(VSCTCompileDependsOn)"
+          Condition="'$(BuildingProject)' != 'false' And '@(VSCTCompile)' != ''">
+
+    <!--Create the list of include path to use for the VSCT compilation-->
+    <ItemGroup>
+      <!--First add the user provided folders-->
+      <_InternalVSCTIncludePath Include="@(VSCTIncludePath)" Condition="'@(VSCTIncludePath)' != ''"/>
+      <!--Now add the internal folders-->
+      <_InternalVSCTIncludePath Include="$(VsSDKIncludes)" Condition="'$(VsSDKIncludes)' != ''"/>
+      <_InternalVSCTIncludePath Include="$(VsSDKIncludes)\office10" Condition="'$(VsSDKIncludes)' != ''"/>
+    </ItemGroup>
+
+    <VSCTCompiler AdditionalIncludeDirectories="@(_InternalVSCTIncludePath)"
+                  IntermediateDirectory="$(IntermediateOutputPath)"
+                  Definitions="$(__internal_VSCTDefinitions)"
+                  NoLogo="true"
+                  OutputFile="%(VSCTCompile.FileName).cto"
+                  Source="%(VSCTCompile.Identity)"
+                  Verbose="$(VsctVerboseOutput)"
+                  SDKVersion="$(VsSDKVersion)">
+      <Output TaskParameter="TemporaryFiles" ItemName="_TemporaryVsctCompilerFiles"/>
+    </VSCTCompiler>
+
+    <!--Record the VSCT compile CTO outputs for the Clean task.-->
+    <ItemGroup>
+      <FileWrites Include="$(IntermediateOutputPath)%(VSCTCompile.FileName).cto" Condition="Exists('$(IntermediateOutputPath)%(VSCTCompile.FileName).cto')"/>
+      <FileWrites Include="@(_TemporaryVsctCompilerFiles)" />
+    </ItemGroup>
+  </Target>
+
+  <!--
+    =======================================================================================================
+                                            Force AppId to refresh menu cache
+    =======================================================================================================
+  -->
+  <!-- The goal of this target is to force a change in a Menu entry of a pkgdef file when a .vsct file is updated to force VS to pick up the new .cto -->
+  <Target Name="CreateMenuPkgDef"
+        Inputs="@(VSCTCompile)"
+        Outputs="$(PkgdefFileWithMenuEntry)"
+        DependsOnTargets="$(CreateMenuPkgDefDependsOn)"
+        AfterTargets="VSCTCompile"
+        BeforeTargets="PrepareForRun">
+
+    <CreateMenuPkgDef PkgdefFile="$(PkgdefFileWithMenuEntry)" VsctFile="%(VSCTCompile.FullPath)" Condition="'$(PkgdefFileWithMenuEntry)'!=''"/>
+  </Target>
+
+
+  <!--
+    ============================================================
+                                        _VsixCleanRecordFileWrites
+
+    Save the list of all files written to disk by the VSIX targets so that it can be used for "Clean" later.
+
+    Files written in prior builds are not removed from Clean cache.
+    ============================================================
+    -->
+  <Target
+       Name="_VsixCleanRecordFileWrites"
+       AfterTargets="IncrementalClean">
+
+    <!-- Read the list of files deployed by prior builds from disk. -->
+    <ReadLinesFromFile File="$(IntermediateOutputPath)$(VsixCleanFile)">
+      <Output TaskParameter="Lines" ItemName="_VsixCleanPriorFileWrites"/>
+    </ReadLinesFromFile>
+    
+    <!--
+        Merge list of files from prior builds with the current build and then
+        remove duplicates.
+        -->
+    <RemoveDuplicates Inputs="@(_VsixCleanPriorFileWrites);@(_VsixDeployCurrentFileWrites)">
+      <Output TaskParameter="Filtered" ItemName="_VsixCleanUniqueFileWrites"/>
+    </RemoveDuplicates>
+
+    <!-- Make sure the directory exists. -->
+    <MakeDir Directories="$(IntermediateOutputPath)"/>
+
+    <!-- Write merged file list back to disk, replacing existing contents. -->
+    <WriteLinesToFile
+        File="$(IntermediateOutputPath)$(VsixCleanFile)"
+        Lines="@(_VsixCleanUniqueFileWrites)"
+        Overwrite="true" />
+
+  </Target>
+  
+  <!--
+    =======================================================================================================
+                                         Clean Deployed Vsix Extension Files
+    =======================================================================================================
+  -->
+  <PropertyGroup>
+    <VsixCleanFile Condition="'$(VsixCleanFile)'==''">$(MSBuildProjectFile).VsixDeployedFileListAbsolute.txt</VsixCleanFile>
+    <ShouldCleanDeployedVsixExtensionFiles Condition="'$(ShouldCleanDeployedVsixExtensionFiles)'==''">true</ShouldCleanDeployedVsixExtensionFiles>
+  </PropertyGroup>
+  <Target Name="CleanDeployedVsixExtensionFiles"
+          BeforeTargets="AfterClean"
+          Condition="$(ShouldCleanDeployedVsixExtensionFiles)">
+
+    <!-- Read the list of files deployed by prior builds from disk. -->
+    <ReadLinesFromFile File="$(IntermediateOutputPath)$(VsixCleanFile)">
+      <Output TaskParameter="Lines" ItemName="_VsixCleanPriorFileWrites"/>
+    </ReadLinesFromFile>
+
+    <!-- Remove duplicates. -->
+    <RemoveDuplicates Inputs="@(_VsixCleanPriorFileWrites)">
+      <Output TaskParameter="Filtered" ItemName="_VsixUniqueCleanPriorFileWrites"/>
+    </RemoveDuplicates>
+
+    <Delete Files="@(_VsixUniqueCleanPriorFileWrites)" TreatErrorsAsWarnings="true">
+      <Output TaskParameter="DeletedFiles" ItemName="_VsixCleanFilesDeleted"/>
+    </Delete>
+
+    <!-- Create a list of everything that wasn't deleted for some reason. -->
+    <ItemGroup>
+      <_VsixCleanRemainingFileWritesAfterIncrementalClean Include="@(_VsixUniqueCleanPriorFileWrites)" Exclude="@(_VsixCleanFilesDeleted)"/>
+    </ItemGroup>
+
+    <!-- Write new list of current files back to disk, replacing the existing list.-->
+    <WriteLinesToFile
+        File="$(IntermediateOutputPath)$(VsixCleanFile)"
+        Lines="@(_VsixCleanRemainingFileWritesAfterIncrementalClean)"
+        Condition="'@(_VsixCleanPriorFileWrites)'!='@(_VsixCleanRemainingFileWritesAfterIncrementalClean)'"
+        Overwrite="true"/>
+    
+  </Target>
+
+</Project>
diff --git a/tools/bin/VsSDK/Microsoft.VsSDK.targets b/tools/bin/VsSDK/Microsoft.VsSDK.targets
new file mode 100644
index 000000000..53f849412
--- /dev/null
+++ b/tools/bin/VsSDK/Microsoft.VsSDK.targets
@@ -0,0 +1,1121 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!--
+*************************************************************************
+Copyright (c) Microsoft Corporation. All rights reserved.
+This code is licensed under the Visual Studio SDK license terms.
+THIS CODE IS PROVIDED *AS IS* WITHOUT WARRANTY OF
+ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING ANY
+IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT.
+*************************************************************************
+-->
+
+  <Import Project="Microsoft.VsSDK.Common.targets" />
+
+  <UsingTask TaskName="CtoResourceMerger" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="MPLex" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="CreatePkgDef" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="CopyIfChanged" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="VsTemplatePaths" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="CalculateZipItems" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="GetVSTemplateItems" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="ZipItems" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="EnableExtension" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="EnableLoadingAllExtensions" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="FindInstalledExtension" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="UninstallExtension" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="FindVsixManifest" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="GetExtensionsPath" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="GetDeploymentPathFromVsixManifest" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="CreateZipPackage" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="ReadReferencesFromVsixManifest" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="DetokenizeVsixManifestSource" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="ValidateVsixManifest" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="Devenv" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="CheckProfileSetup" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="CreateVsixSourceItemFromReferences" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+  <UsingTask TaskName="SplitIncludeOutputGroupsInVSIX" AssemblyFile="Microsoft.VsSDK.Build.Tasks.dll" />
+
+  <PropertyGroup>
+    <DeployVSTemplates Condition="'$(DeployVSTemplates)' == ''">true</DeployVSTemplates>
+    <GetVsixItemsToBundleDependsOn>$(GetVsixItemsToBundleDependsOn);Compile</GetVsixItemsToBundleDependsOn>
+    <DeployVsixExtensionFilesDependsOn>$(DeployVsixExtensionFilesDependsOn);Compile</DeployVsixExtensionFilesDependsOn>
+    <ExtensionsDeploymentSubPath Condition="'$(ExtensionsDeploymentSubPath)' == ''">Microsoft\VisualStudio\$(VSSDKTargetPlatformVersion)$(VSSDKTargetPlatformRegRootSuffix)\Extensions\</ExtensionsDeploymentSubPath>
+    <TargetVSVersion Condition="'$(TargetVSVersion)' == ''">$(VSSDKTargetPlatformVersion)</TargetVSVersion>
+    <DeployExtension Condition="'$(DeployExtension)' == ''">true</DeployExtension>
+    <CopyVsixExtensionFiles Condition="'$(CopyVsixExtensionFiles)'==''">false</CopyVsixExtensionFiles>
+    <CreateVsixContainer Condition="'$(CreateVsixContainer)' == ''">true</CreateVsixContainer>
+    <CopyVsixManifestToOutput Condition="'$(CopyVsixManifestToOutput)' == '' and ('$(CreateVsixContainer)' != 'false' or '$(DeployExtension)' != 'false' or '$(CopyVsixExtensionFiles)' != 'false')">true</CopyVsixManifestToOutput>
+  </PropertyGroup>
+
+  <!--
+    =================================================================================
+                          Find Source Vsix Manifest File
+    =================================================================================
+    -->
+  <Target Name="FindSourceVsixManifest">
+    <FindVsixManifest ItemsToConsider="@(None)">
+      <Output TaskParameter="VsixManifest" ItemName="SourceVsixManifest"/>
+    </FindVsixManifest>
+  </Target>
+
+  <!--
+    =================================================================================
+                          Validate Source Vsix Manifest File
+    =================================================================================
+    -->
+  <PropertyGroup>
+    <ValidateVsixManifestDependsOn>$(ValidateVsixManifestDependsOn);FindSourceVsixManifest</ValidateVsixManifestDependsOn>
+    <BypassVsixValidation Condition="'$(BypassVsixValidation)' == ''">false</BypassVsixValidation>
+    <VsixSchemaPath Condition="'$(VsixSchemaPath)' == ''"></VsixSchemaPath>
+  </PropertyGroup>
+  <Target Name="ValidateVsixManifest" DependsOnTargets="$(ValidateVsixManifestDependsOn)">
+    <ValidateVsixManifest Condition="Exists('@(SourceVsixManifest)')" ItemToValidate="@(SourceVsixManifest)" BypassVsixValidation="$(BypassVsixValidation)" VsixSchemaPath="$(VsixSchemaPath)">
+    </ValidateVsixManifest>
+  </Target>
+
+  <!--
+    =================================================================================
+                          Detokenize Source Vsix Manifest File
+    =================================================================================
+
+    Detokenize the source.extension.vsixmanifest file to the intermediate directory as extension.vsixmanifest
+    -->
+  <PropertyGroup>
+    <DetokenizeVsixManifestFileDependsOn>$(DetokenizeVsixManifestFileDependsOn);AssignProjectConfiguration;FindSourceVsixManifest;ValidateVsixManifest</DetokenizeVsixManifestFileDependsOn>
+    <VsixManifestFileName Condition="'$(VsixManifestFileName)' == ''">extension.vsixmanifest</VsixManifestFileName>
+    <IntermediateVsixManifest Condition="'$(IntermediateVsixManifest)' == ''">$(IntermediateOutputPath)$(VsixManifestFileName)</IntermediateVsixManifest>
+  </PropertyGroup>
+  <Target Name="DetokenizeVsixManifestFile"
+          DependsOnTargets="$(DetokenizeVsixManifestFileDependsOn)">
+
+    <ItemGroup>
+      <!-- Include Project to Project references -->
+      <_VsixManifestProjectReference Include="@(ProjectReferenceWithConfiguration)" />
+      <!-- Include this project so that the source.extension.vsixmanifest can refer to its own project/assembly -->
+      <_VsixManifestProjectReference Include="$(ProjectFileName)">
+        <Name>$(ProjectName)</Name>
+        <VSIXSubPath>$(AssemblyVSIXSubPath)</VSIXSubPath>
+      </_VsixManifestProjectReference>
+    </ItemGroup>
+
+    <ReadReferencesFromVsixManifest
+      InputFile="@(SourceVsixManifest)"
+      CurrentProjectName="$(ProjectName)"
+      ProjectReferences="@(_VsixManifestProjectReference)">
+      <Output TaskParameter="ProjectReferencesToResolve" ItemName="_VsixManifestReferencesToResolve" />
+    </ReadReferencesFromVsixManifest>
+
+    <MSBuild Projects="@(_VsixManifestReferencesToResolve)"
+         Properties="%(_VsixManifestReferencesToResolve.SetConfiguration); %(_VsixManifestReferencesToResolve.SetPlatform)"
+         Targets="%(_VsixManifestReferencesToResolve.OutputGroupToResolve)"
+         RebaseOutputs="true">
+      <Output TaskParameter="TargetOutputs" ItemName="_VsixManifestResolvedReferences"/>
+    </MSBuild>
+
+    <DetokenizeVsixManifestSource
+      InputFile="@(SourceVsixManifest)"
+      OutputFile="$(IntermediateVsixManifest)"
+      ResolvedReferences="@(_VsixManifestResolvedReferences)">
+      <Output TaskParameter="OutputFile" ItemName="FileWrites" />
+    </DetokenizeVsixManifestSource>
+
+  </Target>
+
+  <!--
+    =================================================================================
+                                         Copy Vsix Manifest File
+    =================================================================================
+
+    Copy the extensions.vsixmanifest file to the output directory.
+    -->
+  <PropertyGroup>
+    <CopyVsixManifestFileDependsOn>$(CopyVsixManifestFileDependsOn);DetokenizeVsixManifestFile</CopyVsixManifestFileDependsOn>
+  </PropertyGroup>
+  <Target
+      Name="CopyVsixManifestFile"
+      Condition="'$(CopyVsixManifestToOutput)'=='true'"
+      DependsOnTargets="$(CopyVsixManifestFileDependsOn)">
+
+    <Copy
+        SourceFiles="$(IntermediateVsixManifest)"
+        DestinationFolder="$(OutDir)"
+        SkipUnchangedFiles="true"
+        OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+        Retries="$(CopyRetryCount)"
+        Condition="Exists('$(IntermediateOutputPath)$(VsixManifestFileName)')"
+        RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)">
+      <Output TaskParameter="DestinationFiles" ItemName="_VsixOutputManifest"/>
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+    </Copy>
+
+    <Message Importance="Normal" Condition="Exists('$(IntermediateOutputPath)$(VsixManifestFileName)')" Text="$(MSBuildProjectName) -&gt; @(_VsixOutputManifest->'%(FullPath)')" />
+  </Target>
+
+  <!--
+    =======================================================================================================
+                                         Create Vsix Bundle (.vsix file)
+    =======================================================================================================
+  -->
+
+  <PropertyGroup>
+    <TargetVsixContainerName Condition="'$(TargetVsixContainerName)'==''">$(TargetName).vsix</TargetVsixContainerName>
+    <TargetVsixContainer Condition="'$(TargetVsixContainer)'==''">$(OutDir)$(TargetVsixContainerName)</TargetVsixContainer>
+    <GetVsixSourceItemsDependsOn>$(GetVsixSourceItemsDependsOn);AssignProjectConfiguration;DetokenizeVsixManifestFile;ZipProjects;ZipItems</GetVsixSourceItemsDependsOn>
+    <CreateVsixContainerDependsOn>$(CreateVsixContainerDependsOn);GetVsixSourceItems</CreateVsixContainerDependsOn>
+
+    <!--By default, only include items necessary for executing. 
+        Exclude debug symbols & documentation files.-->
+    <IncludeAssemblyInVSIXContainer Condition="'$(IncludeAssemblyInVSIXContainer)'==''">true</IncludeAssemblyInVSIXContainer>
+    <IncludeAddModulesInVSIXContainer Condition="'$(IncludeAddModulesInVSIXContainer)'==''">true</IncludeAddModulesInVSIXContainer>
+    <IncludeSGenDllInVSIXContainer Condition="'$(IncludeSGenDllInVSIXContainer)'==''">true</IncludeSGenDllInVSIXContainer>
+    <IncludeDebugSymbolsInVSIXContainer Condition="'$(IncludeDebugSymbolsInVSIXContainer)'==''">false</IncludeDebugSymbolsInVSIXContainer>
+    <IncludeDebugSymbolsInLocalVSIXDeployment Condition="'$(IncludeDebugSymbolsInLocalVSIXDeployment)'==''">true</IncludeDebugSymbolsInLocalVSIXDeployment>
+    <IncludeDocFilesInVSIXContainer Condition="'$(IncludeDocFilesInVSIXContainer)'==''">false</IncludeDocFilesInVSIXContainer>
+    <IncludeSatelliteAssembliesInVSIXContainer Condition="'$(IncludeSatelliteAssembliesInVSIXContainer)'==''">true</IncludeSatelliteAssembliesInVSIXContainer>
+    <IncludeCOMReferencesInVSIXContainer Condition="'$(IncludeCOMReferencesInVSIXContainer)'==''">true</IncludeCOMReferencesInVSIXContainer>
+    <IncludeCopyLocalReferencesInVSIXContainer Condition="'$(IncludeCopyLocalReferencesInVSIXContainer)'==''">true</IncludeCopyLocalReferencesInVSIXContainer>
+    <IncludePkgdefInVSIXContainer Condition="'$(IncludePkgdefInVSIXContainer)'==''">true</IncludePkgdefInVSIXContainer>
+  </PropertyGroup>
+
+  <Target
+      Name="GetVsixSourceItems"
+      DependsOnTargets="$(GetVsixSourceItemsDependsOn)">
+
+    <ItemGroup Condition="'$(IncludeAssemblyInVSIXContainer)'=='true'">
+      <!--Create an item for the primary output of the project-->
+      <VSIXSourceItem Include="@(IntermediateAssembly)">
+        <VSIXSubPath>$(AssemblyVSIXSubPath)</VSIXSubPath>
+      </VSIXSourceItem>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(IncludeAddModulesInVSIXContainer)'=='true'">
+      <VSIXSourceItem Include="@(AddModules)">
+        <VSIXSubPath>$(AssemblyVSIXSubPath)</VSIXSubPath>
+      </VSIXSourceItem>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(IncludeSGenDllInVSIXContainer)'=='true' AND '$(_SGenDllCreated)'=='true'">
+      <VSIXSourceItem Include="$(IntermediateOutputPath)$(_SGenDllName)">
+        <VSIXSubPath>$(AssemblyVSIXSubPath)</VSIXSubPath>
+      </VSIXSourceItem>
+    </ItemGroup>
+
+    <ItemGroup>
+      <VSIXSourceItem Condition="'$(IncludeDebugSymbolsInVSIXContainer)'=='true'" Include="@(_DebugSymbolsIntermediatePath)">
+        <VSIXSubPath>$(AssemblyVSIXSubPath)</VSIXSubPath>
+      </VSIXSourceItem>
+
+      <VSIXSourceItemLocalOnly Include="@(_DebugSymbolsIntermediatePath)" Condition="'$(IncludeDebugSymbolsInLocalVSIXDeployment)'=='true'">
+        <VSIXSubPath>$(AssemblyVSIXSubPath)</VSIXSubPath>
+      </VSIXSourceItemLocalOnly>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(IncludeDocFilesInVSIXContainer)'=='true'">
+      <VSIXSourceItem Include="@(DocFileItem)">
+        <VSIXSubPath>$(AssemblyVSIXSubPath)</VSIXSubPath>
+      </VSIXSourceItem>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(IncludeSatelliteAssembliesInVSIXContainer)'=='true'">
+      <VSIXSourceItem Include="@(IntermediateSatelliteAssembliesWithTargetPath->'$(OutDir)%(Culture)\$(TargetName).resources.dll')">
+        <VSIXSubPath>$(AssemblyVSIXSubPath)</VSIXSubPath>
+      </VSIXSourceItem>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(IncludeCOMReferencesInVSIXContainer)'=='true'">
+      <VSIXSourceItem Include="@(ReferenceComWrappersToCopyLocal); @(ResolvedIsolatedComModules); @(_DeploymentLooseManifestFile); @(NativeReferenceFile)">
+        <VSIXSubPath>$(AssemblyVSIXSubPath)</VSIXSubPath>
+      </VSIXSourceItem>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(IncludeCopyLocalReferencesInVSIXContainer)'=='true'">
+      <VSIXCopyLocalReferenceSourceItem Include="@(ReferencePath)">
+        <VSIXSubPath Condition="'%(ReferencePath.VSIXSubPath)' == ''">$(AssemblyVSIXSubPath)</VSIXSubPath>
+      </VSIXCopyLocalReferenceSourceItem>
+    </ItemGroup>
+
+    <CreateVsixSourceItemFromReferences ReferencedVSIXSourceItems="@(VSIXCopyLocalReferenceSourceItem)">
+      <Output TaskParameter="VsixSourceItems" ItemName="VSIXSourceItem" />
+    </CreateVsixSourceItemFromReferences>
+
+    <ItemGroup Condition="'$(IncludePkgdefInVSIXContainer)'=='true' AND '$(GeneratePkgDefFile)'=='true'">
+      <!--Create an item for the pkgdef output of the project-->
+      <VSIXSourceItem Include="$(IntermediateOutputPath)$(TargetName).pkgdef">
+        <VSIXSubPath>$(PkgdefVSIXSubPath)</VSIXSubPath>
+      </VSIXSourceItem>
+    </ItemGroup>
+
+    <!-- Include the detokenized VSIX Manifest file-->
+    <ItemGroup>
+      <VSIXSourceItem Include="$(IntermediateVsixManifest)" />
+    </ItemGroup>
+
+    <!-- Include any Content items marked with IncludeInVSIX=true -->
+    <ItemGroup>
+
+      <VSIXSourceItem Include="@(Content)" Condition="'%(Content.IncludeInVSIX)'=='true' AND '%(Content.VSIXSubPath)'==''">
+        <!-- Sets VSIXSubPath for content items that are nonlinked files -->
+        <VSIXSubPath Condition="'%(Content.Link)'==''">%(Content.RelativeDir)</VSIXSubPath>
+        <!-- Sets VSIXSubPath for content items that are linked files -->
+        <VSIXSubPath Condition="'%(Content.Link)'!=''">$([System.IO.Path]::GetDirectoryName(%(Content.Link)))</VSIXSubPath>
+      </VSIXSourceItem>
+
+      <VSIXSourceItem Include="@(Content)" Condition="'%(Content.IncludeInVSIX)'=='true' AND '%(Content.VSIXSubPath)'!=''" />
+
+    </ItemGroup>
+
+
+    <!-- For any project references that are set to copy local ('Private' property != false), add the output groups for project references that are not set -->
+    <ItemGroup>
+      <ProjectReferenceWithConfiguration Condition="'%(ProjectReferenceWithConfiguration.Private)' != 'false' AND 
+                                                    '%(ProjectReferenceWithConfiguration.IncludeOutputGroupsInVSIX)' == '' AND 
+                                                    '%(ProjectReferenceWithConfiguration.IncludeOutputGroupsInVSIXLocalOnly)' == ''">
+        <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup;BuiltProjectOutputGroupDependencies;GetCopyToOutputDirectoryItems</IncludeOutputGroupsInVSIX>
+        <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup;</IncludeOutputGroupsInVSIXLocalOnly>
+      </ProjectReferenceWithConfiguration>
+    </ItemGroup>
+
+    <!-- SplitIncludeOutputGroupsInVSIX will duplicate the project references into two lists. Each list is essentially a duplicate of the input.
+
+         The IncludeOutputGroupsInVSIX values on items in the FilteredGroups list will only be BuiltProjectOutputGroupDependencies.
+         The IncludeOutputGroupsInVSIX values on items in the UnfilteredGroups list will only be all other output groups.
+         
+         This is done because we only want to filter out items in the CreateVsixSourceItemFromReferences task that were build dependencies to
+         avoid unintentially excluding output groups explicitly requested in IncludeOutputGroupsInVSIX.
+         
+         The task properly handles escaped values for IncludeOutputGroupsInVSIX (e.g. Target1%3bTarget2).
+    -->
+
+    <SplitIncludeOutputGroupsInVSIX ProjectReferences="@(ProjectReferenceWithConfiguration)"
+                                    Condition="'%(ProjectReferenceWithConfiguration.IncludeOutputGroupsInVSIX)' != ''"
+                                    OutputGroupFilter="BuiltProjectOutputGroupDependencies">
+      <Output TaskParameter="FilteredGroups" ItemName="_ProjectReferenceWithBuiltGroups"/>
+      <Output TaskParameter="UnfilteredGroups" ItemName="_ProjectReferenceWithoutBuiltGroups"/>
+    </SplitIncludeOutputGroupsInVSIX>
+
+    <!-- Build and include output for any Project Reference items marked where IncludeOutputGroupsInVSIX is set -->
+    <MSBuild Projects="@(_ProjectReferenceWithBuiltGroups)"
+             Properties="%(_ProjectReferenceWithBuiltGroups.SetConfiguration); %(_ProjectReferenceWithBuiltGroups.SetPlatform)"
+             Targets="%(_ProjectReferenceWithBuiltGroups.IncludeOutputGroupsInVSIX)"
+             Condition="'%(_ProjectReferenceWithBuiltGroups.IncludeOutputGroupsInVSIX)' != ''"
+             RebaseOutputs="true">
+      <Output TaskParameter="TargetOutputs" ItemName="ReferencedVSIXSourceItem"/>
+    </MSBuild>
+
+    <CreateVsixSourceItemFromReferences ReferencedVSIXSourceItems="@(ReferencedVSIXSourceItem)">
+      <Output TaskParameter="VsixSourceItems" ItemName="VSIXSourceItem" />
+    </CreateVsixSourceItemFromReferences>
+
+    <MSBuild Projects="@(_ProjectReferenceWithoutBuiltGroups)"
+             Properties="%(_ProjectReferenceWithoutBuiltGroups.SetConfiguration); %(_ProjectReferenceWithoutBuiltGroups.SetPlatform)"
+             Targets="%(_ProjectReferenceWithoutBuiltGroups.IncludeOutputGroupsInVSIX)"
+             Condition="'%(_ProjectReferenceWithoutBuiltGroups.IncludeOutputGroupsInVSIX)' != ''"
+             RebaseOutputs="true">
+      <Output TaskParameter="TargetOutputs" ItemName="VSIXSourceItem"/>
+    </MSBuild>
+
+    <!-- Build and include output for any Project Reference items marked where IncludeOutputGroupsInVSIXLocalOnly is set in the locally deployed vsix -->
+    <!-- Unescape the targets because they may be escaped when added from the ExtensibilityProjectFlavor in VS. -->
+    <MSBuild Projects="@(ProjectReferenceWithConfiguration)"
+             Properties="%(ProjectReferenceWithConfiguration.SetConfiguration); %(ProjectReferenceWithConfiguration.SetPlatform)"
+             Targets="$([MSBuild]::Unescape(%(ProjectReferenceWithConfiguration.IncludeOutputGroupsInVSIXLocalOnly)))"
+             Condition="'%(ProjectReferenceWithConfiguration.IncludeOutputGroupsInVSIXLocalOnly)' != ''"
+             RebaseOutputs="true">
+      <Output TaskParameter="TargetOutputs" ItemName="VSIXSourceItemLocalOnly"/>
+    </MSBuild>
+
+    <ItemGroup>
+      <!-- Sets VSIXSubPath for template references (template projects output has TemplateSubPath set on items) -->
+      <VSIXSourceItem>
+        <VSIXSubPath Condition="'%(VSIXSourceItem.TemplateSubPath)'!=''">%(VSIXSourceItem.VSIXSubPath)\%(VSIXSourceItem.TemplateSubPath)</VSIXSubPath>
+      </VSIXSourceItem>
+      <VSIXSourceItemLocalOnly>
+        <VSIXSubPath Condition="'%(VSIXSourceItemLocalOnly.TemplateSubPath)'!=''">%(VSIXSourceItemLocalOnly.VSIXSubPath)\%(VSIXSourceItemLocalOnly.TemplateSubPath)</VSIXSubPath>
+      </VSIXSourceItemLocalOnly>
+    </ItemGroup>
+  </Target>
+
+  <Target
+      Name="CreateVsixContainer"
+      Condition="$(CreateVsixContainer)"
+      Inputs="@(VSIXSourceItem)"
+      Outputs="$(TargetVsixContainer)"
+      DependsOnTargets="$(CreateVsixContainerDependsOn)">
+
+    <Message Importance="High" Text="Creating VSIX Container..." />
+
+    <CreateZipPackage
+         Files="@(VSIXSourceItem)"
+         ZipPackage="$(TargetVsixContainer)">
+      <Output TaskParameter="ZipPackage" ItemName="FileWrites" />
+      <Output TaskParameter="ZipPackage" ItemName="_CreatedVsixContainer" />
+    </CreateZipPackage>
+
+    <Message Importance="High" Text="$(MSBuildProjectName) -&gt; @(_CreatedVsixContainer->'%(FullPath)')" />
+  </Target>
+
+
+  <!--
+    =======================================================================================================
+                                         Get Vsix Deployment Path
+    =======================================================================================================
+  -->
+  <PropertyGroup>
+    <GetVsixDeploymentPathDependsOn>$(GetVsixDeploymentPathDependsOn);DetokenizeVsixManifestFile</GetVsixDeploymentPathDependsOn>
+  </PropertyGroup>
+
+  <Target
+      Name="GetVsixDeploymentPath"
+      Condition="'$(DeployExtension)'=='true'"
+      DependsOnTargets="$(GetVsixDeploymentPathDependsOn)">
+
+    <GetExtensionsPath SubPath="$(ExtensionsDeploymentSubPath)">
+      <Output TaskParameter="LocalExtensionsPath" PropertyName="ExtensionsPath"/>
+    </GetExtensionsPath>
+
+    <GetDeploymentPathFromVsixManifest
+        Condition="Exists('$(IntermediateVsixManifest)')"
+        ExtensionsPath="$(ExtensionsPath)"
+        VsixManifest="$(IntermediateVsixManifest)" >
+      <Output TaskParameter="DeploymentPath" PropertyName="VsixDeploymentPath"/>
+      <Output TaskParameter="VsixID" PropertyName="VsixID"/>
+      <Output TaskParameter="VsixVersion" PropertyName="VsixVersion"/>
+    </GetDeploymentPathFromVsixManifest>
+  </Target>
+
+  <!--
+    =======================================================================================================
+                                         Deploy Vsix Extension Files
+    =======================================================================================================
+  -->
+  <PropertyGroup>
+    <DeployVsixExtensionFilesDependsOn>$(DeployVsixExtensionFilesDependsOn);GetVsixDeploymentPath;FindExistingDeploymentPath;GetVsixSourceItems</DeployVsixExtensionFilesDependsOn>
+    <FindExistingDeploymentPathDependsOn>$(FindExistingDeploymentPathDependsOn);GetVsixDeploymentPath</FindExistingDeploymentPathDependsOn>
+  </PropertyGroup>
+
+  <Target Name="FindExistingDeploymentPath"
+          Condition="'$(DeployExtension)'=='true'"
+          DependsOnTargets="$(FindExistingDeploymentPathDependsOn)">
+    <FindInstalledExtension
+        VsixIdentifier="$(VsixID)"
+        RootSuffix="$(VSSDKTargetPlatformRegRootSuffix)"
+        FailIfNotInstalled="false">
+      <Output TaskParameter="DeploymentPath" PropertyName="ExistingDeploymentPath" />
+    </FindInstalledExtension>
+  </Target>
+
+  <Target Name="DeployVsixExtensionFiles"
+      Condition="'$(DeployExtension)'=='true'"
+      DependsOnTargets="$(DeployVsixExtensionFilesDependsOn)">
+
+    <!-- Uninstall any existing extension with the same identifier with a different deployment path.
+             We don't always call this because of the way Uninstall is implemented in Extension Manager.
+             An uninstall operation just marks the directory for deletion in the registry and does the actual
+             delete on the next instantiation of the Extension Manager service object. In our case, this happens
+             at the same time (or just after) we are copying files to that directory. Therefore, we should only
+             call uninstall if the existing installation directory is different than the one we're deploying files
+             to. -->
+    <UninstallExtension
+        Condition="'$(ExistingDeploymentPath)' != '$(VsixDeploymentPath)' AND '$(ExistingDeploymentPath)' != ''"
+        VsixIdentifier="$(VsixID)"
+        RootSuffix="$(VSSDKTargetPlatformRegRootSuffix)"
+        FailIfNotInstalled="false" />
+
+    <Message Text="VsixID = $(VsixID)" />
+    <Message Text="VsixVersion = $(VsixVersion)" />
+    <Message Text="VsixDeploymentPath = $(VsixDeploymentPath)" />
+
+    <ItemGroup>
+      <VsixExtensionFiles Include="@(VSIXSourceItem);@(VSIXSourceItemLocalOnly)" />
+    </ItemGroup>
+
+    <!-- The TargetPath metadata contains the whole path, not just the directory -->
+
+    <Copy
+        SourceFiles="@(VsixExtensionFiles)"
+        DestinationFiles="@(VsixExtensionFiles->'$(VsixDeploymentPath)%(VSIXSubPath)\%(Filename)%(Extension)')"
+        Condition="'%(VsixExtensionFiles.TargetPath)'==''"
+        SkipUnchangedFiles="true"
+        OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+        Retries="$(CopyRetryCount)"
+        RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)">
+      <Output TaskParameter="DestinationFiles" ItemName="_VsixDeployCurrentFileWrites"/>
+    </Copy>
+
+    <Copy
+        SourceFiles="@(VsixExtensionFiles)"
+        DestinationFiles="@(VsixExtensionFiles->'$(VsixDeploymentPath)%(VSIXSubPath)\%(TargetPath)')"
+        Condition="'%(VsixExtensionFiles.TargetPath)'!=''"
+        SkipUnchangedFiles="true"
+        OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+        Retries="$(CopyRetryCount)"
+        RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)">
+      <Output TaskParameter="DestinationFiles" ItemName="_VsixDeployCurrentFileWrites"/>
+    </Copy>
+
+    <!--Check if the user is an administrator and the user profile hasn't been setup for the target instance. -->
+    <CheckProfileSetup
+        RootSuffix="$(VSSDKTargetPlatformRegRootSuffix)">
+      <Output TaskParameter="IsAdministrator" PropertyName="IsCurrentUserAdministrator" />
+      <Output TaskParameter="IsProfileSetup" PropertyName="IsTargetProfileSetup" />
+    </CheckProfileSetup>
+
+    <!--Run devenv to setup the target profile if necessary -->
+    <Message
+        Importance="High"
+        Text="Setting up Visual Studio for debugging extensions. This one-time operation may take a minute or more."
+        Condition="'$(IsCurrentUserAdministrator)'=='True' And '$(IsTargetProfileSetup)'=='False'" />
+    <Devenv
+        Condition="'$(IsCurrentUserAdministrator)'=='True' And '$(IsTargetProfileSetup)'=='False'"
+        RootSuffix="$(VSSDKTargetPlatformRegRootSuffix)"
+        ResetSettingProfile="General.vssettings"
+        IsEmbedded="true" />
+
+    <!--Enable always loading extensions from LocalAppData -->
+    <EnableLoadingAllExtensions
+        RootSuffix="$(VSSDKTargetPlatformRegRootSuffix)" />
+
+    <!--Enable this extension via Extension Manager-->
+    <EnableExtension
+        VsixIdentifier="$(VsixID)"
+        RootSuffix="$(VSSDKTargetPlatformRegRootSuffix)"
+        FailIfNotInstalled="true" />
+  </Target>
+
+  <!--
+    =======================================================================================================
+                                         Copy Vsix Extension Files
+
+       Target to do a raw copy of extension files. Does not use Extension Manager API to 
+       enable/manage an extension. Typically only used for Isolated Shell solutions.
+    =======================================================================================================
+  -->
+  <PropertyGroup>
+    <CopyVsixExtensionFilesDependsOn>$(CopyVsixExtensionFilesDependsOn);GetVsixSourceItems</CopyVsixExtensionFilesDependsOn>
+  </PropertyGroup>
+  <Target Name="CopyVsixExtensionFiles"
+      Condition="'$(CopyVsixExtensionFiles)'=='true' AND '$(CopyVsixExtensionLocation)' != ''"
+      DependsOnTargets="$(CopyVsixExtensionFilesDependsOn)">
+
+    <ItemGroup>
+      <CopyVsixExtensionFiles Include="@(VSIXSourceItem);@(VSIXSourceItemLocalOnly)" />
+    </ItemGroup>
+
+    <!-- The TargetPath metadata contains the whole path, not just the directory -->
+
+    <Copy
+        SourceFiles="@(CopyVsixExtensionFiles)"
+        DestinationFiles="@(CopyVsixExtensionFiles->'$(CopyVsixExtensionLocation)\%(VSIXSubPath)\%(FileName)%(Extension)')"
+        Condition="'%(CopyVsixExtensionFiles.TargetPath)' == ''"
+        SkipUnchangedFiles="true"
+        OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+        Retries="$(CopyRetryCount)"
+        RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)">
+      <Output TaskParameter="DestinationFiles" ItemName="_VsixDeployCurrentFileWrites"/>
+    </Copy>
+
+    <Copy
+        SourceFiles="@(CopyVsixExtensionFiles)"
+        DestinationFiles="@(CopyVsixExtensionFiles->'$(CopyVsixExtensionLocation)\%(VSIXSubPath)\%(TargetPath)')"
+        Condition="'%(CopyVsixExtensionFiles.TargetPath)' != ''"
+        SkipUnchangedFiles="true"
+        OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+        Retries="$(CopyRetryCount)"
+        RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)">
+      <Output TaskParameter="DestinationFiles" ItemName="_VsixDeployCurrentFileWrites"/>
+    </Copy>
+
+
+  </Target>
+
+
+  <!--
+    ============================================================
+             VSIXContainerProjectOutputGroup
+
+      Used for determining the VSIX Container that this project
+      builds from other projects that reference it.
+    ============================================================
+    -->
+  <Target Name="VSIXContainerProjectOutputGroup"
+          Outputs="@(VSIXContainerOutputGroupOutput)"
+          DependsOnTargets="$(VSIXContainerProjectOutputGroupDependsOn)">
+
+    <ItemGroup Condition="'$(CreateVsixContainer)'=='true'">
+      <_VSIXContainerOutputGroupOutput Include="$(TargetVsixContainer)" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(CreateVsixContainer)'=='true'">
+      <VSIXContainerOutputGroupOutput Include="@(_VSIXContainerOutputGroupOutput->'%(FullPath)')" />
+    </ItemGroup>
+  </Target>
+
+  <!--
+    =======================================================================================================
+                                                Run RegRiched20.exe
+    =======================================================================================================
+  -->
+  <PropertyGroup>
+    <PrepareForBuildDependsOn>
+      $(PrepareForBuildDependsOn);
+      RunRegRiched
+    </PrepareForBuildDependsOn>
+    <RunRegRichedDependsOn>$(RunRegRichedDependsOn);FindSDKInstallation</RunRegRichedDependsOn>
+  </PropertyGroup>
+
+  <Target Name="RunRegRiched"
+         DependsOnTargets="$(RunRegRichedDependsOn)"
+         Condition="'$(RunRegRiched)' == 'true'">
+    <Warning
+      Text="RegRiched20.exe was not found."
+      Condition="!Exists('$(VsSDKInstall)VisualStudioIntegration\Tools\Bin\RegRiched20.exe')">
+    </Warning>
+    <Exec Command="&quot;$(VsSDKInstall)VisualStudioIntegration\Tools\Bin\RegRiched20.exe&quot;"
+          ContinueOnError="true"
+          Condition="Exists('$(VsSDKInstall)VisualStudioIntegration\Tools\Bin\RegRiched20.exe')">
+    </Exec>
+  </Target>
+
+  <!--
+    =======================================================================================================
+    This target sets a property when the .cto file is newer than the previously built assembly.
+    =======================================================================================================
+  -->
+
+  <Target Name="CheckCTOFileHasChanged"
+          Inputs="@(VSCTCompile->'$(IntermediateOutputPath)%(FileName).cto')"
+          Outputs="$(TargetPath)"
+          DependsOnTargets="VSCTCompile">
+
+    <CreateProperty Value="true">
+      <Output PropertyName="CTOFileHasChanged"
+              TaskParameter="ValueSetByTask" />
+    </CreateProperty>
+  </Target>
+
+
+  <!--
+    =======================================================================================================
+                                              Merging CTO resource
+    =======================================================================================================
+  -->
+  <PropertyGroup>
+    <!-- The result of the VSCT compilation will be used by the resource generator, so this task
+         must depend on the VSCT one -->
+    <PrepareResourcesDependsOn>$(PrepareResourcesDependsOn);MergeCtoResource</PrepareResourcesDependsOn>
+    <MergeCtoResourceDependsOn>$(MergeCtoResourceDependsOn);GenerateListOfCTO;VSCTCompile;CheckCTOFileHasChanged;GenerateResourceToMergeWithCTO</MergeCtoResourceDependsOn>
+  </PropertyGroup>
+
+  <!--
+    Create the list of the .RESOURCES files to merge with the CTO data.
+  -->
+  <Target Name="GenerateResourceToMergeWithCTO"
+          DependsOnTargets="ResGen">
+    <ItemGroup>
+      <_ResourcesToMergeWithCTO Include="%(EmbeddedResource.OutputResource)" Condition="'%(EmbeddedResource.MergeWithCTO)'=='true'"/>
+    </ItemGroup>
+    <AssignCulture Files="@(_ResourcesToMergeWithCTO)" >
+      <!-- Create the list of resources with Culture metadata -->
+      <Output TaskParameter="AssignedFiles" ItemName="_ResourcesToMergeWithCTOWithCultureMetadata"/>
+    </AssignCulture>
+  </Target>
+
+  <!--
+  Create the list of the expected CTO files.
+  -->
+  <Target Name="GenerateListOfCTO">
+    <!--Add the CTO files from the list of VSCT files.-->
+    <ItemGroup>
+      <_GeneratedCTOFiles  Include="@(VSCTCompile->'$(IntermediateOutputPath)%(FileName).cto')" Condition="'@(VSCTCompile)' != ''"/>
+    </ItemGroup>
+    <AssignCulture Files="@(_GeneratedCTOFiles)" >
+      <!-- Create the list of culture cto files -->
+      <Output TaskParameter="AssignedFilesWithCulture" ItemName="_GeneratedCTOFilesWithCulture"/>
+      <!-- Create the list of non-culture cto files -->
+      <Output TaskParameter="AssignedFilesWithNoCulture" ItemName="_GeneratedCTOFilesWithNoCulture"/>
+    </AssignCulture>
+  </Target>
+
+  <Target Name="MergeCtoResource"
+          Condition="'@(VSCTCompile)' != '' AND '$(BuildingProject)'!='false'"
+          DependsOnTargets="$(MergeCtoResourceDependsOn)">
+
+    <CtoResourceMerger CtoFilesWithCulture="@(_GeneratedCTOFilesWithCulture)"
+                       CtoFilesWithNoCulture="@(_GeneratedCTOFilesWithNoCulture)"
+                       IntermediateDirectory="$(IntermediateOutputPath)"
+                       ResourcesToMerge="@(_ResourcesToMergeWithCTOWithCultureMetadata)" >
+      <Output TaskParameter="TemporaryFiles" ItemName="_TemporaryCtoResouceMergerFiles"/>
+    </CtoResourceMerger>
+    <ItemGroup>
+      <FileWrites Include="@(_TemporaryCtoResouceMergerFiles)" />
+    </ItemGroup>
+  </Target>
+
+  <!--
+    =======================================================================================================
+                                       Generate code from LEX files
+    =======================================================================================================
+  -->
+  <PropertyGroup>
+    <!--Make sure that the lexer runs before the C# compiler-->
+    <CoreCompileDependsOn>$(CoreCompileDependsOn);GenerateCodeFromLex</CoreCompileDependsOn>
+  </PropertyGroup>
+  <!--
+    TODO: When MPLex.exe will allow us to specify the name / path of the output file we should change this
+    target to use custom output names and use @(MPLexCompile->'$(IntermediateOutputPath)%(FileName).cs')
+    as default.
+  -->
+  <Target Name="GenerateCodeFromLex"
+          Condition="'$(BuildingProject)'!='false'"
+          Inputs="@(MPLexCompile);$(LexFrameFile)"
+          Outputs="@(MPLexCompile->'$(IntermediateOutputPath)%(FileName).cs')"
+          DependsOnTargets="$(GenerateCodeFromLexDependsOn)">
+
+    <MPLex InputFile="@(MPLexCompile)"
+           OutputFile="@(MPLexCompile->'$(IntermediateOutputPath)%(FileName).cs')"
+           CompressTables="$(CompressTables)"
+           FrameFile="$(LexFrameFile)"
+           SDKVersion="$(VsSDKVersion)">
+      <Output TaskParameter="OutputFile" ItemName="Compile" />
+      <Output TaskParameter="OutputFile" ItemName="FileWrites"/>
+    </MPLex>
+
+  </Target>
+
+  <!--
+    =======================================================================================================
+                                      Generate parser code from Y files
+    =======================================================================================================
+  -->
+  <PropertyGroup>
+    <GenerateParserCodeFromGrammarDependsOn>$(GenerateParserCodeFromGrammarDependsOn);FindSDKInstallation</GenerateParserCodeFromGrammarDependsOn>
+    <CoreCompileDependsOn>$(CoreCompileDependsOn);GenerateParserCodeFromGrammar</CoreCompileDependsOn>
+  </PropertyGroup>
+  <Target Name="GenerateParserCodeFromGrammar"
+          Condition="'$(BuildingProject)'!='false'"
+          Inputs="@(MPPGCompile)"
+          Outputs="@(MPPGCompile->'$(IntermediateOutputPath)%(FileName).cs')"
+          DependsOnTargets="$(GenerateParserCodeFromGrammarDependsOn)">
+
+    <!--Check if there are .lex files in the project because in this case mppg should generate the base classes
+        used by the code generated by MPLex-->
+    <CreateProperty Value="-mplex" Condition="'@(MPLexCompile)' != ''">
+      <Output TaskParameter="ValueSetByTask" PropertyName="__GenerateForMPLex" />
+    </CreateProperty>
+
+    <!--Run the command line tool that generates the cs files.-->
+    <Exec Command="&quot;$(VsSDKToolsPath)\MPPG.exe&quot; $(__GenerateForMPLex) @(MPPGCompile->'&quot;%(Identity)&quot;') > @(MPPGCompile->'&quot;$(IntermediateOutputPath)%(FileName).cs&quot;')" />
+
+    <!--Add the generated files to the list of the files to compile.-->
+    <CreateItem Include="@(MPPGCompile->'$(IntermediateOutputPath)%(FileName).cs')">
+      <Output TaskParameter="Include" ItemName="Compile" />
+      <Output TaskParameter="Include" ItemName="FileWrites"/>
+    </CreateItem>
+  </Target>
+
+  <!--
+    =======================================================================================================
+                                         Generating PkgDef File
+    =======================================================================================================
+  -->
+  <PropertyGroup>
+    <PrepareForRunDependsOn>
+      $(PrepareForRunDependsOn);
+      GeneratePkgDef;
+      CopyPkgDef;
+      CreateVsixContainer;
+      DeployVsixExtensionFiles;
+      CopyVsixManifestFile;
+      CopyVsixExtensionFiles;
+    </PrepareForRunDependsOn>
+    <GeneratePkgDefDependsOn>$(GeneratePkgDefDependsOn);Compile</GeneratePkgDefDependsOn>
+    <GeneratePkgDefFile Condition="'$(GeneratePkgDefFile)' == ''">true</GeneratePkgDefFile>
+    <UseCodebase Condition="'$(UseCodebase)' == ''">$(RegisterWithCodebase)</UseCodebase>
+  </PropertyGroup>
+
+  <Target Name="GeneratePkgDef"
+          Inputs="$(TargetPath)"
+          Outputs="$(IntermediateOutputPath)$(TargetName).pkgdef"
+          Condition="'$(GeneratePkgDefFile)'=='true'"
+          DependsOnTargets="$(GeneratePkgDefDependsOn)">
+
+    <Message Importance="High" Text="Creating intermediate PkgDef file." />
+
+    <CreatePkgDef AssemblyToProcess="$(TargetPath)"
+              ProductVersion="$(TargetVSVersion)"
+              SDKVersion="$(VsSDKVersion)"
+              OutputFile="$(IntermediateOutputPath)$(TargetName).latest.pkgdef"
+              UseCodebase="$(UseCodebase)" 
+              ReferencedAssemblies="@(ReferencePath)"  />
+    <CopyIfChanged Condition="Exists('$(IntermediateOutputPath)$(TargetName).latest.pkgdef')"
+                   SourceFile="$(IntermediateOutputPath)$(TargetName).latest.pkgdef"
+                   DestinationFile="$(IntermediateOutputPath)$(TargetName).pkgdef" />
+    <ItemGroup>
+      <FileWrites Include="$(IntermediateOutputPath)$(TargetName).pkgdef" Condition="Exists('$(IntermediateOutputPath)$(TargetName).pkgdef')"/>
+      <FileWrites Include="$(IntermediateOutputPath)$(TargetName).latest.pkgdef" Condition="Exists('$(IntermediateOutputPath)$(TargetName).latest.pkgdef')"/>
+    </ItemGroup>
+  </Target>
+
+
+  <!--
+    =======================================================================================================
+                                         PkgdefProjectOutputGroup
+
+      Used for determining the Pkgdef file that this project creates from another project
+    =======================================================================================================
+  -->
+  <Target Name="PkgdefProjectOutputGroup"
+        Outputs="@(PkgdefOutputGroupOutput)"
+        DependsOnTargets="$(PkgdefProjectOutputGroupDependsOn)">
+
+    <ItemGroup Condition="'$(GeneratePkgDefFile)'=='true'">
+      <_PkgdefOutputGroupOutput Include="$(IntermediateOutputPath)$(TargetName).pkgdef" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(GeneratePkgDefFile)'=='true'">
+      <PkgdefOutputGroupOutput Include="@(_PkgdefOutputGroupOutput->'%(FullPath)')" />
+    </ItemGroup>
+
+  </Target>
+
+  <!--
+    =======================================================================================================
+                                         TemplateProjectOutputGroup
+
+      Used for determining the template zip file(s) that this project builds from another project
+    =======================================================================================================
+  -->
+  <PropertyGroup>
+    <TemplateProjectOutputGroupDependsOn>
+      $(TemplateProjectOutputGroupDependsOn);
+      GetZipFilesFromVSTemplates;
+      CalculateZipFiles
+    </TemplateProjectOutputGroupDependsOn>
+  </PropertyGroup>
+  <Target Name="TemplateProjectOutputGroup"
+        Outputs="@(TemplateOutputGroupOutput)"
+        DependsOnTargets="$(TemplateProjectOutputGroupDependsOn)">
+
+    <ItemGroup>
+      <_TemplateOutputGroupOutput Include="@(_ZipProject->'%(ZipFile)')" >
+        <TemplateSubPath>%(_ZipProject.Language)\%(_ZipProject.OutputSubPath)\%(_ZipProject.Culture)</TemplateSubPath>
+      </_TemplateOutputGroupOutput>
+
+      <_TemplateOutputGroupOutput Include="@(_ZipItem->'%(ZipFile)')" >
+        <TemplateSubPath>%(_ZipItem.Language)\%(_ZipItem.OutputSubPath)\%(_ZipItem.Culture)</TemplateSubPath>
+      </_TemplateOutputGroupOutput>
+    </ItemGroup>
+
+    <ItemGroup>
+      <TemplateOutputGroupOutput Include="@(_TemplateOutputGroupOutput->'%(FullPath)')" />
+    </ItemGroup>
+
+  </Target>
+
+  <!--
+    =======================================================================================================
+    This target contains 2 tasks to copy the .pkgdef file only when necessary. 
+    =======================================================================================================
+  -->
+
+  <PropertyGroup>
+    <CopyPkgDefDependsOn>$(CopyPkgDefDependsOn);GeneratePkgDef;CheckCTOFileHasChanged</CopyPkgDefDependsOn>
+  </PropertyGroup>
+
+  <Target Name="CopyPkgDef"
+          Inputs="$(IntermediateOutputPath)$(TargetName).pkgdef"
+          Outputs="$(OutDir)$(TargetName).pkgdef"
+          Condition="'$(GeneratePkgDefFile)'=='true'"
+          DependsOnTargets="$(CopyPkgDefDependsOn)">
+
+    <!--
+      =======================================================================================================
+      This task copies the .pkgdef file to the target directory when the .cto file has changed. 
+      Even though the .pkgdef file contents might have not changed, the new timestamp on the .pkgdef file
+      will cause Visual Studio to re-merge menus on next launch.
+      =======================================================================================================
+    -->
+    <Copy Condition="'$(CTOFileHasChanged)'=='true'"
+          SourceFiles="$(IntermediateOutputPath)$(TargetName).pkgdef"
+          DestinationFiles="$(OutDir)$(TargetName).pkgdef"
+          SkipUnchangedFiles="false"
+          OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+          Retries="$(CopyRetryCount)"
+          RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)">
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+    </Copy>
+
+    <!--
+      =======================================================================================================
+      This target copies the .pkgdef file to the target directory only if its contents have changed.
+      This is an optimization to avoid rebuilding the PkgDef cache if this .pkgdef has not really changed.
+      =======================================================================================================
+    -->
+    <CopyIfChanged Condition="'$(CTOFileHasChanged)'!='true'"
+                   SourceFile="$(IntermediateOutputPath)$(TargetName).pkgdef"
+                   DestinationFile="$(OutDir)$(TargetName).pkgdef" >
+      <Output TaskParameter="DestinationFile" ItemName="FileWrites"/>
+    </CopyIfChanged>
+
+  </Target>
+
+  <!--
+    =======================================================================================================
+                                         Creating Zip Files
+    =======================================================================================================
+  -->
+
+  <PropertyGroup>
+    <PrepareForRunDependsOn>
+      ZipProjects;
+      ZipItems;
+      $(PrepareForRunDependsOn)
+    </PrepareForRunDependsOn>
+    <ZipFilesDependsOn>VsTemplatePathsTarget;GetZipFilesFromVSTemplates;CalculateZipFiles</ZipFilesDependsOn>
+  </PropertyGroup>
+
+  <!--Make sure that the zip output is set-->
+  <PropertyGroup>
+    <ZipProjectOutput Condition="'$(ZipProjectOutput)' == ''">$(OutputPath)</ZipProjectOutput>
+    <ZipItemOutput Condition="'$(ZipItemOutput)' == ''">$(OutputPath)</ZipItemOutput>
+    <ZipIntermediatePath Condition="'$(ZipIntermediatePath)' == ''">$(IntermediateOutputPath)</ZipIntermediatePath>
+    <CopyZipOutputToOutputDirectory Condition="'$(CopyZipOutputToOutputDirectory)'==''">true</CopyZipOutputToOutputDirectory>
+  </PropertyGroup>
+
+  <Target Name="GetZipFilesFromVSTemplates"
+          Condition="'@(VSTemplate)'!=''" >
+    <GetVSTemplateItems
+      TemplateFiles="@(VSTemplate)"
+      TargetPath="$(ZipIntermediatePath)">
+      <Output TaskParameter="ZipItems" ItemName="_ZipItem" />
+      <Output TaskParameter="ZipProjects" ItemName="_ZipProject" />
+    </GetVSTemplateItems>
+  </Target>
+
+  <Target Name="CalculateZipFiles"
+          Condition="'@(ZipProject)_@(ZipItem)' != '_'">
+    <!--The purpose of this target is to calculate the intermediate path for each ZipProject/ZipItem
+      Normally, something like this can be done in a MSBuild Transform, but this is a little more complicated
+      for ZipItems/Projects, so we need a custom task-->
+
+    <!--Project using RootPath-->
+    <CalculateZipItems
+        Condition="'%(ZipProject.RootPath)'!='' AND '@(ZipProject)' != ''"
+        Files="@(ZipProject)"
+        ProjectPath="$(MSBuildProjectDirectory)"
+        ZipName="%(ZipProject.RootPath)"
+        TargetPath="$(ZipIntermediatePath)">
+      <Output
+        TaskParameter="Files"
+        ItemName="_ZipProject" />
+    </CalculateZipItems>
+
+    <!--Project using Directory-->
+    <CalculateZipItems
+        Condition="'%(ZipProject.RootPath)'=='' AND '@(ZipProject)' != ''"
+        Files="@(ZipProject)"
+        ProjectPath="$(MSBuildProjectDirectory)"
+        ZipName="%(ZipProject.Directory)"
+        TargetPath="$(ZipIntermediatePath)" >
+      <Output
+        TaskParameter="Files"
+        ItemName="_ZipProject" />
+    </CalculateZipItems>
+
+    <!--Item using RootPath-->
+    <CalculateZipItems
+        Condition="'%(ZipItem.RootPath)'!='' AND '@(ZipItem)' != ''"
+        Files="@(ZipItem)"
+        ProjectPath="$(MSBuildProjectDirectory)"
+        ZipName="%(ZipItem.RootPath)"
+        TargetPath="$(ZipIntermediatePath)">
+      <Output
+        TaskParameter="Files"
+        ItemName="_ZipItem" />
+    </CalculateZipItems>
+
+    <!--Item using Directory-->
+    <CalculateZipItems
+        Condition="'%(ZipItem.RootPath)'=='' AND '@(ZipItem)' != ''"
+        Files="@(ZipItem)"
+        ProjectPath="$(MSBuildProjectDirectory)"
+        ZipName="%(ZipItem.Directory)"
+        TargetPath="$(ZipIntermediatePath)"
+        >
+      <Output
+        TaskParameter="Files"
+        ItemName="_ZipItem" />
+    </CalculateZipItems>
+  </Target>
+
+  <Target Name="ZipProjects"
+         DependsOnTargets="$(ZipFilesDependsOn)"
+         Condition="'@(_ZipProject)' != '_'">
+    <Message Text="Zipping ProjectTemplates"/>
+    <!--
+      There are 2 options for using this task:
+        1) specifying a rootpath on each item
+        2) using the directory of the item as the rootpath
+
+      Note: the name of the zip file will be based on the rootpath
+    -->
+    <!--Project using RootPath-->
+    <ZipItems
+        Condition="'%(_ZipProject.RootPath)'!='' AND '@(_ZipProject)' != ''"
+        Files="@(_ZipProject)"
+        Action="New"
+        OutputSubPath="%(_ZipProject.OutputSubPath)"
+        Culture="%(_ZipProject.Culture)"
+        ProjectPath="$(MSBuildProjectDirectory)"
+        RootPath="$(MSBuildProjectDirectory)\%(_ZipProject.RootPath)"
+        ZipDefaultLanguage="$(VsTemplateLanguage)"
+        ZipLanguage="%(_ZipProject.Language)"
+        ZipFile="%(_ZipProject.ZipFile)">
+      <Output TaskParameter="ZipFile" ItemName="IntermediateZipProject"/>
+      <Output TaskParameter="ZipFile" ItemName="FileWrites"/>
+    </ZipItems>
+
+    <!--Project using Directory-->
+    <ZipItems
+        Condition="'%(_ZipProject.RootPath)'=='' AND '@(_ZipProject)' != ''"
+        Files="@(_ZipProject)"
+        Action="New"
+        OutputSubPath="%(_ZipProject.OutputSubPath)"
+        Culture="%(_ZipProject.Culture)"
+        ProjectPath="$(MSBuildProjectDirectory)"
+        RootPath="%(_ZipProject.RootDir)%(_ZipProject.Directory)"
+        ZipDefaultLanguage="$(VsTemplateLanguage)"
+        ZipLanguage="%(_ZipProject.Language)"
+        ZipFile="%(_ZipProject.ZipFile)">
+      <Output TaskParameter="ZipFile" ItemName="IntermediateZipProject"/>
+      <Output TaskParameter="ZipFile" ItemName="FileWrites"/>
+    </ZipItems>
+
+    <!--
+      Copy the generated templates to the deployment folder.
+    -->
+    <Copy SourceFiles="@(IntermediateZipProject)"
+          DestinationFiles="@(IntermediateZipProject->'$(ZipProjectOutput)\%(Language)\%(OutputSubPath)\%(Culture)\%(FileName)%(Extension)')"
+          SkipUnchangedFiles="true"
+          OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+          Retries="$(CopyRetryCount)"
+          RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+          Condition="'$(DeployVSTemplates)'=='true'" />
+
+    <!--
+      Copy the generated templates to the output folder.
+    -->
+    <Copy SourceFiles="@(IntermediateZipProject)"
+          DestinationFiles="@(IntermediateZipProject->'$(OutDir)\ProjectTemplates\%(Language)\%(OutputSubPath)\%(Culture)\%(FileName)%(Extension)')"
+          SkipUnchangedFiles="true"
+          OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+          Retries="$(CopyRetryCount)"
+          RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+          Condition="'$(CopyZipOutputToOutputDirectory)'=='true'" >
+      <Output TaskParameter="DestinationFiles" ItemName="_ZipProjectOutDir"/>
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+    </Copy>
+
+    <Message Importance="High" Text="$(MSBuildProjectName) -&gt; @(_ZipProjectOutDir->'%(FullPath)')" />
+
+  </Target>
+
+  <Target Name="ZipItems"
+          DependsOnTargets="$(ZipFilesDependsOn)"
+          Condition="'@(_ZipItem)' != '_'">
+
+    <Message Text="Zipping ItemTemplates"/>
+
+    <!--
+      There are 2 options for using this task:
+        1) specifying a rootpath on each item
+        2) using the directory of the item as the rootpath
+
+      Note: the name of the zip file will be based on the rootpath
+    -->
+
+    <!--Item using RootPath-->
+    <ZipItems
+        Condition="'%(_ZipItem.RootPath)'!='' AND '@(_ZipItem)' != ''"
+        Files="@(_ZipItem)"
+        Action="New"
+        OutputSubPath="%(_ZipItem.OutputSubPath)"
+        Culture="%(_ZipItem.Culture)"
+        ProjectPath="$(MSBuildProjectDirectory)"
+        RootPath="$(MSBuildProjectDirectory)\%(_ZipItem.RootPath)"
+        ZipDefaultLanguage="$(VsTemplateLanguage)"
+        ZipLanguage="%(_ZipItem.Language)"
+        ZipFile="%(_ZipItem.ZipFile)">
+      <Output TaskParameter="ZipFile" ItemName="IntermediateZipItem"/>
+      <Output TaskParameter="ZipFile" ItemName="FileWrites"/>
+    </ZipItems>
+
+    <!--Item using Directory-->
+    <ZipItems
+        Condition="'%(_ZipItem.RootPath)'=='' AND '@(_ZipItem)' != ''"
+        Files="@(_ZipItem)"
+        Action="New"
+        OutputSubPath="%(_ZipItem.OutputSubPath)"
+        Culture="%(_ZipItem.Culture)"
+        ProjectPath="$(MSBuildProjectDirectory)"
+        RootPath="%(_ZipItem.RootDir)%(_ZipItem.Directory)"
+        ZipDefaultLanguage="$(VsTemplateLanguage)"
+        ZipLanguage="%(_ZipItem.Language)"
+        ZipFile="%(_ZipItem.ZipFile)">
+      <Output TaskParameter="ZipFile" ItemName="IntermediateZipItem"/>
+      <Output TaskParameter="ZipFile" ItemName="FileWrites"/>
+    </ZipItems>
+
+    <!--
+      Copy the generated templates to the deployment folder.
+    -->
+    <Copy SourceFiles="@(IntermediateZipItem)"
+          DestinationFiles="@(IntermediateZipItem->'$(ZipItemOutput)\%(Language)\%(OutputSubPath)\%(Culture)\%(FileName)%(Extension)')"
+          SkipUnchangedFiles="true"
+          OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+          Retries="$(CopyRetryCount)"
+          RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+          Condition="'$(DeployVSTemplates)'=='true'" />
+
+    <!--
+      Copy the generated templates to the output folder.
+    -->
+    <Copy SourceFiles="@(IntermediateZipItem)"
+          DestinationFiles="@(IntermediateZipItem->'$(OutDir)\ItemTemplates\%(Language)\%(OutputSubPath)\%(Culture)\%(FileName)%(Extension)')"
+          SkipUnchangedFiles="true"
+          OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+          Retries="$(CopyRetryCount)"
+          RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+          Condition="'$(CopyZipOutputToOutputDirectory)'=='true'" >
+      <Output TaskParameter="DestinationFiles" ItemName="_ZipItemOutDir"/>
+      <Output TaskParameter="DestinationFiles" ItemName="FileWrites"/>
+    </Copy>
+
+    <Message Importance="High" Text="$(MSBuildProjectName) -&gt; @(_ZipItemOutDir->'%(FullPath)')" />
+
+  </Target>
+  
+  <!--Provide support for setting type (BuildAction) to ZipProject/ZipItem from VS-->
+  <ItemGroup>
+    <AvailableItemName Include="VSTemplate"/>
+    <AvailableItemName Include="ZipProject"/>
+    <AvailableItemName Include="ZipItem"/>
+  </ItemGroup>
+
+  <!--Target to retrive deployment path for vstemplates zip files-->
+  <Target Name="VsTemplatePathsTarget"
+          DependsOnTargets="$(VsTemplatePathsTargetDependsOn)"
+          Condition="'$(DeployVSTemplates)'=='true'">
+
+    <VsTemplatePaths RegistryHive="$(VSSDKTargetPlatformRegRoot)$(VSSDKTargetPlatformRegRootSuffix)">
+      <Output TaskParameter="ProjectTemplates" PropertyName="ZipProjectOutput"/>
+      <Output TaskParameter="ItemTemplates" PropertyName="ZipItemOutput"/>
+    </VsTemplatePaths>
+
+    <!--Make sure those directories exist-->
+    <MakeDir Directories="$(ZipProjectOutput);$(ZipItemOutput)"/>
+  </Target>
+
+</Project>
diff --git a/tools/bin/VsSDK/ResetExpInstance.bat b/tools/bin/VsSDK/ResetExpInstance.bat
new file mode 100644
index 000000000..218170734
--- /dev/null
+++ b/tools/bin/VsSDK/ResetExpInstance.bat
@@ -0,0 +1 @@
+"%~dp0CreateExpInstance.exe" /Reset /VSInstance=10.0 /RootSuffix=Exp
\ No newline at end of file
diff --git a/tools/bin/VsSDK/VSCTCompress.dll b/tools/bin/VsSDK/VSCTCompress.dll
new file mode 100644
index 000000000..5f5b59895
Binary files /dev/null and b/tools/bin/VsSDK/VSCTCompress.dll differ
diff --git a/tools/bin/VsSDK/VSCTLibrary.dll b/tools/bin/VsSDK/VSCTLibrary.dll
new file mode 100644
index 000000000..f0f3b50db
Binary files /dev/null and b/tools/bin/VsSDK/VSCTLibrary.dll differ
diff --git a/tools/bin/VsSDK/VSIXManifestSchema.xsd b/tools/bin/VsSDK/VSIXManifestSchema.xsd
new file mode 100644
index 000000000..078f77526
--- /dev/null
+++ b/tools/bin/VsSDK/VSIXManifestSchema.xsd
@@ -0,0 +1,437 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema version="1.0.0" attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://schemas.microsoft.com/developer/vsx-schema/2010" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:annotation>
+    <xs:documentation>
+      <!-- _locID_text="VsixSchema" _locComment="" -->This schema is used for installing extensions to Visual Studio.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:element name="Vsix">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="Identifier" minOccurs="1" maxOccurs="1">
+          <xs:annotation>
+            <xs:documentation>
+              <!-- _locID_text="Identifier" _locComment="" -->The Identifier section is used to uniquely identify the extension and provide metadata about the extension.
+            </xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:all>
+              <xs:element name="Name" minOccurs="1" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="Identifier.Name" _locComment="" -->The Name element is the product name.
+                  </xs:documentation>
+                </xs:annotation>
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="Author" minOccurs="1" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="Author" _locComment="" -->The Author element is the person or company creating the extension.
+                  </xs:documentation>
+                </xs:annotation>
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="Version" type="xs:string" minOccurs="1" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="Identifier.Version" _locComment="" -->The Version element is the version of the extension.  The convention for version is A.B.C.D.
+                    For example: 1.0.0.0
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="Description" minOccurs="1" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="Description" _locComment="" -->The Description element is used to describe the extension.
+                  </xs:documentation>
+                </xs:annotation>
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="1000" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="Locale" type="xs:unsignedShort" minOccurs="1" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="Locale" _locComment="" -->The Locale element describes the locale of the extension.  The locale value is a four digit numerical value.
+                    For example: 1033 is English, 1041 is Japanese.
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="MoreInfoUrl" type="xs:string" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="Identifier.MoreInfoUrl" _locComment="" -->The MoreInfoUrl element is used to provide additional information to the consumer of the extension.  The hyperlink to the URL
+                    provided appears in the Extension Manager UI inside the product.
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="License" type="xs:string" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="License" _locComment="" -->The License element allows the developer to specify a license or end user licensing agreement (EULA).
+                    The license is displayed when the consumer of the extension tries to install the extension.
+                    The license can be a text file or an RTF file.
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="GettingStartedGuide" type="xs:string" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="GettingStartedGuide" _locComment="" -->The GettingStartedGuide element is a link to a website or file that gets launched in the client's browser after the extension
+                    is installed.  This provides the developer an opportunity to provide additional information or help to the consumer once
+                    the extension is installed.
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="Icon" type="xs:string" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="Icon" _locComment="" -->The Icon element allows the developer to provide an icon that appears in the Extension Manager UI when browsing for the extension.
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="PreviewImage" type="xs:string" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="PreviewImage" _locComment="" -->The Preview element allows the developer to provide an image that appears in the Extension Manager UI preview pane when browsing
+                    for the extension.
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="InstalledByMsi" type="xs:boolean" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="InstalledByMsi" _locComment="" -->The InstalledByMsi element should be used if the VSIX is being installed by an MSI.
+                    Setting this property to true means the extension will appear in the Extension Manager if the manifest is placed in a supported
+                    location on disk. However, the end user will not be able to uninstall it.  The user will need to remove the extension from
+                    Windows Add/Remove Programs by uninstalling the parent MSI.
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="SupportedProducts" minOccurs="1" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="SupportedProducts" _locComment="" -->The SupportedProducts element is a list of elements the extension will target.
+                  </xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                  <xs:choice minOccurs="1" maxOccurs="unbounded">
+                    <xs:element name="VisualStudio" minOccurs="1" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element minOccurs="1" maxOccurs="unbounded" name="Edition">
+                            <xs:simpleType>
+                              <xs:union>
+                                <xs:simpleType>
+                                  <xs:restriction base="xs:string">
+                                    <xs:enumeration value="IntegratedShell">
+                                      <xs:annotation>
+                                        <xs:documentation>
+                                          <!-- _locID_text="Edition.IntegratedShell" _locComment="" -->This will target the Integrated Shell and all VS Editions.
+                                        </xs:documentation>
+                                      </xs:annotation>
+                                    </xs:enumeration>
+                                    <xs:enumeration value="Pro">
+                                      <xs:annotation>
+                                        <xs:documentation>
+                                          <!-- _locID_text="Edition.Pro" _locComment="" -->This will target VS Professional, Premium and Ultimate.
+                                        </xs:documentation>
+                                      </xs:annotation>
+                                    </xs:enumeration>
+                                    <xs:enumeration value="Premium">
+                                      <xs:annotation>
+                                        <xs:documentation>
+                                          <!-- _locID_text="Edition.Premium" _locComment="" -->This will target VS Premium and Ultimate.
+                                        </xs:documentation>
+                                      </xs:annotation>
+                                    </xs:enumeration>
+                                    <xs:enumeration value="Ultimate">
+                                      <xs:annotation>
+                                        <xs:documentation>
+                                          <!-- _locID_text="Edition.Ultimate" _locComment="" -->This will target VS Ultimate.
+                                        </xs:documentation>
+                                      </xs:annotation>
+                                    </xs:enumeration>
+                                    <xs:enumeration value="VWDExpress">
+                                      <xs:annotation>
+                                        <xs:documentation>
+                                          <!-- _locID_text="Edition.VWDExpress" _locComment="" -->This will target Visual Web Developer.
+                                        </xs:documentation>
+                                      </xs:annotation>
+                                    </xs:enumeration>
+                                    <xs:enumeration value="VCSExpress">
+                                      <xs:annotation>
+                                        <xs:documentation>
+                                          <!-- _locID_text="Edition.VCSExpress" _locComment="" -->This will target Visual C# Express.
+                                        </xs:documentation>
+                                      </xs:annotation>
+                                    </xs:enumeration>
+                                    <xs:enumeration value="VBExpress">
+                                      <xs:annotation>
+                                        <xs:documentation>
+                                          <!-- _locID_text="Edition.VBExpress" _locComment="" -->This will target Visual Basic Express.
+                                        </xs:documentation>
+                                      </xs:annotation>
+                                    </xs:enumeration>
+                                    <xs:enumeration value="VCExpress">
+                                      <xs:annotation>
+                                        <xs:documentation>
+                                          <!-- _locID_text="Edition.VCExpress" _locComment="" -->This will target Visual C++ Express.
+                                        </xs:documentation>
+                                      </xs:annotation>
+                                    </xs:enumeration>
+                                    <xs:enumeration value="Express_All">
+                                      <xs:annotation>
+                                        <xs:documentation>
+                                          <!-- _locID_text="Edition.Express_All" _locComment="" -->This will target all Express products.
+                                        </xs:documentation>
+                                      </xs:annotation>
+                                    </xs:enumeration>
+                                  </xs:restriction>
+                                </xs:simpleType>
+                                <xs:simpleType>
+                                  <xs:restriction base="xs:string"/>
+                                </xs:simpleType>
+                              </xs:union>
+                            </xs:simpleType>
+                          </xs:element>
+                        </xs:sequence>
+                        <xs:attribute name="Version" type="xs:string" use="required">
+                          <xs:annotation>
+                            <xs:documentation>
+                              <!-- _locID_text="SupportedProduct.VSVersion" _locComment="" -->The Version attribute maps to the version of Visual Studio.  For VS 2010, the version is 10.0
+                            </xs:documentation>
+                          </xs:annotation>
+                        </xs:attribute>
+                      </xs:complexType>
+                    </xs:element>
+                    <xs:element name="IsolatedShell" minOccurs="1" maxOccurs="unbounded">
+                      <xs:annotation>
+                        <xs:documentation>
+                          <!-- _locID_text="SupportedProduct.IsolatedShell" _locComment="" -->The IsolatedShell element is used to describe which Isolated shell the extension can target.
+                        </xs:documentation>
+                      </xs:annotation>
+                      <xs:complexType>
+                        <xs:simpleContent>
+                          <xs:extension base="xs:string">
+                            <xs:attribute name="Version" type="xs:string" use="required" />
+                          </xs:extension>
+                        </xs:simpleContent>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:choice>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="SupportedFrameworkRuntimeEdition" minOccurs="1" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="SupportedFrameworkRuntimeEdition" _locComment="" -->The SupportedFrameworkRuntimeEdition element is used to describe the minimum and maximum .NET Framework runtime required
+                    for the extension to run correctly.
+                  </xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                  <xs:attribute name="MinVersion" type="xs:string" use="required" />
+                  <xs:attribute name="MaxVersion" type="xs:string" use="optional" />
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="SystemComponent" type="xs:boolean" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="SystemComponent" _locComment="" -->The SystemComponent element will hide the extension from the Extension Manager UI.
+                    Warning, users will not be able to uninstall the extension through the Extension Manager UI if this is set.
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="AllUsers" type="xs:boolean" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="AllUsers" _locComment="" -->Setting the AllUsers element to "true" will force the extension to be installed to the Per Machine location.
+                    This location for VS 2010 is %VSInstallDir%\Common7\Ide\Extensions\[Author]\[Name]\[Version]
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+            </xs:all>
+            <xs:attribute name="Id" use="required">
+              <xs:annotation>
+                <xs:documentation>
+                  <!-- _locID_text="Identifier.Id" _locComment="" -->The Id attribute is a unique string for the extension.
+                  An extension with the same Id value and a newer version value of another extension is an update of that extension.
+                  The Id string can be any string and does not have to be a GUID.
+                </xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="References" minOccurs="0" maxOccurs="1">
+          <xs:annotation>
+            <xs:documentation>
+              <!-- _locID_text="References" _locComment="" -->The References section allows the extension creator to define the dependencies that are required for their extension.
+              If the referenced VSIX is not installed or carried as a payload, the install will fail.
+              The end user will see an error message and be provided a link to download the missing dependency.
+            </xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="Reference" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:all>
+                    <xs:element name="Name" type="xs:string" minOccurs="1" maxOccurs="1">
+                      <xs:annotation>
+                        <xs:documentation>
+                          <!-- _locID_text="Reference.Name" _locComment="" -->The Name element is the product name of the missing dependency.
+                        </xs:documentation>
+                      </xs:annotation>
+                    </xs:element>
+                    <xs:element name="MoreInfoUrl" type="xs:string" minOccurs="0" maxOccurs="1">
+                      <xs:annotation>
+                        <xs:documentation>
+                          <!-- _locID_text="Reference.MoreInfoUrl" _locComment="" -->The MoreInfoUrl is the URL where the end user can get more information about the dependency or a link to
+                          a page where they can download the dependency.
+                        </xs:documentation>
+                      </xs:annotation>
+                    </xs:element>
+                    <xs:element name="VsixPath" type="xs:string" minOccurs="0" maxOccurs="1">
+                      <xs:annotation>
+                        <xs:documentation>
+                          <!-- _locID_text="Reference.VsixPath" _locComment="" -->The VsixPath element allows the dependency to be carried as a payload.  The path will refer to a relative
+                          path to the .VSIX file from the root of the outer VSIX.
+                        </xs:documentation>
+                      </xs:annotation>
+                    </xs:element>
+                  </xs:all>
+                  <xs:attribute name="Id" use="required">
+                    <xs:annotation>
+                      <xs:documentation>
+                        <!-- _locID_text="Reference.Id" _locComment="" -->The Id attribute is the Id of the missing dependency that is being referenced.
+                      </xs:documentation>
+                    </xs:annotation>
+                  </xs:attribute>
+                  <xs:attribute name="MinVersion" type="xs:string" use="optional">
+                    <xs:annotation>
+                      <xs:documentation>
+                        <!-- _locID_text="Reference.MinVersion" _locComment="" -->The MinVersion and MaxVersion attributes provide an optional range of versions of the missing dependency.
+                        It is up to the developer to ensure a MaxVersion if there are known breaking changes in a newer release.
+                      </xs:documentation>
+                    </xs:annotation>
+                  </xs:attribute>
+                  <xs:attribute name="MaxVersion" type="xs:string" use="optional">
+                    <xs:annotation>
+                      <xs:documentation>
+                        <!-- _locID_text="Reference.MaxVersion" _locComment="" -->The MinVersion and MaxVersion attributes provide an optional range of versions of the missing dependency.
+                        It is up to the developer to ensure a MaxVersion if there are known breaking changes in a newer release.
+                      </xs:documentation>
+                    </xs:annotation>
+                  </xs:attribute>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="Content" minOccurs="0" maxOccurs="1">
+          <xs:annotation>
+            <xs:documentation>
+              <!-- _locID_text="Content" _locComment="" -->The Content section is used to describe the payload in the VSIX.
+              Not all content needs to be described.  Only the extension types need to be defined.
+            </xs:documentation>
+          </xs:annotation>
+          <xs:complexType>
+            <xs:choice minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="ProjectTemplate" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="ProjectTemplate" _locComment="" -->The ProjectTemplate element is a directory name of where the project template zip appears in the VSIX.
+                    This must be a directory.
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="ItemTemplate" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="ItemTemplate" _locComment="" -->The ItemTemplate element is a directory name of where the item template zip file appears in the VSIX.
+                    This must be a directory.
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="Assembly" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="Assembly" _locComment="" -->The Assembly element is used if there is a project or item template which requires a wizard.
+                    The Assembly value will point to the assembly file in the VSIX.
+                  </xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:extension base="xs:string">
+                      <xs:attribute name="AssemblyName" type="xs:string" use="required">
+                        <xs:annotation>
+                          <xs:documentation>
+                            <!-- _locID_text="AssemblyName" _locComment="" -->The AssemblyName is the full strong name of the Assembly.  This is required to properly load the template wizard.
+                          </xs:documentation>
+                        </xs:annotation>
+                      </xs:attribute>
+                    </xs:extension>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="MefComponent" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="MefComponent" _locComment="" -->The MefComponent element defines the location of the MEF assembly in the VSIX package.
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="VsPackage" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="VsPackage" _locComment="" -->The VsPackage element defines the location of the .pkgdef file in the VSIX package.
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="ToolboxControl" minOccurs="0" maxOccurs="unbounded">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="ToolboxControl" _locComment="" -->The ToolboxControl defines the location of the .pkgdef file in the VSIX that is used to register the ToolboxControl.
+                  </xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element maxOccurs="unbounded" name="CustomExtension" minOccurs="0">
+                <xs:annotation>
+                  <xs:documentation>
+                    <!-- _locID_text="CustomExtension" _locComment="" -->The CustomExtension element is used for defining a custom elemenet that the Extension Manager can load.
+                    The value can be a path to a file or a directory within the VSIX file.
+                  </xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                  <xs:simpleContent>
+                    <xs:extension base="xs:string">
+                      <xs:attribute name="Type" use="required" />
+                      <xs:anyAttribute processContents="lax"/>
+                    </xs:extension>
+                  </xs:simpleContent>
+                </xs:complexType>
+              </xs:element>
+            </xs:choice>
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="Version" type="xs:string" use="required">
+        <xs:annotation>
+          <xs:documentation>
+            <!-- _locID_text="Vsix.Version" _locComment="" -->The Version attribute is the version of the VSIX file.  For VS 2010, use 1.0.0
+          </xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/tools/bin/VsSDK/vsct.exe b/tools/bin/VsSDK/vsct.exe
new file mode 100644
index 000000000..85cbff8e2
Binary files /dev/null and b/tools/bin/VsSDK/vsct.exe differ
diff --git a/tools/bin/VsSDK/vsshlids.h b/tools/bin/VsSDK/vsshlids.h
new file mode 100644
index 000000000..48e618727
--- /dev/null
+++ b/tools/bin/VsSDK/vsshlids.h
@@ -0,0 +1,1899 @@
+//////////////////////////////////////////////////////////////////////////////
+//
+//Copyright 1996-2003 Microsoft Corporation.  All Rights Reserved.
+//
+//File: VSShlIds.H
+//
+//Contents:
+//
+//////////////////////////////////////////////////////////////////////////////
+
+#ifndef _VSSHLIDS_H_
+#define _VSSHLIDS_H_
+
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// GUID Identifiers, created by Visual Studio Shell
+//
+//////////////////////////////////////////////////////////////////////////////
+#ifndef NOGUIDS
+
+#ifdef DEFINE_GUID
+  // Guid if using Office provided icons
+  DEFINE_GUID (guidOfficeIcon,
+    0xd309f794, 0x903f, 0x11d0, 0x9e, 0xfc, 0x00, 0xa0, 0xc9, 0x11, 0x00, 0x4f);
+
+  // Guid for the duplicate accelerator keys
+  DEFINE_GUID (guidKeyDupe,
+    0xf17bdae0, 0xa16d, 0x11d0, 0x9f, 0x4,  0x0,  0xa0, 0xc9, 0x11, 0x0,  0x4f);
+
+  // Guid for Shell's group and menu ids
+  DEFINE_GUID (guidSHLMainMenu,
+    0xd309f791, 0x903f, 0x11d0, 0x9e, 0xfc, 0x00, 0xa0, 0xc9, 0x11, 0x00, 0x4f);
+
+  // Guid for ClassView menu ids
+  DEFINE_GUID(guidClassViewMenu, 
+    0xfb61dcfe, 0xc9cb, 0x4964, 0x84, 0x26, 0xc2, 0xd3, 0x83, 0x34, 0x07, 0x8c);
+
+  // Guid for DocOutline package commands
+  DEFINE_GUID (guidDocOutlinePkg,
+    0x21af45b0, 0xffa5, 0x11d0, 0xb6, 0x3f, 0x00, 0xa0, 0xc9, 0x22, 0xe8, 0x51);
+
+  // Guid for CommonIDE package
+  DEFINE_GUID (guidCommonIDEPackage,
+    0x6E87CFAD, 0x6C05, 0x4adf, 0x9C, 0xD7, 0x3B, 0x79, 0x43, 0x87, 0x5B, 0x7C);
+
+  // Guid for CommonIDE package commands
+  DEFINE_GUID (guidCommonIDEPackageCmd,
+    0x6767e06b, 0x5789, 0x472b, 0x8e, 0xd7, 0x1f, 0x20, 0x73, 0x71, 0x6e, 0x8c);
+
+  // UIContext guid specifying that we're not in View Source mode
+  DEFINE_GUID(guidNotViewSourceMode,
+        0x7174c6a0, 0xb93d, 0x11d1, 0x9f, 0xf4, 0x0, 0xa0, 0xc9, 0x11, 0x0, 0x4f);
+
+  // Guid for shared groups
+  // {234A7FC1-CFE9-4335-9E82-061F86E402C1}
+  DEFINE_GUID(guidSharedMenuGroup,
+    0x234a7fc1, 0xcfe9, 0x4335, 0x9e, 0x82, 0x6, 0x1f, 0x86, 0xe4, 0x2, 0xc1);
+
+  DEFINE_GUID(guidBuildCmdIcons,
+    0x952691c5, 0x34d6, 0x462b, 0xac, 0x56, 0x9a, 0xb0, 0x97, 0x70, 0xa3, 0x0d);
+
+  DEFINE_GUID(CMDSETID_StandardCommandSet2K,
+    0x1496A755, 0x94DE, 0x11D0, 0x8C, 0x3F, 0x00, 0xC0, 0x4F, 0xC2, 0xAA, 0xE2);
+
+  // new command set for Dev10
+  DEFINE_GUID(CMDSETID_StandardCommandSet10, 
+    0x5dd0bb59, 0x7076, 0x4c59, 0x88, 0xd3, 0xde, 0x36, 0x93, 0x1f, 0x63, 0xf0);
+
+// {489EE5BF-F001-41c9-91C7-6E89D9C111AD}
+  DEFINE_GUID(CMDSETID_EzMDI, 
+  0x489ee5bf, 0xf001, 0x41c9, 0x91, 0xc7, 0x6e, 0x89, 0xd9, 0xc1, 0x11, 0xad);
+
+  // Emacs editor emulation
+  // {9A95F3AF-F86A-4aa2-80E6-012BF65DBBC3}
+  DEFINE_GUID(guidEmacsCommandGroup, 
+    0x9a95f3af, 0xf86a, 0x4aa2, 0x80, 0xe6, 0x1, 0x2b, 0xf6, 0x5d, 0xbb, 0xc3);
+
+  // Brief editor emulation
+  // {7A500D8A-8258-46c3-8965-6AC53ED6B4E7}
+  DEFINE_GUID(guidBriefCommandGroup, 
+    0x7a500d8a, 0x8258, 0x46c3, 0x89, 0x65, 0x6a, 0xc5, 0x3e, 0xd6, 0xb4, 0xe7);
+
+  // {501822E1-B5AF-11d0-B4DC-00A0C91506EF}
+  DEFINE_GUID(guidDataCmdId,
+    0x501822e1, 0xB5AF, 0x11D0, 0xB4, 0xDC, 0x00, 0xA0, 0xC9, 0x15, 0x06, 0xEF);
+
+  // {4614107F-217D-4bbf-9DFE-B9E165C65572}
+  DEFINE_GUID(guidVSData, 
+    0x4614107F, 0x217D, 0x4bbf, 0x9D, 0xFE, 0xB9, 0xE1, 0x65, 0xC6, 0x55, 0x72);
+
+  //{732abe75-cd80-11d0-a2db-00aa00a3efff}
+  DEFINE_GUID(CMDSETID_DaVinciDataToolsCommandSet,
+    0x732abe75, 0xcd80, 0x11d0, 0xa2, 0xdb, 0x00, 0xaa, 0x00, 0xa3, 0xef, 0xff);
+
+  // Guid for Extension Manager Package
+  //{E7576C05-1874-450c-9E98-CF3A0897A069}
+  DEFINE_GUID(guidExtensionManagerPkg,
+    0xe7576c05, 0x1874, 0x450c, 0x9e, 0x98, 0xcf, 0x3a, 0x08, 0x97, 0xa0, 0x69);
+
+  // Guid for Extension Manager Icon
+  DEFINE_GUID(guidExtensionManagerIcon,
+    0x12ffec2c, 0x2df7, 0x49eb, 0xa2, 0x92, 0x05, 0xc4, 0xa5, 0xf9, 0xc3, 0x54);
+
+  // Guid for puslish web Icon
+  // {69DE971C-8BB7-4032-9E7D-3D7C115A6329}
+  DEFINE_GUID(guidPublishWebIcon, 
+    0x69de971c, 0x8bb7, 0x4032, 0x9e, 0x7d, 0x3d, 0x7c, 0x11, 0x5a, 0x63, 0x29);
+
+  // WM_APPCOMMAND handling
+  // The active ole command targets will receive CMDSETID_WMAppCommand:cmdID, where
+  // cmdID is one of APPCOMMAND_****, defined in winuser.h for _WIN32_WINNT >= 0x0500
+  // (use common\inc\wmappcmd.h to have this commands defined for all target platforms)
+  // If command is not handled, we will look in the registry for the mapped command:
+  // HKLM\<appid hive>\WMAppCommand
+  //    val <AppCmdID> = {<guidCmdSet>}:<cmdID>
+
+  // {12F1A339-02B9-46e6-BDAF-1071F76056BF}
+  DEFINE_GUID(CMDSETID_WMAppCommand,
+        0x12f1a339, 0x02b9, 0x46e6, 0xbd, 0xaf, 0x10, 0x71, 0xf7, 0x60, 0x56, 0xbf);
+
+  DEFINE_GUID(CLSID_VsCommunityPackage,
+        0x490508dd, 0x32ce, 0x45e8, 0x80, 0x8c, 0xfa, 0xeb, 0xf4, 0x68, 0xb1, 0x86);
+
+  // {0x462b036f,0x7349,0x4835,{0x9e,0x21,0xbe,0xc6,0x0e,0x98,0x9b,0x9c}}
+  // {462B036F-7349-4835-9E21-BEC60E989B9C}
+  DEFINE_GUID(guidVDTFlavorCmdSet,
+      0x462b036f, 0x7349, 0x4835, 0x9e, 0x21, 0xbe, 0xc6, 0x0e, 0x98, 0x9b, 0x9c);
+
+  // -------------------------------------
+  // Class View Selection UIContext guids.
+  // -------------------------------------
+
+  // {48903663-A165-4e4b-867D-90622B1E6E9C}
+  DEFINE_GUID(guidClassViewSelectionNamespace, 
+      0x48903663, 0xa165, 0x4e4b, 0x86, 0x7d, 0x90, 0x62, 0x2b, 0x1e, 0x6e, 0x9c);
+
+  // {010FA539-D664-45c2-BD28-7C36F2AAA816}
+  DEFINE_GUID(guidClassViewMultiSelectionNamespaces, 
+      0x10fa539, 0xd664, 0x45c2, 0xbd, 0x28, 0x7c, 0x36, 0xf2, 0xaa, 0xa8, 0x16);
+
+  // {C5F62498-4EEE-423b-B12E-EA6FB3217215}
+  DEFINE_GUID(guidClassViewSelectionClass, 
+      0xc5f62498, 0x4eee, 0x423b, 0xb1, 0x2e, 0xea, 0x6f, 0xb3, 0x21, 0x72, 0x15);
+
+  // {767AF915-7282-49da-806E-9AC9614E78FC}
+  DEFINE_GUID(guidClassViewMultiSelectionClasses, 
+      0x767af915, 0x7282, 0x49da, 0x80, 0x6e, 0x9a, 0xc9, 0x61, 0x4e, 0x78, 0xfc);
+
+  // {AF5D60D7-9F6C-4824-98E6-074E258790F8}
+  DEFINE_GUID(guidClassViewSelectionMember, 
+      0xaf5d60d7, 0x9f6c, 0x4824, 0x98, 0xe6, 0x07, 0x4e, 0x25, 0x87, 0x90, 0xf8);
+
+  // {C46D1701-7623-4bb2-A7E2-FB059D2B33E9}
+  DEFINE_GUID(guidClassViewMultiSelectionMembers, 
+      0xc46d1701, 0x7623, 0x4bb2, 0xa7, 0xe2, 0xfb, 0x5, 0x9d, 0x2b, 0x33, 0xe9);
+
+  // {5EE0E92B-13BD-491b-9518-40B2936F5E21}
+  DEFINE_GUID(guidClassViewMultiSelectionMixed, 
+      0x5ee0e92b, 0x13bd, 0x491b, 0x95, 0x18, 0x40, 0xb2, 0x93, 0x6f, 0x5e, 0x21);
+
+  // {57817069-31B7-4d3a-8B2C-8195EB7D216F}
+  DEFINE_GUID(guidClassViewSelectionPhysicalContainer, 
+      0x57817069, 0x31b7, 0x4d3a, 0x8b, 0x2c, 0x81, 0x95, 0xeb, 0x7d, 0x21, 0x6f);
+
+  // {D584640A-388C-4e66-BB81-80969620D404}
+  DEFINE_GUID(guidClassViewMultiSelectionPhysicalContainers, 
+      0xd584640a, 0x388c, 0x4e66, 0xbb, 0x81, 0x80, 0x96, 0x96, 0x20, 0xd4, 0x4);
+
+  // {F19997FD-8C6E-4972-88BC-063181D4E88C}
+  DEFINE_GUID(guidClassViewSelectionHierarchy, 
+      0xf19997fd, 0x8c6e, 0x4972, 0x88, 0xbc, 0x6, 0x31, 0x81, 0xd4, 0xe8, 0x8c);
+
+  // {2D502DA9-629C-4293-8B14-1312F4EBD89A}
+  DEFINE_GUID(guidClassViewSelectionMemberHierarchy, 
+      0x2d502da9, 0x629c, 0x4293, 0x8b, 0x14, 0x13, 0x12, 0xf4, 0xeb, 0xd8, 0x9a);
+      
+  // {2D502DA9-629C-4293-8B14-1312F4EBD89A}
+  DEFINE_GUID(guidClassViewSelectionSupportsClassDesigner,
+      0xc53a8676, 0x1a8f, 0x4673, 0x91, 0x47, 0x09, 0xa3, 0xe7, 0xd5, 0x6c, 0xda);
+      
+
+  // -----------------------------------------
+  // End Class View Selection UIContext guids.
+  // -----------------------------------------
+
+
+  // {84571F7F-1A90-41E0-9781-2610297FB09D}
+  DEFINE_GUID(guidDExploreApplicationObject,
+      0x84571F7F, 0x1A90, 0x41E0, 0x97, 0x81, 0x26, 0x10, 0x29, 0x7F, 0xB0, 0x9D);
+
+  // {8D8529D3-625D-4496-8354-3DAD630ECC1B}
+  DEFINE_GUID(guid_VSDesignerPackage, 
+    0x8D8529D3, 0x625D, 0x4496, 0x83, 0x54, 0x3D, 0xAD, 0x63, 0x0E, 0xCC, 0x1B);
+
+  // {640F725F-1B2D-4831-A9FD-874847682010}
+  DEFINE_GUID(guidServerExpIcon,
+      0x640F725F, 0x1B2D, 0x4831, 0xA9, 0xFD, 0x87, 0x48, 0x47, 0x68, 0x20, 0x10);
+
+///////////////////////////////////////////////
+//
+// VS Enterprise guids
+//
+///////////////////////////////////////////////
+
+  // VS Enterprise Cmd UIContext guid
+  // {07CA8E98-FF14-4e5e-9C4D-959C081B5E47}
+  DEFINE_GUID(guidTeamProjectCmdUIContext, 
+      0x07CA8E98, 0xFF14, 0x4e5e, 0x9C, 0x4D, 0x95, 0x9C, 0x08, 0x1B, 0x5E, 0x47);
+
+  // VS Enterprise Shared Commands guid
+  // {3F5A3E02-AF62-4c13-8D8A-A568ECAE238B}
+  DEFINE_GUID(guidTeamExplorerSharedCmdSet, 
+      0x3F5A3E02, 0xAF62, 0x4c13, 0x8D, 0x8A, 0xA5, 0x68, 0xEC, 0xAE, 0x23, 0x8B);
+
+
+  DEFINE_GUID (guidRefactorIcon, 
+      0x5d7e7f67, 0xa63f, 0x46ee, 0x84, 0xf1, 0x99, 0xb, 0x2c, 0xab, 0x23, 0xf3);
+
+  // {B3285A19-6471-4150-AE05-18253F95FBCC}
+  DEFINE_GUID (guidGoToTypeDef, 
+      0xb3285a19, 0x6471, 0x4150, 0xae, 0x5, 0x18, 0x25, 0x3f, 0x95, 0xfb, 0xcc);
+
+  // {E6EA7925-0FE6-4867-84EA-8BA78B7FDBEE}
+  DEFINE_GUID(guidGenerateMethodIcon, 
+      0xe6ea7925, 0xfe6, 0x4867, 0x84, 0xea, 0x8b, 0xa7, 0x8b, 0x7f, 0xdb, 0xee);
+  // {50AA77AC-6BB4-42A8-A4A2-F4CD407E80A8}
+  DEFINE_GUID (guidToggleCompletionMode, 
+      0x50AA77AC, 0x6BB4, 0x42A8, 0xa4, 0xa2, 0xf4, 0xcd, 0x40, 0x7e, 0x80, 0xa8);
+
+  // Server Explorer menu group guid
+  // {74D21310-2AEE-11d1-8BFB-00A0C90F26F7}
+  DEFINE_GUID(guid_SE_MenuGroup, 
+      0x74d21310, 0x2aee, 0x11d1, 0x8b, 0xfb, 0x0, 0xa0, 0xc9, 0xf, 0x26, 0xf7);
+
+  // Server Explorer command ID guid
+  // {74D21311-2AEE-11d1-8BFB-00A0C90F26F7}
+  DEFINE_GUID(guid_SE_CommandID, 
+    0x74d21311, 0x2aee, 0x11d1, 0x8b, 0xfb, 0x0, 0xa0, 0xc9, 0xf, 0x26, 0xf7);
+
+  // UI Context GUID to enable the Tools->Connect To Server command
+  // {9BF70368-F5F7-4ddf-8CD2-FB27FBE0BD9C}
+  DEFINE_GUID(guidAppidSupportsConnectToServer, 
+    0x9bf70368, 0xf5f7, 0x4ddf, 0x8c, 0xd2, 0xfb, 0x27, 0xfb, 0xe0, 0xbd, 0x9c);
+
+
+///////////////////////////////////////////////
+//
+// Editor Shim CLSIDs from the Editor Shim Package (defined at Microsoft.VisualStudio.Editor.dll)
+//
+///////////////////////////////////////////////
+
+  // CLSID for VS10 Platform Factory
+  DEFINE_GUID(CLSID_PlatformFactory, 
+    0x2491432F, 0x3A10, 0x4884, 0xB6, 0x28, 0x57, 0x4D, 0x57, 0xF4, 0x1E, 0x9B);
+
+  // CLSID for VsDocDataAdapter
+  DEFINE_GUID(CLSID_VsDocDataAdapter, 
+    0x169F2886, 0x6566, 0x432e, 0xA9, 0x3D, 0x55, 0x88, 0xBD, 0x58, 0x32, 0x29);
+
+  // CLSID for VsTextBufferCoordinatorAdapter
+  DEFINE_GUID(CLSID_VsTextBufferCoordinatorAdapter, 
+    0x5FCEEA4C, 0xD49F, 0x4acd, 0xB8, 0x16, 0x13, 0x0A, 0x5D, 0xCD, 0x4C, 0x54);
+
+  // CLSID for VsHiddenTextManagerAdapter
+  DEFINE_GUID(CLSID_VsHiddenTextManagerAdapter, 
+    0x85115CFE, 0x3F29, 0x4e52, 0xAE, 0x98, 0x6F, 0xE6, 0x25, 0x73, 0xD1, 0x1C);
+
+  // GUID to get the IVxTextBuffer from the IVsUserData
+  DEFINE_GUID(GUID_VxTextBuffer,
+    0xbe120c41, 0xd969, 0x42a4, 0xa4, 0xdd, 0x91, 0x26, 0x65, 0xa5, 0xbf, 0x13);
+
+#else //!DEFINE_GUID
+  // Guid if using Office provided icons
+  #define guidOfficeIcon          { 0xd309f794, 0x903f, 0x11d0, { 0x9e, 0xfc, 0x00, 0xa0, 0xc9, 0x11, 0x00, 0x4f } }
+  // Guid for the duplicate accelerator keys
+  #define guidKeyDupe             { 0xf17bdae0, 0xa16d, 0x11d0, { 0x9f, 0x4,  0x0,  0xa0, 0xc9, 0x11, 0x0,  0x4f } }
+  // Guid for Shell's group and menu ids
+  #define guidSHLMainMenu         { 0xd309f791, 0x903f, 0x11d0, { 0x9e, 0xfc, 0x00, 0xa0, 0xc9, 0x11, 0x00, 0x4f } }
+  // Guid for ClassView menu ids
+  #define guidClassViewMenu       { 0xfb61dcfe, 0xc9cb, 0x4964, { 0x84, 0x26, 0xc2, 0xd3, 0x83, 0x34, 0x07, 0x8c } }
+  // Guid for CommonIDE package
+  #define guidCommonIDEPackage    { 0x6E87CFAD, 0x6C05, 0x4adf, { 0x9C, 0xD7, 0x3B, 0x79, 0x43, 0x87, 0x5B, 0x7C } }
+  // Guid for CommonIDE package commands
+  #define guidCommonIDEPackageCmd { 0x6767e06b, 0x5789, 0x472b, { 0x8e, 0xd7, 0x1f, 0x20, 0x73, 0x71, 0x6e, 0x8c } }
+  // Guid for Standard Shell Commands (97 set)
+  #define CMDSETID_StandardCommandSet97  { 0x5efc7975, 0x14bc, 0x11cf, { 0x9b, 0x2b, 0x00, 0xaa, 0x00, 0x57, 0x38, 0x19 } }
+  // Guid for Standard Shell Commands (2k set)
+  #define CMDSETID_StandardCommandSet2K {0x1496A755, 0x94DE, 0x11D0, {0x8C, 0x3F, 0x00, 0xC0, 0x4F, 0xC2, 0xAA, 0xE2}}
+  // Guid for Standard Shell Commands (Dev10 set)
+  #define CMDSETID_StandardCommandSet10 {0x5dd0bb59, 0x7076, 0x4c59, {0x88, 0xd3, 0xde, 0x36, 0x93, 0x1f, 0x63, 0xf0}}
+  // Guid for the EzMDI file list menu private command set
+  #define CMDSETID_EzMDI {0x489ee5bf, 0xf001, 0x41c9, {0x91, 0xc7, 0x6e, 0x89, 0xd9, 0xc1, 0x11, 0xad}}
+  // Guid for the Emacs editor emulation command group
+  // {9A95F3AF-F86A-4aa2-80E6-012BF65DBBC3}
+  #define guidEmacsCommandGroup {0x9a95f3af, 0xf86a, 0x4aa2,{ 0x80, 0xe6, 0x1, 0x2b, 0xf6, 0x5d, 0xbb, 0xc3}}
+  // Guid for the Brief editor emulation command group
+  // {7A500D8A-8258-46c3-8965-6AC53ED6B4E7}
+  #define guidBriefCommandGroup {0x7a500d8a, 0x8258, 0x46c3,{ 0x89, 0x65, 0x6a, 0xc5, 0x3e, 0xd6, 0xb4, 0xe7}}
+  // Guid for DocOutline package commands
+  #define guidDocOutlinePkg { 0x21af45b0, 0xffa5, 0x11d0, { 0xb6, 0x3f, 0x00, 0xa0, 0xc9, 0x22, 0xe8, 0x51 } }
+  // Guid for TaskList package commands
+  #define CLSID_VsTaskListPackage     { 0x4A9B7E50, 0xAA16, 0x11d0, { 0xA8, 0xC5, 0x00, 0xA0, 0xC9, 0x21, 0xA4, 0xD2 } }
+  // Guid for find/replace bitmaps...
+  #define guidFindIcon  { 0x740EEC10, 0x1A5D, 0x11D1, { 0xA0, 0x30, 0x00, 0xA0, 0xC9, 0x11, 0xE8, 0xE9} }
+  // Guid for unified find bitmaps...
+  #define guidUFindIcon  { 0xD7BECFE4, 0x1C1A, 0x4D32, { 0x8E, 0xD8, 0xF7, 0xDA, 0x4F, 0x89, 0x7E, 0x7B} }
+  // Guid for Bookmark window bitmaps...
+  #define guidBookmarkIcon  { 0x7637b0ae, 0x7d52, 0x40a1, { 0x90, 0xba, 0x51, 0x94, 0x50, 0x57, 0x97, 0x9d } }
+  // Guid for Tool window goto bitmaps... {65ED2DB5-9942-4664-BA7C-CBE2B79AE7A8}
+  #define guidToolWindowGotoButtons { 0x65ed2db5, 0x9942, 0x4664, { 0xba, 0x7c, 0xcb, 0xe2, 0xb7, 0x9a, 0xe7, 0xa8 } }
+  // Guid for debugger bitmaps
+  #define guidDebuggerIcon { 0xb7afe65e, 0x3a96, 0x11d1, { 0xb0, 0x68, 0x0, 0xc0, 0x4f, 0xb6, 0x6f, 0xa0} }
+  // Guid for object browser buttons
+  #define guidObjectBrowserButtons  { 0x5f810e80, 0x33ad, 0x11d1, { 0xa7, 0x96, 0x0, 0xa0, 0xc9, 0x11, 0x10, 0xc3 } }
+  // Guid for Call Browser buttons {F858DE97-54BF-4929-A039-62396ACACD8E}
+  #define guidCallBrowserButtons  { 0xf858de97, 0x54bf, 0x4929, { 0xa0, 0x39, 0x62, 0x39, 0x6a, 0xca, 0xcd, 0x8e } }
+  // Guid for Call Hierarchy buttons {90C70706-ECC3-4d97-B80C-2CED9E7CC7EB}
+  #define guidCallHierarchyButtons  { 0x90c70706, 0xecc3, 0x4d97, { 0xb8, 0xc, 0x2c, 0xed, 0x9e, 0x7c, 0xc7, 0xeb } }
+  // Guid for Code Definition View buttons {88892CCC-3565-4e34-BFF3-B9B0997FC195}
+  #define guidCodeDefViewButtons  { 0x88892ccc, 0x3565, 0x4e34, { 0xbf, 0xf3, 0xb9, 0xb0, 0x99, 0x7f, 0xc1, 0x95 } }
+  // UIContext guid specifying that we're not in View Source mode
+  #define guidNotViewSourceMode  {0x7174c6a0, 0xb93d, 0x11d1, {0x9f, 0xf4, 0x0, 0xa0, 0xc9, 0x11, 0x0, 0x4f} }
+  // Guid for text editor bitmaps...
+  #define guidTextEditorIcon  { 0xc40a5a10, 0x3eeb, 0x11d3, { 0xaf, 0xe5, 0x0, 0x10, 0x5a, 0x99, 0x91, 0xef } }
+  // Guid for error / warning buttons...
+  #define guidErrorIcon  { 0x7e65bae7, 0xd6fc, 0x4c65, { 0x89, 0x2d, 0xe2, 0xc9, 0xdc, 0xaa, 0xdd, 0xae } }
+  #define guidSharedMenuGroup { 0x234a7fc1, 0xcfe9, 0x4335, { 0x9e, 0x82, 0x6, 0x1f, 0x86, 0xe4, 0x02, 0xc1 } }
+  // guid for build cmd icons
+  #define guidBuildCmdIcons { 0x952691c5, 0x34d6, 0x462b, {0xac, 0x56, 0x9a, 0xb0, 0x97, 0x70, 0xa3, 0x0d}}
+  // {501822E1-B5AF-11d0-B4DC-00A0C91506EF} Guid for Data project commands
+  #define guidDataCmdId {0x501822e1, 0xb5af, 0x11d0, {0xb4, 0xdc, 0x00, 0xa0, 0xc9, 0x15, 0x06, 0xef}}
+  // {4614107F-217D-4bbf-9DFE-B9E165C65572}
+  #define guidVSData    {0x4614107F, 0x217D, 0x4bbf, {0x9D, 0xFE, 0xB9, 0xE1, 0x65, 0xC6, 0x55, 0x72}}      
+  //{732abe75-cd80-11d0-a2db-00aa00a3efff}
+  #define CMDSETID_DaVinciDataToolsCommandSet   {0x732abe75, 0xcd80, 0x11d0, {0xa2, 0xdb, 0x00, 0xaa, 0x00, 0xa3, 0xef, 0xff} }
+  // {12F1A339-02B9-46e6-BDAF-1071F76056BF}
+  #define CMDSETID_WMAppCommand { 0x12f1a339, 0x02b9, 0x46e6, { 0xbd, 0xaf, 0x10, 0x71, 0xf7, 0x60, 0x56, 0xbf } }
+  #define CLSID_VsCommunityPackage { 0x490508dd, 0x32ce, 0x45e8, { 0x80, 0x8c, 0xfa, 0xeb, 0xf4, 0x68, 0xb1, 0x86 } }
+  // Guid for Yukon projects commands
+  // {462B036F-7349-4835-9E21-BEC60E989B9C}
+  #define guidVDTFlavorCmdSet { 0x462b036f, 0x7349, 0x4835, {0x9e, 0x21, 0xbe, 0xc6, 0x0e, 0x98, 0x9b, 0x9c } }
+  // Error List toolwindow icon
+  #define guidErrorListIcon  { 0xbffbae07, 0x4ff7, 0x45da, { 0x88, 0x3e, 0x82, 0xcc, 0xdb, 0x85, 0xf1, 0xf8 } }
+  // Accessibility check button {EEF04648-250A-4360-8C2F-43CC063E198D}
+  #define guidAccessibilityIcon { 0xeef04648, 0x250a, 0x4360, { 0x8c, 0x2f, 0x43, 0xcc, 0x6, 0x3e, 0x19, 0x8d } }
+  // Server Explorer menu group {74D21310-2AEE-11d1-8BFB-00A0C90F26F7}
+  #define guid_SE_MenuGroup { 0x74d21310, 0x2aee, 0x11d1, { 0x8b, 0xfb, 0x0, 0xa0, 0xc9, 0xf, 0x26, 0xf7 } }
+  // Server Explorer command ID guid {74D21311-2AEE-11d1-8BFB-00A0C90F26F7}
+  #define guid_SE_CommandID { 0x74d21311, 0x2aee, 0x11d1, { 0x8b, 0xfb, 0x0, 0xa0, 0xc9, 0xf, 0x26, 0xf7 } }
+  // UI Context GUID to enable the Tools->Connect To Server command {9BF70368-F5F7-4ddf-8CD2-FB27FBE0BD9C}
+  #define guidAppidSupportsConnectToServer { 0x9bf70368, 0xf5f7, 0x4ddf, { 0x8c, 0xd2, 0xfb, 0x27, 0xfb, 0xe0, 0xbd, 0x9c } }
+  //Guid for Extension Manager Package
+  #define guidExtensionManagerPkg { 0xe7576c05, 0x1874, 0x450c, { 0x9e, 0x98, 0xcf, 0x3a, 0x08, 0x97, 0xa0, 0x69 } }
+  // Guid for Extension Manager Icon
+  #define guidExtensionManagerIcon { 0x12ffec2c, 0x2df7, 0x49eb, { 0xa2, 0x92, 0x05, 0xc4, 0xa5, 0xf9, 0xc3, 0x54 } }
+  // Guid for puslish web Icon
+  #define guidPublishWebIcon { 0x69de971c, 0x8bb7, 0x4032, { 0x9e, 0x7d, 0x3d, 0x7c, 0x11, 0x5a, 0x63, 0x29 } }
+
+  // -------------------------------------
+  // Class View Selection UIContext guids.
+  // -------------------------------------
+
+  // {48903663-A165-4e4b-867D-90622B1E6E9C}
+  #define guidClassViewSelectionNamespace { 0x48903663, 0xa165, 0x4e4b, {0x86, 0x7d, 0x90, 0x62, 0x2b, 0x1e, 0x6e, 0x9c } }
+
+  // {010FA539-D664-45c2-BD28-7C36F2AAA816}
+  #define guidClassViewMultiSelectionNamespaces { 0x10fa539, 0xd664, 0x45c2, {0xbd, 0x28, 0x7c, 0x36, 0xf2, 0xaa, 0xa8, 0x16 } }
+
+  // {C5F62498-4EEE-423b-B12E-EA6FB3217215}
+  #define guidClassViewSelectionClass { 0xc5f62498, 0x4eee, 0x423b, {0xb1, 0x2e, 0xea, 0x6f, 0xb3, 0x21, 0x72, 0x15 } }
+
+  // {767AF915-7282-49da-806E-9AC9614E78FC}
+  #define guidClassViewMultiSelectionClasses { 0x767af915, 0x7282, 0x49da, {0x80, 0x6e, 0x9a, 0xc9, 0x61, 0x4e, 0x78, 0xfc } }
+
+  // {AF5D60D7-9F6C-4824-98E6-074E258790F8}
+  #define guidClassViewSelectionMember { 0xaf5d60d7, 0x9f6c, 0x4824, {0x98, 0xe6, 0x07, 0x4e, 0x25, 0x87, 0x90, 0xf8 } }
+
+  // {C46D1701-7623-4bb2-A7E2-FB059D2B33E9}
+  #define guidClassViewMultiSelectionMembers { 0xc46d1701, 0x7623, 0x4bb2, {0xa7, 0xe2, 0xfb, 0x5, 0x9d, 0x2b, 0x33, 0xe9 } } 
+
+  // {5EE0E92B-13BD-491b-9518-40B2936F5E21}
+  #define guidClassViewMultiSelectionMixed { 0x5ee0e92b, 0x13bd, 0x491b, {0x95, 0x18, 0x40, 0xb2, 0x93, 0x6f, 0x5e, 0x21 } } 
+
+  // {57817069-31B7-4d3a-8B2C-8195EB7D216F}
+  #define guidClassViewSelectionPhysicalContainer { 0x57817069, 0x31b7, 0x4d3a, {0x8b, 0x2c, 0x81, 0x95, 0xeb, 0x7d, 0x21, 0x6f } } 
+
+  // {D584640A-388C-4e66-BB81-80969620D404}
+  #define guidClassViewMultiSelectionPhysicalContainers { 0xd584640a, 0x388c, 0x4e66, {0xbb, 0x81, 0x80, 0x96, 0x96, 0x20, 0xd4, 0x4 } }
+
+  // {F19997FD-8C6E-4972-88BC-063181D4E88C}
+  #define guidClassViewSelectionHierarchy { 0xf19997fd, 0x8c6e, 0x4972, {0x88, 0xbc, 0x6, 0x31, 0x81, 0xd4, 0xe8, 0x8c } } 
+
+  // {2D502DA9-629C-4293-8B14-1312F4EBD89A}
+  #define guidClassViewSelectionMemberHierarchy { 0x2d502da9, 0x629c, 0x4293, {0x8b, 0x14, 0x13, 0x12, 0xf4, 0xeb, 0xd8, 0x9a } } 
+  
+  // {C53A8676-1A8F-4673-9147-09A3E7D56CDA}
+  #define guidClassViewSelectionSupportsClassDesigner { 0xc53a8676, 0x1a8f, 0x4673, { 0x91, 0x47, 0x9, 0xa3, 0xe7, 0xd5, 0x6c, 0xda } }
+
+  // -----------------------------------------
+  // End Class View Selection UIContext guids.
+  // -----------------------------------------
+
+  // {84571F7F-1A90-41E0-9781-2610297FB09D}
+#define guidDExploreApplicationObject { 0x84571F7F, 0x1A90, 0x41E0, {0x97, 0x81, 0x26, 0x10, 0x29, 0x7F, 0xB0, 0x9D } }
+
+  // {8D8529D3-625D-4496-8354-3DAD630ECC1B}
+  #define guid_VSDesignerPackage { 0x8D8529D3, 0x625D, 0x4496, { 0x83, 0x54, 0x3D, 0xAD, 0x63, 0x0E, 0xCC, 0x1B } }
+
+  // {640F725F-1B2D-4831-A9FD-874847682010}
+  #define guidServerExpIcon { 0x640F725F, 0x1B2D, 0x4831, {0xA9, 0xFD, 0x87, 0x48, 0x47, 0x68, 0x20, 0x10 } }
+
+///////////////////////////////////////////////
+//
+// VS Enterprise guids
+//
+///////////////////////////////////////////////
+
+  // VS Enterprise Cmd UIContext guid
+  // {07CA8E98-FF14-4e5e-9C4D-959C081B5E47}
+  #define guidTeamProjectCmdUIContext { 0x07CA8E98, 0xFF14, 0x4e5e, {0x9C, 0x4D, 0x95, 0x9C, 0x08, 0x1B, 0x5E, 0x47 } }
+
+  // VS Enterprise Shared Commands guid
+  // {3F5A3E02-AF62-4c13-8D8A-A568ECAE238B}
+  #define guidTeamExplorerSharedCmdSet { 0x3F5A3E02, 0xAF62, 0x4c13, {0x8D, 0x8A, 0xA5, 0x68, 0xEC, 0xAE, 0x23, 0x8B } }
+
+
+  #define guidRefactorIcon         { 0x5d7e7f67, 0xa63f, 0x46ee, { 0x84, 0xf1, 0x99, 0xb, 0x2c, 0xab, 0x23, 0xf3 } }
+  #define guidGoToTypeDef          { 0xb3285a19, 0x6471, 0x4150, { 0xae, 0x5, 0x18, 0x25, 0x3f, 0x95, 0xfb, 0xcc } }
+  #define guidGenerateMethodIcon   { 0xe6ea7925, 0x0fe6, 0x4867, { 0x84, 0xea, 0x8b, 0xa7, 0x8b, 0x7f, 0xdb, 0xee } }
+  #define guidToggleCompletionMode { 0x50AA77AC, 0x6BB4, 0x42A8, { 0xa4, 0xa2, 0xf4, 0xcd, 0x40, 0x7e, 0x80, 0xa8 } };
+
+  #define GUID_TextEditorFactory {0x8b382828, 0x6202, 0x11d1, {0x88, 0x70, 0x0, 0x0, 0xf8, 0x75, 0x79, 0xd2}}
+
+///////////////////////////////////////////////
+//
+// Editor Shim CLSIDs from the Editor Shim Package (defined at Microsoft.VisualStudio.Editor.dll)
+//
+///////////////////////////////////////////////
+
+  // CLSID for VS10 Editor Factory
+  #define CLSID_VS10TextEditorFactory     {0xdf25faa1, 0xe891, 0x49f6, {0x98, 0x23, 0x72, 0x63, 0x4a, 0x02, 0xa4, 0x05} }
+
+  // CLSID for VS10 Editor Factory with encoding
+  #define CLSID_VS10TextEditorFactoryWithEncoding    {0xC6BE297E, 0xC907, 0x4F43, {0x91, 0x20, 0x05, 0x3C, 0x19, 0x2E, 0xF5, 0x1E} }
+
+  // CLSID for VS10 Platform Factory
+  #define CLSID_PlatformFactory           {0x2491432F, 0x3A10, 0x4884, {0xB6, 0x28, 0x57, 0x4D, 0x57, 0xF4, 0x1E, 0x9B} }
+
+  // CLSID for VsDocDataAdapter
+  #define CLSID_VsDocDataAdapter          {0x169F2886, 0x6566, 0x432e, {0xA9, 0x3D, 0x55, 0x88, 0xBD, 0x58, 0x32, 0x29} }
+
+  // CLSID for VsTextBufferCoordinatorAdapter
+  #define CLSID_VsTextBufferCoordinatorAdapter    {0x5FCEEA4C, 0xD49F, 0x4acd, {0xB8, 0x16, 0x13, 0x0A, 0x5D, 0xCD, 0x4C, 0x54} }
+
+  // CLSID for VsHiddenTextManagerAdapter
+  #define CLSID_VsHiddenTextManagerAdapter    {0x85115CFE, 0x3F29, 0x4e52, {0xAE, 0x98, 0x6F, 0xE6, 0x25, 0x73, 0xD1, 0x1C} }
+
+  // GUID to get the IVxTextBuffer from the IVsUserData
+  #define GUID_VxTextBuffer		  {0xbe120c41, 0xd969, 0x42a4, {0xa4, 0xdd, 0x91, 0x26, 0x65, 0xa5, 0xbf, 0x13} }
+
+#endif //!DEFINE_GUID
+
+#ifdef __CTC__
+// *** UIContext Guids for use by CTC parser only...
+#define UICONTEXT_SolutionBuilding      { 0xadfc4e60, 0x397, 0x11d1, { 0x9f, 0x4e, 0x0, 0xa0, 0xc9, 0x11, 0x0, 0x4f } }
+#define UICONTEXT_Debugging         { 0xadfc4e61, 0x397, 0x11d1, { 0x9f, 0x4e, 0x0, 0xa0, 0xc9, 0x11, 0x0, 0x4f } }
+#define UICONTEXT_FullScreenMode        { 0xadfc4e62, 0x397, 0x11d1, { 0x9f, 0x4e, 0x0, 0xa0, 0xc9, 0x11, 0x0, 0x4f } }
+#define UICONTEXT_DesignMode            { 0xadfc4e63, 0x397, 0x11d1, { 0x9f, 0x4e, 0x0, 0xa0, 0xc9, 0x11, 0x0, 0x4f } }
+#define UICONTEXT_NoSolution            { 0xadfc4e64, 0x397, 0x11d1, { 0x9f, 0x4e, 0x0, 0xa0, 0xc9, 0x11, 0x0, 0x4f } }
+#define UICONTEXT_SolutionExists                { 0xf1536ef8, 0x92ec, 0x443c, { 0x9e, 0xd7, 0xfd, 0xad, 0xf1, 0x50, 0xda, 0x82 } }
+#define UICONTEXT_EmptySolution         { 0xadfc4e65, 0x397, 0x11d1, { 0x9f, 0x4e, 0x0, 0xa0, 0xc9, 0x11, 0x0, 0x4f } }
+#define UICONTEXT_SolutionHasSingleProject  { 0xadfc4e66, 0x397, 0x11d1, { 0x9f, 0x4e, 0x0, 0xa0, 0xc9, 0x11, 0x0, 0x4f } }
+#define UICONTEXT_SolutionHasMultipleProjects   { 0x93694fa0, 0x397, 0x11d1, { 0x9f, 0x4e, 0x0, 0xa0, 0xc9, 0x11, 0x0, 0x4f } }
+#define UICONTEXT_CodeWindow        { 0x8fe2df1d, 0xe0da, 0x4ebe, { 0x9d, 0x5c, 0x41, 0x5d, 0x40, 0xe4, 0x87, 0xb5 } }
+#define UICONTEXT_NotBuildingAndNotDebugging   { 0x48ea4a80, 0xf14e, 0x4107, { 0x88, 0xfa, 0x8d, 0x0, 0x16, 0xf3, 0xb, 0x9c } } //VS 2005 Bug #35207 add new cmdUIGuid
+#define UICONTEXT_SolutionExistsAndNotBuildingAndNotDebugging   { 0xd0e4deec, 0x1b53, 0x4cda, { 0x85, 0x59, 0xd4, 0x54, 0x58, 0x3a, 0xd2, 0x3b } }
+#endif //__CTC__
+
+#define guidVSStd97                 CMDSETID_StandardCommandSet97
+#define CLSID_StandardCommandSet97  CMDSETID_StandardCommandSet97
+
+#define guidVSStd2K                 CMDSETID_StandardCommandSet2K
+#define guidVSStd10                 CMDSETID_StandardCommandSet10
+#define CLSID_StandardCommandSet10  CMDSETID_StandardCommandSet10
+#define guidEzMDI                   CMDSETID_EzMDI
+#define CLSID_StandardCommandSet2K  CMDSETID_StandardCommandSet2K
+#define CLSID_CTextViewCommandGroup CMDSETID_StandardCommandSet2K
+#define CLSID_TCG                   CMDSETID_StandardCommandSet2K
+#define CLSID_ECG                   CMDSETID_StandardCommandSet2K
+#define guidDavDataCmdId            CMDSETID_DaVinciDataToolsCommandSet
+
+// Standard editor guid.
+#define guidStdEditor   {0x9ADF33D0, 0x8AAD, 0x11d0, {0xB6, 0x06, 0x00, 0xA0, 0xC9, 0x22, 0xE8, 0x51} }
+
+
+
+
+// Standard editor shorthand macros for a more compact and manageable table
+#define guidStdEd           guidStdEditor
+#define guidStdEdCmd        guidStdEditor:IDG_VS_EDITOR_CMDS
+#define guidStdEdBmkFld     guidStdEditor:IDG_VS_EDITOR_BOOKMARK_FOLDER_CMDS   // Bookmark commands restricted to a folder
+#define guidStdEdBmkDoc     guidStdEditor:IDG_VS_EDITOR_BOOKMARK_DOCUMENT_CMDS // Bookmark commands restricted to a document
+#define guidStdEdBmkAllDocs guidStdEditor:IDG_VS_EDITOR_BOOKMARK_ALLDOCS_CMDS  // Bookmark commands that operate on all files
+#define guidStdEdBmkTskLst  guidStdEditor:IDG_VS_EDITOR_BOOKMARK_TASKLIST_CMDS // Tasklist shortcut commands
+#define guidStdEdAdv        guidStdEditor:IDG_VS_EDITOR_ADVANCED_CMDS
+#define guidStdEdOut        guidStdEditor:IDG_VS_EDITOR_OUTLINING_CMDS
+#define guidStdLang         guidStdEditor:IDG_VS_EDITOR_LANGUAGE_INFO
+#define guidStdEdIntel      guidStdEditor:IDG_VS_EDITOR_INTELLISENSE_CMDS
+#endif //!NOGUIDS
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Toolbar Identifiers, created by Visual Studio Shell
+//
+//////////////////////////////////////////////////////////////////////////////
+#define IDM_VS_TOOL_MAINMENU          0x0000
+#define IDM_VS_TOOL_STANDARD          0x0001
+#define IDM_VS_TOOL_WINDOWUI          0x0002
+#define IDM_VS_TOOL_PROJWIN       0x0003
+#define IDM_VS_TOOL_DEBUGGER	      0x0006
+#define IDM_VS_TOOL_OBJECT_BROWSER_GO 0x0007
+#define IDM_VS_TOOL_CLASSVIEW_GO      0x0008
+//UNUSED 0x0009-0x000a
+#define IDM_VS_TOOL_OPENWINDOWS       0x000b
+#define IDM_VS_TOOL_VIEWBAR       0x000c
+#define IDM_VS_TOOL_BUILD             0x000d
+#define IDM_VS_TOOL_TEXTEDITOR        0x000e
+#define IDM_VS_TOOL_OBJBROWSER        0x000f
+#define IDM_VS_TOOL_CLASSVIEW         0x0010
+#define IDM_VS_TOOL_PROPERTIES        0x0011
+#define IDM_VS_TOOL_DATA              0x0012
+#define IDM_VS_TOOL_SCHEMA            0x0013
+#define IDM_VS_TOOL_OUTPUTWINDOW      0x0014
+#define IDM_VS_TOOL_FINDRESULTS1      0x0015
+#define IDM_VS_TOOL_FINDRESULTS2      0x0016
+#define IDM_VS_TOOL_UNIFIEDFIND       0x0017
+//UNUSED 0x0018
+#define IDM_VS_TOOL_BOOKMARKWIND      0x0019
+#define IDM_VS_TOOL_CALLBROWSER1      0x001a
+#define IDM_VS_TOOL_CALLBROWSER2      0x001b
+#define IDM_VS_TOOL_CALLBROWSER3      0x001c
+#define IDM_VS_TOOL_CALLBROWSER4      0x001d
+#define IDM_VS_TOOL_CALLBROWSER5      0x001e
+#define IDM_VS_TOOL_CALLBROWSER6      0x001f
+#define IDM_VS_TOOL_CALLBROWSER7      0x0020
+#define IDM_VS_TOOL_CALLBROWSER8      0x0021
+#define IDM_VS_TOOL_CALLBROWSER9      0x0022
+#define IDM_VS_TOOL_CALLBROWSER10     0x0023
+#define IDM_VS_TOOL_CALLBROWSER11     0x0024
+#define IDM_VS_TOOL_CALLBROWSER12     0x0025
+#define IDM_VS_TOOL_CALLBROWSER13     0x0026
+#define IDM_VS_TOOL_CALLBROWSER14     0x0027
+#define IDM_VS_TOOL_CALLBROWSER15     0x0028
+#define IDM_VS_TOOL_CALLBROWSER16     0x0029
+#define IDM_VS_TOOL_TASKLIST          0x002a
+#define IDM_VS_TOOL_USERTASKS         0x002b
+#define IDM_VS_TOOL_ERRORLIST         0x002c
+#define IDM_VS_TOOL_SNIPPETMENUS      0x002D
+
+#define IDM_VS_CALLBROWSER_TYPE_POPUP   0x0030
+
+//////////////////////////////////////////////////////////////////////////////
+// Toolbar ID for customize mode only 
+//
+// **** NOTE ****  DO NOT add any menu or toolbar that has an ID greater than
+//                 IDM_VS_TOOL_ADDCOMMAND, otherwise you WILL break customize
+//                 mode. IDM_VS_TOOL_UDEFINED is a very special toolbar.
+//                 Do not use or place it anywhere - used by shell only.
+//////////////////////////////////////////////////////////////////////////////
+#define IDM_VS_TOOL_UNDEFINED         0xEDFF
+#define IDM_VS_TOOL_ADDCOMMAND        0xEE00
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Menu Identifiers, created by Visual Studio Shell
+//
+//////////////////////////////////////////////////////////////////////////////
+#define IDM_VS_MENU_FILE              0x0080
+#define IDM_VS_MENU_EDIT              0x0081
+#define IDM_VS_MENU_VIEW              0x0082
+#define IDM_VS_MENU_PROJECT           0x0083
+#define IDM_VS_MENU_TOOLS             0x0085
+#define IDM_VS_MENU_WINDOW            0x0086
+#define IDM_VS_MENU_ADDINS            0x0087
+#define IDM_VS_MENU_HELP              0x0088
+#define IDM_VS_MENU_DEBUG             0x0089
+#define IDM_VS_MENU_FORMAT            0x008A
+#define IDM_VS_MENU_ALLMACROS         0x008B
+#define IDM_VS_MENU_BUILD             0x008C
+#define IDM_VS_MENU_CONTEXTMENUS      0x008D
+#define IDG_VS_MENU_CONTEXTMENUS      0x008E
+#define IDM_VS_MENU_REFACTORING       0x008f
+#define IDM_VS_MENU_COMMUNITY         0x0090
+
+///////////////////////////////////////////////
+//
+// Editor menu groups
+//
+///////////////////////////////////////////////
+#define IDG_VS_EDITOR_CMDS                      0x3E8A
+
+#define IDG_VS_EDITOR_BOOKMARK_FOLDER_CMDS      0x3EB0
+#define IDG_VS_EDITOR_BOOKMARK_DOCUMENT_CMDS    0x3EB1
+#define IDG_VS_EDITOR_BOOKMARK_ALLDOCS_CMDS     0x3EB2
+#define IDG_VS_EDITOR_BOOKMARK_TASKLIST_CMDS    0x3EB3
+
+#define IDG_VS_EDITOR_ADVANCED_CMDS             0x3E8F
+#define IDG_VS_EDITOR_OUTLINING_CMDS            0x3E90
+#define IDG_VS_EDITOR_LANGUAGE_INFO             0x3E93
+#define IDG_VS_EDITOR_INTELLISENSE_CMDS         0x3E94
+#define IDG_TOOLS_SNIPPETS                      0x3E95  //actually on the tools menu defined above
+
+#define IDM_VS_EDITOR_BOOKMARK_MENU             0x3E9E
+#define IDM_VS_EDITOR_ADVANCED_MENU             0x3EA0
+#define IDM_VS_EDITOR_OUTLINING_MENU            0x3EA1
+#define IDM_VS_EDITOR_INTELLISENSE_MENU         0x3EA2
+#define IDM_VS_EDITOR_FIND_MENU                 0x3EA3
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Group Identifiers, created by Visual Studio Shell
+//
+//////////////////////////////////////////////////////////////////////////////
+
+// Main Menu Bar Groups
+#define IDG_VS_MM_FILEEDITVIEW        0x0101    // File/Edit/View menus go here
+#define IDG_VS_MM_PROJECT             0x0102    // Project menu go here
+#define IDG_VS_MM_BUILDDEBUGRUN       0x0103    // Build/Debug/Run menus go here
+#define IDG_VS_MM_TOOLSADDINS         0x0104    // Tools/Addins menu goes here
+#define IDG_VS_MM_WINDOWHELP          0x0105    // Window/Help menus go here
+#define IDG_VS_MM_FULLSCREENBAR       0x0106    // Full Screen group
+//VS 2005 Bug #58088   Put refactorings on top-level menu 
+#define IDG_VS_MM_REFACTORING         0x0107    // Refactorings go here
+#define IDG_VS_MM_REFACTORING_JS      0x0108    // VS 2005 bug #275998
+
+// All Macros Groups
+#define IDG_VS_MM_MACROS              0x010A
+
+// File Menu Groups
+#define IDG_VS_FILE_NEW_PROJ_CSCD     0x010E
+#define IDG_VS_FILE_ITEM              0x010F
+#define IDG_VS_FILE_FILE              0x0110
+#define IDG_VS_FILE_ADD               0x0111
+#define IDG_VS_FILE_SAVE              0x0112
+#define IDG_VS_FILE_RENAME            0x0113
+#define IDG_VS_FILE_PRINT             0x0114
+#define IDG_VS_FILE_MRU               0x0115
+#define IDG_VS_FILE_EXIT              0x0116
+#define IDG_VS_FILE_DELETE            0x0117
+#define IDG_VS_FILE_SOLUTION          0x0118
+#define IDG_VS_FILE_NEW_CASCADE       0x0119
+#define IDG_VS_FILE_OPENP_CASCADE     0x011A
+#define IDG_VS_FILE_OPENF_CASCADE     0x011B
+#define IDG_VS_FILE_ADD_PROJECT_NEW   0x011C
+#define IDG_VS_FILE_ADD_PROJECT_EXI   0x011D
+#define IDG_VS_FILE_FMRU_CASCADE      0x011E
+#define IDG_VS_FILE_PMRU_CASCADE      0x011F
+#define IDG_VS_FILE_BROWSER           0x0120
+#define IDG_VS_FILE_MOVE              0x0121
+#define IDG_VS_FILE_MOVE_CASCADE      0x0122
+#define IDG_VS_FILE_MOVE_PICKER       0x0123
+#define IDG_VS_FILE_MISC              0x0124
+#define IDG_VS_FILE_MISC_CASCADE      0x0125
+#define IDG_VS_FILE_MAKE_EXE          0x0126
+
+// Edit Menu Groups
+#define IDG_VS_EDIT_OBJECTS           0x0128
+#define IDG_VS_EDIT_UNDOREDO          0x0129
+#define IDG_VS_EDIT_CUTCOPY           0x012A
+#define IDG_VS_EDIT_SELECT            0x012B
+#define IDG_VS_EDIT_FIND              0x012C
+#define IDG_VS_EDIT_GOTO              0x012D
+#define IDG_VS_EDIT_COMMANDWELL       0x012E
+
+// View Menu Groups
+#define IDG_VS_VIEW_BROWSER           0x0130
+#define IDG_VS_VIEW_PROPPAGES         0x0131
+#define IDG_VS_VIEW_TOOLBARS          0x0132
+#define IDG_VS_VIEW_FORMCODE          0x0133
+#define IDG_VS_VIEW_DEFINEVIEWS       0x0134
+#define IDG_VS_VIEW_WINDOWS           0x0135
+#define IDG_VS_VIEW_ARCH_WINDOWS      0x0720
+#define IDG_VS_VIEW_ORG_WINDOWS       0x0721
+#define IDG_VS_VIEW_CODEBROWSENAV_WINDOWS 0x0722
+#define IDG_VS_VIEW_DEV_WINDOWS       0x0723
+#define IDG_VS_WNDO_FINDRESULTS       0x0724
+#define IDG_VS_VIEW_REFRESH           0x0136
+#define IDG_VS_VIEW_NAVIGATE          0x0137
+#define IDG_VS_VIEW_SYMBOLNAVIGATE    0x0138
+#define IDG_VS_VIEW_SMALLNAVIGATE     0x0139
+#define IDG_VS_VIEW_OBJBRWSR          0x013A
+#define IDG_VS_VIEW_LINKS             0x013B
+#define IDG_VS_VIEW_COMMANDWELL       0x013C
+#define IDG_VS_VIEW_SYMBOLNAVIGATE_JS 0x013D // VS 2005 bug #303148
+
+// Project Menu Groups
+#define IDG_VS_PROJ_ADD               0x0140
+#define IDG_VS_PROJ_OPTIONS           0x0141
+#define IDG_VS_PROJ_REFERENCE         0x0142
+#define IDG_VS_PROJ_FOLDER            0x0143
+#define IDG_VS_PROJ_UNLOADRELOAD      0x0144
+#define IDG_VS_PROJ_ADDCODE           0x0145
+#define IDG_VS_PROJ_PROJECT           0x0146
+#define IDG_VS_PROJ_ADDREMOVE         0x0147
+#define IDG_VS_PROJ_WEB1              0x0148
+#define IDG_VS_PROJ_WEB2              0x0149
+#define IDG_VS_PROJ_TOOLBAR1          0x014A
+#define IDG_VS_PROJ_TOOLBAR2          0x014B
+#define IDG_VS_PROJ_MISCADD           0x014C
+#define IDG_VS_PROJ_SETTINGS          0x014D
+#define IDG_VS_PROJ_ADMIN             0x014E
+
+// Run Menu Groups
+#define IDG_VS_RUN_START          0x0150
+#define IDG_VS_DBG_STEP           0x0151
+#define IDG_VS_DBG_WATCH          0x0152
+#define IDG_VS_DBG_BRKPTS         0x0153
+#define IDG_VS_DBG_STATEMENT          0x0154
+#define IDG_VS_DBG_ATTACH         0x0155
+#define IDG_VS_DBG_TBBRKPTS       0x0156
+#define IDG_VS_DBG_DBGWINDOWS         0x0157   // this actually resides on the debugger toolbar
+
+//Tools->External Tools Groups
+#define IDG_VS_TOOLS_EXT_CUST         0x0158
+#define IDG_VS_TOOLS_EXT_TOOLS        0x0159
+
+// Tools Menu Groups
+#define IDG_VS_TOOLS_OPTIONS          0x015A
+#define IDG_VS_TOOLS_OTHER2       0x015B
+#define IDG_VS_TOOLS_OBJSUBSET        0x015C
+
+// Addins Menu Groups
+#define IDG_VS_ADDIN_BUILTIN          0x015D
+#define IDG_VS_ADDIN_MANAGER          0x015E
+
+// Window Menu Groups
+#define IDG_VS_WINDOW_NEW         0x0160
+#define IDG_VS_WINDOW_ARRANGE         0x0161
+#define IDG_VS_WINDOW_LIST        0x0162
+#define IDG_VS_WINDOW_NAVIGATION      0x0163
+
+// Help Menu Groups
+#define IDG_VS_HELP_SUPPORT       0x016A
+#define IDG_VS_HELP_ABOUT         0x016B
+#define IDG_VS_HELP_SAMPLES       0x016C
+
+
+// Standard Toolbar Groups
+#define IDG_VS_TOOLSB_NEWADD          0x0170
+#define IDG_VS_TOOLSB_SAVEOPEN        0x0171
+#define IDG_VS_TOOLSB_CUTCOPY         0x0172
+#define IDG_VS_TOOLSB_UNDOREDO        0x0173
+#define IDG_VS_TOOLSB_RUNBUILD        0x0174
+#define IDG_VS_TOOLSB_WINDOWS         0x0175  // don't use
+#define IDG_VS_TOOLSB_GAUGE       0x0176
+#define IDG_VS_TOOLSB_SEARCH          0x0177
+#define IDG_VS_TOOLSB_NEWWINDOWS      0x0178
+#define IDG_VS_TOOLSB_NAVIGATE        0x0179
+#define IDG_VS_FINDTAB            0x017D
+#define IDG_VS_REPLACETAB         0x017E
+
+// Window UI Toolbar Groups
+#define IDG_VS_WINDOWUI_LOADSAVE      0x017A
+
+// Open Windows Toolbar Groups
+#define IDG_VS_OPENWIN_WINDOWS        0x017B
+
+// View Bar Toolbar Groups
+#define IDG_VS_VIEWBAR_VIEWS          0x017C
+
+// Watch context menu groups
+#define IDG_VS_WATCH_EDITADDDEL       0x0180
+//#define IDG_VS_WATCH_COLLAPSE       0x0181
+#define IDG_VS_WATCH_PROCDEFN         0x0182
+#define IDG_VS_WATCH_STARTEND         0x0183
+
+// Thread context menu groups
+#define IDG_VS_THREAD_SUSPENDRESUME   0x0184
+
+// Hexadecimal group
+#define IDG_VS_DEBUG_DISPLAYRADIX     0x0185
+
+// Treegrid context menu
+#define IDG_VS_TREEGRID           0x0186
+
+// Immediate context menu groups
+#define IDG_VS_IMMD_OBPROCDEFN        0x0188
+
+// Docking / Hide Pane Group
+#define IDG_VS_DOCKCLOSE          0x0189
+#define IDG_VS_DOCKHIDE           0x0190
+#define IDG_VS_DOCUMENTDOCKHIDE   0x0192
+
+// Thread context menu groups
+#define IDG_VS_CALLST_RUNTOCURSOR     0x0191
+// 0x0192 is used above in IDG_VS_DOCUMENTDOCKHIDE
+
+// MenuDesigner Context Menu Groups
+#define IDG_VS_MNUDES_CUTCOPY         0x0195
+#define IDG_VS_MNUDES_INSERT          0x0196
+#define IDG_VS_MNUDES_EDITNAMES       0x0197
+#define IDG_VS_MNUDES_VIEWCODE        0x0198
+#define IDG_VS_MNUDES_PROPERTIES      0x0199
+
+#define IDG_VS_MNUDES_UNDOREDO        0x019A
+
+// Window Menu Cascade groups
+#define IDG_VS_WNDO_OTRWNDWS0         0x019E
+#define IDG_VS_WNDO_OTRWNDWS1         0x019F
+#define IDG_VS_WNDO_OTRWNDWS2         0x01A0
+#define IDG_VS_WNDO_OTRWNDWS3         0x01A1
+#define IDG_VS_WNDO_OTRWNDWS4         0x01A2
+#define IDG_VS_WNDO_OTRWNDWS5         0x01A3
+#define IDG_VS_WNDO_OTRWNDWS6         0x01A4
+#define IDG_VS_WNDO_WINDOWS1          0x01A5
+#define IDG_VS_WNDO_WINDOWS2          0x01A6
+#define IDG_VS_WNDO_DBGWINDOWS        IDG_VS_WNDO_WINDOWS1
+
+// OLE Verbs Menu Cascade groups
+#define IDG_VS_EDIT_OLEVERBS          0x01A8
+
+// PropBrs Context menu groups
+#define IDG_VS_PROPBRS_MISC       0x01AA
+
+// Output Window Pane Context menu groups
+#define IDG_VS_RESULTSLISTCOPY        0x01AC
+#define IDG_VS_RESULTSLISTCLEAR       0x01AD
+#define IDG_VS_RESULTSLISTGOTO        0x01AE
+
+// New Toolbox Context Menu groups   
+#define IDG_VS_TOOLBOX_ACTIONS          0x01B0
+#define IDG_VS_TOOLBOX_ITEM             0x01B1
+#define IDG_VS_TOOLBOX_TAB              0x01B2
+#define IDG_VS_TOOLBOX_MOVE             0x01B3
+#define IDG_VS_TOOLBOX_VIEW             0x01B4
+
+// Miscellaneous Files project context menu groups
+#define IDG_VS_MISCFILES_PROJ         0x01B8
+
+// Miscellaneous Files project item context menu groups
+#define IDG_VS_MISCFILES_PROJITEM     0x01BA
+
+// Solution Items project item context menu groups
+#define IDG_VS_SOLNITEMS_PROJ         0x01BC
+#define IDG_VS_SOLNITEMS_PROJITEM     0x01BD
+
+// Stub (unloaded/placeholder) project context menu groups
+#define IDG_VS_STUB_PROJECT           0x01BE
+
+// Code Window context menu groups
+#define IDG_VS_CODEWIN_TEXTEDIT     0x01C0
+#define IDG_VS_CODEWIN_DEBUG_BP     0x01C1
+#define IDG_VS_CODEWIN_DEBUG_WATCH  0x01C2
+#define IDG_VS_CODEWIN_DEBUG_STEP   0x01C3
+#define IDG_VS_CODEWIN_MARKER       0x01C4
+#define IDG_VS_CODEWIN_OPENURL      0x01C5
+#define IDG_VS_CODEWIN_SHORTCUT     0x01C6
+
+#define IDG_VS_CODEWIN_INTELLISENSE     0x02B0
+#define IDG_VS_CODEWIN_NAVIGATETOLOCATION         0x02B1
+#define IDG_VS_CODEWIN_NAVIGATETOFILE 0x02B2
+#define IDG_VS_CODEWIN_OUTLINING    0x02B3
+#define IDG_VS_CODEWIN_CTXT_OUTLINING 0x02B4
+#define IDG_VS_CODEWIN_REFACTORING  0x02b5
+// 0x02B6 used below in IDG_VS_FINDRESULTS1_STOPFIND
+// 0x02B7 used below in IDG_VS_FINDRESULTS2_STOPFIND
+#define IDG_VS_CODEWIN_REFACTORING_JS 0x02b8 // VS 2005 bug #275998
+#define IDG_VS_CODEWIN_LANGUAGE     0x02D0
+#define IDG_VS_CODEWIN_ADVANCED		0x02D1
+#define IDG_VS_CODEWIN_SNIPPETS     0x02D2
+
+// Task List context menu groups
+#define IDG_VS_TASKLIST           0x01C7
+#define IDG_VS_ERRORLIST          0x01CB
+
+// cascading Task list menu groups
+#define IDG_VS_TASKLIST_SORT              0x01C8
+#define IDG_VS_TASKLIST_NEXTPREV_ERR	  0x01C9
+#define IDG_VS_TASKLIST_CLIENT            0x01CA
+// 0x01CB used above (IDG_VS_ERRORLIST)
+#define IDG_VS_ERRORLIST_CLIENT           0x01CC
+#define IDG_VS_ERRORLIST_NEXTPREV_ERR     0x01CD
+// UNUSED: 0x01CE
+#define IDG_VS_TASKLIST_COLUMNS           0x01CF
+
+#define IDG_VS_TASKLIST_SORT_COLUMN       0x01D0
+
+// Tasklist toolbar provider list group
+#define IDG_VS_TASKLIST_PROVIDERLIST    0x01D1
+
+// Build toolbar group
+#define IDG_VS_BUILDBAR                 0x01D2
+
+// User Tasks toolbar group
+#define IDG_VS_USERTASKS_EDIT           0x01D3
+
+// Error List toolbar group
+#define IDG_VS_ERRORLIST_ERRORGROUP     0x01D4
+
+// Project Window Toolbar group
+#define IDG_VS_PROJ_TOOLBAR3            0x01D5
+#define IDG_VS_PROJ_TOOLBAR4            0x01D6
+#define IDG_VS_PROJ_TOOLBAR5            0x01D7
+
+// More error list toolbar groups -- see IDG_VS_ERRORLIST_ERRORGROUP above
+#define IDG_VS_ERRORLIST_WARNINGGROUP   0x01D8
+#define IDG_VS_ERRORLIST_MESSAGEGROUP   0x01D9
+
+// Solution Node ctxt menu groups     
+#define IDG_VS_SOLNNODE_CTXT_TOP    0x01E0
+#define IDG_VS_SOLNNODE_CTXT_BOTTOM 0x01E1
+
+// Project Window Default group
+#define IDG_VS_PROJWIN_NODE_CTXT_TOP    0x01E2
+#define IDG_VS_PROJWIN_NODE_CTXT_BOTTOM 0x01E3
+#define IDG_VS_PROJWIN_ITEM_CTXT_TOP    0x01E4
+#define IDG_VS_PROJWIN_ITEM_CTXT_BOTTOM 0x01E5
+
+// Document Window Default groups   
+#define IDG_VS_DOCWINDOW_CTXT_TOP   0x01E6
+#define IDG_VS_DOCWINDOW_CTXT_BOTTOM    0x01E7
+
+// Tool Window Default groups
+#define IDG_VS_TOOLWINDOW_CTXT_TOP  0x01E8
+#define IDG_VS_TOOLWINDOW_CTXT_BOTTOM   0x01E9
+
+// EZ MDI groups
+#define IDG_VS_EZ_TILE                  0x01EA
+#define IDG_VS_EZ_CANCEL                0x01EB
+#define IDG_VS_EZ_DOCWINDOWOPS          0x01EC
+#define IDG_VS_EZ_DOCWINDOWPATHOPS      0x01ED
+
+// Debugger Group
+#define IDG_VS_TOOL_DEBUGGER            0x0200
+
+// Shell defined context menu groups
+#define IDG_VS_CTXT_MULTIPROJ_BUILD     0x0201
+#define IDG_VS_CTXT_PROJECT_ADD         0x0202
+#define IDG_VS_CTXT_PROJECT_ADD_ITEMS   0x0203
+#define IDG_VS_CTXT_PROJECT_DEBUG   0x0204
+#define IDG_VS_CTXT_PROJECT_START   0x0205
+#define IDG_VS_CTXT_PROJECT_BUILD   0x0206
+#define IDG_VS_CTXT_PROJECT_TRANSFER    0x0207
+#define IDG_VS_CTXT_ITEM_VIEWOBJECT 0x0208
+#define IDG_VS_CTXT_ITEM_OPEN       0x0209
+#define IDG_VS_CTXT_ITEM_TRANSFER   0x020A
+#define IDG_VS_CTXT_ITEM_VIEWBROWSER    0x020B
+#define IDG_VS_CTXT_SAVE        0x020C
+#define IDG_VS_CTXT_ITEM_PRINT      0x020D
+#define IDG_VS_CTXT_ITEM_PROPERTIES 0x020E
+#define IDG_VS_CTXT_SCC         0x020F 
+#define IDG_VS_CTXT_ITEM_RENAME     0x0210
+#define IDG_VS_CTXT_PROJECT_RENAME  0x0211
+#define IDG_VS_CTXT_SOLUTION_RENAME 0x0212
+#define IDG_VS_CTXT_ITEM_SAVE       IDG_VS_CTXT_SAVE
+#define IDG_VS_CTXT_PROJECT_SAVE    0x0213
+#define IDG_VS_CTXT_PROJECT_PROPERTIES  0x0214
+#define IDG_VS_CTXT_SOLUTION_PROPERTIES 0x0215
+#define IDG_VS_CTXT_ITEM_SCC        IDG_VS_CTXT_SCC
+#define IDG_VS_CTXT_PROJECT_SCC     0x0216
+#define IDG_VS_CTXT_SOLUTION_SCC    0x0217
+
+#define IDG_VS_CTXT_SOLUTION_SAVE   0x0218
+#define IDG_VS_CTXT_SOLUTION_BUILD  0x0219
+#define IDG_VS_UNUSED           0x021A  // unused group for hidden cmds
+#define IDG_VS_CTXT_SOLUTION_START      0x021B
+#define IDG_VS_CTXT_SOLUTION_TRANSFER   0x021C
+#define IDG_VS_CTXT_SOLUTION_ADD_PROJ   0x021D
+#define IDG_VS_CTXT_SOLUTION_ADD_ITEM   0x021E
+#define IDG_VS_CTXT_SOLUTION_DEBUG      0x021F
+
+#define IDG_VS_CTXT_DOCOUTLINE      0x0220
+#define IDG_VS_CTXT_NOCOMMANDS          0x0221
+
+#define IDG_VS_TOOLS_CMDLINE        0x0222
+#define IDG_VS_TOOLS_SNIPPETS       IDG_TOOLS_SNIPPETS
+#define IDG_VS_CTXT_CMDWIN_MARK     0x0223
+
+#define IDG_VS_CTXT_AUTOHIDE        0x0224
+
+//External tools context menu groups
+#define IDG_VS_EXTTOOLS_CURARGS         0x0225
+#define IDG_VS_EXTTOOLS_PROJARGS        0x0226
+#define IDG_VS_EXTTOOLS_SLNARGS         0x0227
+#define IDG_VS_EXTTOOLS_CURDIRS         0x0228
+#define IDG_VS_EXTTOOLS_PROJDIRS        0x0229
+#define IDG_VS_EXTTOOLS_SLNDIRS         0x022A
+#define IDG_VS_EXTTOOLS_TARGETARGS      0x022B
+#define IDG_VS_EXTTOOLS_EDITORARGS      0x022C
+#define IDG_VS_EXTTOOLS_TARGETDIRS      0x022D
+
+#define IDG_VS_CTXT_ITEM_VIEW           0x022E
+#define IDG_VS_CTXT_DELETE              0x022F
+#define IDG_VS_CTXT_FOLDER_TRANSFER     0x0230
+#define IDG_VS_CTXT_MULTISELECT_TRANSFER  0x0231
+#define IDG_VS_CTXT_PROJECT_DEPS        0x0232
+#define IDG_VS_CTXT_SOLUTION_ADD        0x0233
+#define IDG_VS_CTXT_PROJECT_CONFIG      0x0234
+
+// New File/Add New Item Open button drop-down menu
+#define IDG_VS_OPENDROPDOWN_MENU        0x0235
+
+// Unhide group on solution context menu
+#define IDG_VS_CTXT_SOLUTION_UNHIDE     0x0236
+
+// Context menu group for editing a project file
+#define IDG_VS_CTXT_PROJECT_EDITFILE  0x0237
+
+// Object search menu groups
+#define IDG_VS_OBJSEARCH_NAVIGATE     0x0238
+#define IDG_VS_OBJSEARCH_EDIT         0x0239
+//#define IDG_VS_OBJSEARCH_SORTING      0x0268
+
+// Context menu group for unloading/reloading a project
+#define IDG_VS_CTXT_PROJECT_UNLOADRELOAD 0x023A
+
+// Classview menu groups
+
+#define IDG_VS_CLASSVIEW_BASE_DERIVED_GRP   0x023B
+#define IDG_VS_CLASSVIEW_DISPLAY2           0x023C
+#define IDG_VS_CLASSVIEW_MEMACCESSGRP       0x023D
+#define IDG_VS_CLASSVIEW_SEARCH2            0x023E
+
+#define IDG_VS_CLASSVIEW_MEMGRP       0x023F
+#define IDG_VS_CLASSVIEW_FOLDERS      0x0240  // Used in toolbar
+#define IDG_VS_CLASSVIEW_FOLDERS2     0x0241  // Used in context menu
+#define IDG_VS_CLASSVIEW_DISPLAY      0x0242
+#define IDG_VS_CLASSVIEW_SEARCH       0x0243
+#define IDG_VS_CLASSVIEW_EDIT         0x0244
+#define IDG_VS_CLASSVIEW_NAVIGATION   0x0245
+#define IDG_VS_CLASSVIEW_SHOWINFO     0x0247
+#define IDG_VS_CLASSVIEW_PROJADD      0x0248
+#define IDG_VS_CLASSVIEW_ITEMADD      0x0249
+#define IDG_VS_CLASSVIEW_GROUPING     0x024a
+#define IDG_VS_CLASSVIEW_PROJWIZARDS  0x024b
+#define IDG_VS_CLASSVIEW_ITEMWIZARDS  0x024c
+#define IDG_VS_CLASSVIEW_PROJADDITEMS 0x024d
+#define IDG_VS_CLASSVIEW_FOLDERS_EDIT 0x024e
+
+
+
+// Regular Expression Context menu groups
+#define IDG_VS_FINDREGEXNORM0         0x024f
+#define IDG_VS_FINDREGEXNORM1         0x0250
+#define IDG_VS_FINDREGEXHELP          0x0251
+#define IDG_VS_REPLACEREGEXNORM       0x0252
+#define IDG_VS_REPLACEREGEXHELP       0x0253
+#define IDG_VS_FINDWILDNORM       0x0254
+#define IDG_VS_FINDWILDHELP       0x0255
+#define IDG_VS_REPLACEWILDNORM        0x0256
+#define IDG_VS_REPLACEWILDHELP        0x0257
+#define IDG_VS_FINDREGEXNORM2         0x0258
+#define IDG_VS_FINDREGEXNORM3         0x0259
+
+#define IDG_VS_EXTTOOLS_BINARGS       0x025A
+#define IDG_VS_EXTTOOLS_BINDIRS       0x025B
+
+// Solution Folders context menu groups
+#define IDG_VS_CTXT_SLNFLDR_ADD_PROJ  0x0261
+#define IDG_VS_CTXT_SLNFLDR_ADD_ITEM  0x0262
+#define IDG_VS_CTXT_SLNFLDR_BUILD     0x0263
+#define IDG_VS_CTXT_SLNFLDR_ADD       0x0264
+
+#define IDG_VS_CTXT_SOLUTION_EXPLORE  0x0265
+#define IDG_VS_CTXT_PROJECT_EXPLORE   0x0266
+#define IDG_VS_CTXT_FOLDER_EXPLORE    0x0267
+
+// object search (find symbol results) context menu group
+#define IDG_VS_OBJSEARCH_SORTING      0x0268
+
+// Object Browser menu groups
+#define IDG_VS_OBJBROWSER_SUBSETS     0x0270
+#define IDG_VS_OBJBROWSER_DISPLAY     0x0271
+#define IDG_VS_OBJBROWSER_DISPLAY2    0x0272
+#define IDG_VS_OBJBROWSER_SEARCH      0x0273
+#define IDG_VS_OBJBROWSER_SEARCH2     0x0274
+#define IDG_VS_OBJBROWSER_NAVIGATION  0x0275
+#define IDG_VS_OBJBROWSER_EDIT        0x0276
+#define IDG_VS_OBJBROWSER_OBJGRP      0x0277
+#define IDG_VS_OBJBROWSER_MEMGRP      0x0278
+#define IDG_VS_OBJBROWSER_GROUPINGS   0x0279
+#define IDG_VS_OBJBROWSER_VIEWGRP     0x027A
+#define IDG_VS_OBJBROWSER_MEMACCESSGRP  0x027B
+#define IDG_VS_OBJBROWSER_BROWSERSETTINGSBTN 0x027C
+#define IDG_VS_OBJBROWSER_BASE_DERIVED_GRP  0x027D
+#define IDG_VS_OBJBROWSER_BROWSERSETTINGS 0x027E
+#define IDG_VS_OBJBROWSER_MEMBERSETTINGS  0x027F
+
+
+// Build Menu groups
+#define IDG_VS_BUILD_SOLUTION         0x0280
+#define IDG_VS_BUILD_SELECTION        0x0281
+#define IDG_VS_BUILD_MISC             0x0282
+#define IDG_VS_BUILD_CANCEL           0x0283
+#define IDG_VS_BUILD_CASCADE          0x0284
+#define IDG_VS_REBUILD_CASCADE        0x0285
+#define IDG_VS_CLEAN_CASCADE          0x0286
+#define IDG_VS_DEPLOY_CASCADE         0x0287
+#define IDG_VS_BUILD_PROJPICKER       0x0288
+#define IDG_VS_REBUILD_PROJPICKER     0x0289
+#define IDG_VS_PGO_SELECTION          0x028A
+// 0x028B is used below (IDG_VS_PGO_BUILD_CASCADE_RUN)
+#define IDG_VS_BUILD_COMPILE          0x028C
+#define IDG_VS_CLEAN_PROJPICKER       0x0290
+#define IDG_VS_DEPLOY_PROJPICKER      0x0291
+
+#define IDG_VS_CTXT_CMDWIN_CUTCOPY    0x0292
+
+// Output Window menu groups
+#define IDG_VS_OUTPUTWINDOW_SELECT    0x0293
+#define IDG_VS_OUTPUTWINDOW_GOTO      0x0294
+#define IDG_VS_OUTPUTWINDOW_NEXTPREV  0x0295
+#define IDG_VS_OUTPUTWINDOW_CLEAR     0x0296
+#define IDG_VS_OUTPUTWINDOW_WORDWRAP  0x029F
+
+// Find Results 1 menu groups
+#define IDG_VS_FINDRESULTS1_GOTO      0x0297
+#define IDG_VS_FINDRESULTS1_NEXTPREV  0x0298
+#define IDG_VS_FINDRESULTS1_CLEAR     0x0299
+#define IDG_VS_FINDRESULTS1_STOPFIND  0x02B6
+
+// Find Results 2 menu groups
+#define IDG_VS_FINDRESULTS2_GOTO      0x029A
+#define IDG_VS_FINDRESULTS2_NEXTPREV  0x029B
+#define IDG_VS_FINDRESULTS2_CLEAR     0x029C
+#define IDG_VS_FINDRESULTS2_STOPFIND  0x02B7
+
+#define IDG_VS_PROJONLY_CASCADE       0x029D
+#define IDG_VS_PGO_BUILD_CASCADE_BUILD 0x029E
+#define IDG_VS_PGO_BUILD_CASCADE_RUN   0x028B
+
+// 0x029F used above (IDG_VS_OUTPUTWINDOW_WORDWRAP)
+
+// Additional Shell defined context menu groups
+#define IDG_VS_CTXT_PROJECT_ADD_FORMS 0x02A0
+#define IDG_VS_CTXT_PROJECT_ADD_MISC  0x02A1
+#define IDG_VS_CTXT_ITEM_INCLUDEEXCLUDE 0x02A2
+#define IDG_VS_CTXT_FOLDER_ADD        0x02A3
+#define IDG_VS_CTXT_REFROOT_ADD       0x02A4
+#define IDG_VS_CTXT_REFROOT_TRANSFER  0x02A5
+#define IDG_VS_CTXT_WEBREFFOLDER_ADD  0x02A6
+#define IDG_VS_CTXT_COMPILELINK       0x02A7
+#define IDG_VS_CTXT_REFERENCE         0x02A8
+#define IDG_VS_CTXT_APPDESIGNERFOLDER_OPEN  0x02A9
+
+#define IDG_VS_OBJSEARCH_CLEAR        0x02AA
+#define IDG_VS_CTXT_CMDWIN_CLEAR      0x02AB
+
+#define IDG_VS_UFINDQUICK             0x02AD
+#define IDG_VS_UFINDFIF               0x02AE
+#define IDG_VS_FFINDSYMBOL            0x02AF
+#define IDG_VS_CTXT_PROJECT_CLASSDIAGRAM 0x02B8
+
+//0x02B0 used for Codewindow context menu
+//0x02B1 used for Codewindow context menu
+//0x02B2 used for Codewindow context menu
+#define IDG_VS_BWNEXTBM             0x01F0
+#define IDG_VS_BWPREVBM             0x01F1
+#define IDG_VS_BWNEXTBMF            0x01F2
+#define IDG_VS_BWPREVBMF            0x01F3
+#define IDG_VS_BWNEWFOLDER          0x01F4
+#define IDG_VS_BWENABLE             0x01F5
+#define IDG_VS_BWDISABLE            0x01F6
+#define IDG_VS_CTXT_BW1             0x01F7
+#define IDG_VS_CTXT_BW2             0x01F8
+#define IDG_VS_BWDELETE             0x01F9
+
+// Properties panel groups
+#define IDG_VS_PROPERTIES_SORT      0x02BA
+#define IDG_VS_PROPERTIES_PAGES     0x02BB
+
+#define IDG_VS_CLASSVIEW_SETTINGS   0x02BC  // Used in toolbar
+#define IDG_VS_CLASSVIEW_BROWSERSETTINGSBTN 0x02BD
+#define IDG_VS_CLASSVIEW_SHOW_INHERITED     0x02BE
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Groups for Menu Controllers
+//
+//////////////////////////////////////////////////////////////////////////////
+#define IDG_VS_MNUCTRL_NEWITM                 0x02C0
+#define IDG_VS_MNUCTRL_NEWITM_BOTTOM          0x02C1
+#define IDG_VS_MNUCTRL_NEWPRJ                 0x02C2
+#define IDG_VS_MNUCTRL_NEWPRJ_BOTTOM          0x02C3
+#define IDG_VS_MNUCTRL_NAVBACK                0x02C4
+#define IDG_VS_MNUCTRL_OBSEARCHOPTIONS        0x02C5
+#define IDG_VS_MNUCTRL_FIND                   0x02C6
+#define IDG_VS_MNUCTRL_REPLACE                0x02C7
+
+#define IDG_VS_SNIPPET_PROP                   0x02C8
+#define IDG_VS_SNIPPET_REF                    0x02C9
+#define IDG_VS_SNIPPET_REPL                   0x02CA
+
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Cascading Menu Identifiers, created by Visual Studio Shell
+//
+//////////////////////////////////////////////////////////////////////////////
+#define IDM_VS_CSCD_WINDOWS           0x0300
+#define IDM_VS_CSCD_TASKLIST_SORT         0x0301
+#define IDM_VS_CSCD_TASKLIST_FILTER       0x0302
+#define IDM_VS_CSCD_TASKLIST_VIEWMENU_FILTER  0x0303
+#define IDM_VS_CSCD_DEBUGWINDOWS          0x0304
+#define IDM_VS_EDITOR_CSCD_OUTLINING_MENU 0x0305
+#define IDM_VS_CSCD_COMMANDBARS               0x0306
+#define IDM_VS_CSCD_OLEVERBS                  0x0307
+#define IDM_VS_CSCD_NEW                       0x0308
+#define IDM_VS_CSCD_OPEN                      0x0309
+#define IDM_VS_CSCD_ADD                       0x030A
+#define IDM_VS_CSCD_MNUDES                    0x030B
+#define IDM_VS_CSCD_FILEMRU                   0x030C
+#define IDM_VS_CSCD_PROJMRU                   0x030D
+#define IDM_VS_CSCD_NEW_PROJ                  0x030E
+#define IDM_VS_CSCD_MOVETOPRJ                 0x030F
+
+#define IDM_VS_CSCD_NAVIGATE1             0x0310
+#define IDM_VS_CSCD_NAVIGATE2             0x0311
+#define IDM_VS_CSCD_NAVIGATE3             0x0312
+#define IDM_VS_CSCD_NAVIGATE4             0x0313
+#define IDM_VS_CSCD_NAVIGATE5             0x0314
+#define IDM_VS_CSCD_NAVIGATE6             0x0315
+#define IDM_VS_CSCD_NAVIGATE7             0x0316
+#define IDM_VS_CSCD_NAVIGATE8             0x0317
+#define IDM_VS_CSCD_NAVIGATE9             0x0318
+#define IDM_VS_CSCD_NAVIGATE10            0x0319
+#define IDM_VS_CSCD_NAVIGATE11            0x031A
+#define IDM_VS_CSCD_NAVIGATE12            0x031B
+#define IDM_VS_CSCD_NAVIGATE13            0x031C
+#define IDM_VS_CSCD_NAVIGATE14            0x031D
+#define IDM_VS_CSCD_NAVIGATE15            0x031E
+#define IDM_VS_CSCD_NAVIGATE16            0x031F
+#define IDM_VS_CSCD_NAVIGATE17            0x0320
+#define IDM_VS_CSCD_NAVIGATE18            0x0321
+#define IDM_VS_CSCD_NAVIGATE19            0x0322
+#define IDM_VS_CSCD_NAVIGATE20            0x0323
+#define IDM_VS_CSCD_NAVIGATE21            0x0324
+#define IDM_VS_CSCD_NAVIGATE22            0x0325
+#define IDM_VS_CSCD_NAVIGATE23            0x0326
+#define IDM_VS_CSCD_NAVIGATE24            0x0327
+#define IDM_VS_CSCD_NAVIGATE25            0x0328
+#define IDM_VS_CSCD_NAVIGATE26            0x0329
+#define IDM_VS_CSCD_NAVIGATE27            0x032A
+#define IDM_VS_CSCD_NAVIGATE28            0x032B
+#define IDM_VS_CSCD_NAVIGATE29            0x032C
+#define IDM_VS_CSCD_NAVIGATE30            0x032D
+#define IDM_VS_CSCD_NAVIGATE31            0x032E
+#define IDM_VS_CSCD_NAVIGATE32            0x032F
+
+#define IDM_VS_CSCD_BUILD                     0x0330
+#define IDM_VS_CSCD_REBUILD                   0x0331
+#define IDM_VS_CSCD_CLEAN                     0x0332
+#define IDM_VS_CSCD_DEPLOY                    0x0333
+#define IDM_VS_CSCD_MISCFILES                 0x0334
+#define IDM_VS_CSCD_PROJONLY                  0x0335
+#define IDM_VS_CSCD_PGO_BUILD                 0x0336
+
+#define IDM_VS_CSCD_EXTTOOLS                  0x0340
+
+#define IDM_VS_CSCD_SOLUTION_ADD              0x0350
+#define IDM_VS_CSCD_SOLUTION_DEBUG            0x0351
+#define IDM_VS_CSCD_PROJECT_ADD               0x0352
+#define IDM_VS_CSCD_PROJECT_DEBUG             0x0353
+
+// ClassView cascades
+#define IDM_VS_CSCD_CV_PROJADD                0x0354
+#define IDM_VS_CSCD_CV_ITEMADD                0x0355
+
+#define IDM_VS_CSCD_SLNFLDR_ADD               0x0357
+
+#define IDM_VS_CSCD_TASKLIST_COLUMNS          0x0358
+
+#define IDM_VS_CSCD_CALLBROWSER               0x0359
+#define IDG_VS_VIEW_CALLBROWSER               0x035A
+#define IDG_VS_VIEW_CALLBROWSER_CASCADE       0x035B
+#define IDG_VS_VIEW_CALLBROWSER_SHOW          0x035C
+
+#define IDM_VS_CSCD_FINDRESULTS               0x035D
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Context Menu Identifiers, created by Visual Studio Shell
+//
+//////////////////////////////////////////////////////////////////////////////
+#define IDM_VS_CTXT_PROJNODE          0x0402
+#define IDM_VS_CTXT_PROJWIN           0x0403
+#define IDM_VS_CTXT_PROJWINBREAK      0x0404
+#define IDM_VS_CTXT_ERRORLIST         0x0405
+#define IDM_VS_CTXT_DOCKEDWINDOW      0x0406
+#define IDM_VS_CTXT_MENUDES           0x0407
+#define IDM_VS_CTXT_PROPBRS           0x0408
+#define IDM_VS_CTXT_TOOLBOX           0x0409
+// UNUSED: 0x040A - 0x040C
+#define IDM_VS_CTXT_CODEWIN           0x040D
+#define IDM_VS_CTXT_TASKLIST          0x040E
+#define IDM_VS_CTXT_RESULTSLIST       0x0411
+#define IDM_VS_CTXT_STUBPROJECT       0x0412
+#define IDM_VS_CTXT_SOLNNODE          0x0413
+#define IDM_VS_CTXT_SOLNFOLDER        0x0414
+
+// Slctn of one or more ProjNodes & SolnNode (doesn't involve ProjItem nodes)
+#define IDM_VS_CTXT_XPROJ_SLNPROJ     0x0415
+// Slctn of one or more ProjItems & SolnNode (min 1 ProjItem & may involve ProjNodes too)
+#define IDM_VS_CTXT_XPROJ_SLNITEM     0x0416
+// Selection of one more Project Nodes and one or more Project Items across projects (does not involve Solution Node) 
+#define IDM_VS_CTXT_XPROJ_PROJITEM    0x0417
+// Selection of two or more Project Nodes (does not involve the Solution Node or Project Item Nodes)
+#define IDM_VS_CTXT_XPROJ_MULTIPROJ   0x0418
+// Selection of one more Project Items across projects (does not involve Project Nodes or Solution Node)
+#define IDM_VS_CTXT_XPROJ_MULTIITEM   0x0419
+
+#define IDM_VS_CTXT_NOCOMMANDS        0x041A
+
+// Miscellaneous Files project and item context menus
+#define IDM_VS_CTXT_MISCFILESPROJ     0x041B
+
+// Selection of two or more solution folders
+#define IDM_VS_CTXT_XPROJ_MULTIFOLDER 0x041C
+// Selection of combination of projects and solution folders
+#define IDM_VS_CTXT_XPROJ_MULTIPROJFLDR 0x041D
+
+// Command Window context menu
+#define IDM_VS_CTXT_COMMANDWINDOW     0x041F
+
+// AutoHide context menu on channel
+#define IDM_VS_CTXT_AUTOHIDE          0x0420
+
+// Expansion Manager description pane context menu
+#define IDM_VS_CTXT_EXPANSION_DESC    0x0421
+
+// Expansion Manager description pane context menu commands
+#define IDG_VS_CTXT_EXPANSION_DESC_COPY 0x0422     
+#define IDG_VS_CTXT_EXPANSION_DESC_SELECTALL 0x0423
+
+#define IDM_VS_CTXT_FIND_REGEX        0x0424
+#define IDM_VS_CTXT_REPLACE_REGEX     0x0425
+#define IDM_VS_CTXT_FIND_WILD         0x0426
+#define IDM_VS_CTXT_REPLACE_WILD      0x0427
+#define IDM_VS_CTXT_EXTTOOLSARGS      0x0428
+#define IDM_VS_CTXT_EXTTOOLSDIRS      0x0429
+
+// EZMdi context menus
+#define IDM_VS_CTXT_EZTOOLWINTAB      0x042A
+#define IDM_VS_CTXT_EZDOCWINTAB       0x042B
+#define IDM_VS_CTXT_EZDRAGGING        0x042C
+#define IDM_VS_CTXT_EZCHANNEL         0x042D
+
+// New File/Add New Item Open button drop-down menu
+#define IDM_VS_CTXT_OPENDROPDOWN      0x042E
+
+// Framework Version drop-down menu
+#define IDM_VS_CTXT_FRAMEWORKVERSION  0x042F
+
+
+// Common Item Node context menu
+#define IDM_VS_CTXT_ITEMNODE          0x0430
+
+// Folder Node context menu
+#define IDM_VS_CTXT_FOLDERNODE        0x0431
+
+//////////////////////////////////////////////////////////////////////////////
+// ClassView context menus
+#define IDM_VS_CTXT_CV_PROJECT        0x0432
+#define IDM_VS_CTXT_CV_ITEM           0x0433
+#define IDM_VS_CTXT_CV_FOLDER         0x0434
+#define IDM_VS_CTXT_CV_GROUPINGFOLDER 0x0435
+#define IDM_VS_CTXT_CV_MULTIPLE       0x0436
+#define IDM_VS_CTXT_CV_MULTIPLE_MEMBERS 0x0437
+#define IDM_VS_CTXT_CV_MEMBER          0x0438
+#define IDM_VS_CTXT_CV_NON_SYMBOL_MEMBERS   0x0439
+#define IDM_VS_CTXT_CV_PROJECT_REFS_FOLDER  0x0440
+#define IDM_VS_CTXT_CV_PROJECT_REFERENCE    0x0441
+
+#define IDM_VS_CTXT_CV_NO_SOURCE_ITEM       0x0442
+#define IDM_VS_CTXT_CV_NO_SOURCE_MEMBER     0x0443
+
+#define IDM_VS_CTXT_CV_MULTIPLE_NO_SOURCE          0x049
+#define IDM_VS_CTXT_CV_MULTIPLE_MEMBERS_NO_SOURCE  0x04A
+
+// Object Browsing tools context menus
+#define IDM_VS_SYMBOLS_DUMMY           0x0444
+#define IDM_VS_CTXT_OBJBROWSER_OBJECTS 0x0445
+#define IDM_VS_CTXT_OBJBROWSER_MEMBERS 0x0446
+#define IDM_VS_CTXT_OBJBROWSER_DESC   0x0447
+#define IDM_VS_CTXT_OBJSEARCH         0x0448
+
+//#define IDM_VS_CTXT_CV_MULTIPLE_NO_SOURCE          0x049
+//#define IDM_VS_CTXT_CV_MULTIPLE_MEMBERS_NO_SOURCE  0x04A
+
+#define IDG_VS_FRAMEWORKVERSIONDROPDOWN_MENU        0x0449
+
+//////////////////////////////////////////////////////////////////////////////
+// Reference context menus
+// Reference Root Node context menu
+#define IDM_VS_CTXT_REFERENCEROOT     0x0450
+// Reference Item context menu
+#define IDM_VS_CTXT_REFERENCE         0x0451
+// Web Reference Folder context menu
+#define IDM_VS_CTXT_WEBREFFOLDER      0x0452
+// App Designer Folder context menu
+#define IDM_VS_CTXT_APPDESIGNERFOLDER 0x0453
+
+//////////////////////////////////////////////////////////////////////////////
+// Right drag menu group
+#define IDM_VS_CTXT_RIGHT_DRAG        0x0460
+#define IDG_VS_CTXT_RIGHT_DRAG1       0x0461
+#define IDG_VS_CTXT_RIGHT_DRAG2       0x0462
+
+//////////////////////////////////////////////////////////////////////////////
+// Web context menus
+#define IDM_VS_CTXT_WEBPROJECT        0x0470
+#define IDM_VS_CTXT_WEBFOLDER         0x0471
+#define IDM_VS_CTXT_WEBITEMNODE       0x0472
+// BEWARE!!!: IDM_VS_CTXT_BOOKMARK is defined as 0x0473
+#define IDM_VS_CTXT_WEBSUBWEBNODE     0x0474
+
+//////////////////////////////////////////////////////////////////////////////
+// Error correction context menu and group
+#define IDM_VS_CTXT_ERROR_CORRECTION  0x0480
+#define IDG_VS_CTXT_ERROR_CORRECTION  0x0481
+
+//////////////////////////////////////////////////////////////////////////////
+// Context menu organizers
+
+//No group for the Misc menu, since nobody purposely adds menus to this group,
+//it's used as a catchall to which we programmatically assign unparented context menus
+#define IDM_VS_CTXT_MISC                0x0490
+
+#define IDM_VS_CTXT_CV_ALL              0x0491
+#define IDG_VS_CTXT_CV_ALL              0x0492
+#define IDM_VS_CTXT_OBJBROWSER_ALL      0x0493
+#define IDG_VS_CTXT_OBJBROWSER_ALL      0x0494
+#define IDM_VS_CTXT_SOLNEXPL_ALL        0x0495
+#define IDG_VS_CTXT_SOLNEXPL_ALL        0x0496
+
+// CSHARP REFACTORING Context menu
+#define IDM_VS_CTX_REFACTORING          0x0497
+
+#define IDM_VS_CTXT_EDITOR_ALL          0x0498
+#define IDG_VS_CTXT_EDITOR_ALL          0x0499
+
+//////////////////////////////////////////////////////////////////////////////
+// Bookmark window context menu
+#define IDM_VS_CTXT_BOOKMARK          0x0473
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Menu Controller dentifiers, created by Visual Studio Shell
+//
+//////////////////////////////////////////////////////////////////////////////
+#define IDM_VS_MNUCTRL_NEWITM                   0x0500
+#define IDM_VS_MNUCTRL_NEWPRJ                   0x0501
+#define IDM_VS_MNUCTRL_OTRWNDWS                 0x0502
+#define IDM_VS_MNUCTRL_NAVBACK                  0x0503
+#define IDM_VS_MNUCTRL_OBSEARCHOPTS             0x0504
+#define IDM_VS_MNUCTRL_CVGROUPING               0x0505
+#define IDM_VS_MNUCTRL_OBGRPOBJS                0x0506
+#define IDM_VS_MNUCTRL_OBGRPMEMS                0x0507
+#define IDM_VS_MNUCTRL_OBGRPVIEWS               0x0509
+#define IDM_VS_MNUCTRL_OBGRPMEMSACCESS          0x050A
+#define IDM_VS_MNUCTRL_CALLBROWSER1_SETTINGS    0x050B
+#define IDM_VS_MNUCTRL_CALLBROWSER2_SETTINGS    0x050C
+#define IDM_VS_MNUCTRL_CALLBROWSER3_SETTINGS    0x050D
+#define IDM_VS_MNUCTRL_CALLBROWSER4_SETTINGS    0x050E
+#define IDM_VS_MNUCTRL_CALLBROWSER5_SETTINGS    0x050F
+#define IDM_VS_MNUCTRL_CALLBROWSER6_SETTINGS    0x0510
+#define IDM_VS_MNUCTRL_CALLBROWSER7_SETTINGS    0x0511
+#define IDM_VS_MNUCTRL_CALLBROWSER8_SETTINGS    0x0512
+#define IDM_VS_MNUCTRL_CALLBROWSER9_SETTINGS    0x0513
+#define IDM_VS_MNUCTRL_CALLBROWSER10_SETTINGS   0x0514
+#define IDM_VS_MNUCTRL_CALLBROWSER11_SETTINGS   0x0515
+#define IDM_VS_MNUCTRL_CALLBROWSER12_SETTINGS   0x0516
+#define IDM_VS_MNUCTRL_CALLBROWSER13_SETTINGS   0x0517
+#define IDM_VS_MNUCTRL_CALLBROWSER14_SETTINGS   0x0518
+#define IDM_VS_MNUCTRL_CALLBROWSER15_SETTINGS   0x0519
+#define IDM_VS_MNUCTRL_CALLBROWSER16_SETTINGS   0x051A
+#define IDM_VS_MNUCTRL_FIND                     0x051B
+#define IDM_VS_MNUCTRL_REPLACE                  0x051C
+
+// Text editor toolbar groups
+#define IDG_VS_EDITTOOLBAR_COMPLETION 0x0550
+#define IDG_VS_EDITTOOLBAR_INDENT     0x0551
+#define IDG_VS_EDITTOOLBAR_COMMENT    0x0552
+#define IDG_VS_EDITTOOLBAR_TEMPBOOKMARKS    0x0553
+
+// Edit menu groups (HTML Editor Edit | Advanced)
+#define IDG_TAG_OUTLINING             0x5554  
+
+// Format Menu groups
+#define IDG_VS_FORMAT_STYLE     0x0569
+#define IDG_VS_FORMAT_COLOR     0x056A
+#define IDG_VS_FORMAT_PARAGRAPH 0x056B
+#define IDG_VS_FORMAT_INDENT    0x056C
+#define IDG_VS_FORMAT_GRID      0x0554
+#define IDG_VS_FORMAT_SPACE     0x0555
+#define IDG_VS_FORMAT_CENTER    0x0556
+#define IDG_VS_FORMAT_ORDER     0x0557
+#define IDG_VS_FORMAT_ALIGN     0x0567
+#define IDG_VS_FORMAT_LOCK      0x0558
+#define IDG_VS_FORMAT_ELEMENT   0x056D
+// skip down to 0x0590 for IDG_VS_FORMAT_ANCHORS
+
+// Format Align menu groups
+#define IDG_VS_FORMAT_ALIGN_X     0x0559
+#define IDG_VS_FORMAT_ALIGN_Y     0x055A
+#define IDG_VS_FORMAT_ALIGN_GRID  0x055B
+
+// Format Size menu groups
+#define IDG_VS_FORMAT_SIZE        0x055C
+
+// Format Space menu groups
+#define IDG_VS_FORMAT_SPACE_X     0x055D
+#define IDG_VS_FORMAT_SPACE_Y     0x055E
+
+// Format Center menu groups
+#define IDG_VS_FORMAT_CENTER_CMDS 0x055F
+
+// Format Order menu groups
+#define IDG_VS_FORMAT_ORDER_CMDS  0x0560
+
+// Format Grid menu group
+#define IDG_VS_FORMAT_GRID_CMDS   0x0570
+
+// Layout Position menu group
+#define IDG_VS_LAYOUT_POSITION_CMDS 0x592
+#define IDG_VS_LAYOUT_POSITION_OPTIONS 0x596
+
+// Format cascaded menus
+#define IDM_VS_CSCD_FORMAT_FONT      0x056F
+#define IDM_VS_CSCD_FORMAT_JUSTIFY   0x0570
+#define IDM_VS_CSCD_FORMAT_ALIGN     0x0561
+#define IDM_VS_CSCD_FORMAT_SIZE      0x0562
+#define IDM_VS_CSCD_FORMAT_SPACE_X   0x0563
+#define IDM_VS_CSCD_FORMAT_SPACE_Y   0x0564
+#define IDM_VS_CSCD_FORMAT_CENTER    0x0565
+#define IDM_VS_CSCD_FORMAT_ORDER     0x0566
+
+// View menu groups
+#define IDG_VS_VIEW_TABORDER         0x0568
+#define IDG_VS_VIEW_OPTIONS          0x0571
+
+
+// 0x0569 used in IDG_VS_FORMAT_STYLE above
+// 0x056A used in IDG_VS_FORMAT_COLOR above
+// 0x056B used in IDG_VS_FORMAT_PARAGRAPH above
+// 0x056C used in IDG_VS_FORMAT_INDENT above
+// 0x056D used in IDG_VS_FORMAT_ELEMENT above
+// 0x056F used in IDM_VS_CSCD_FORMAT_FONT above
+// 0x0570 used in IDM_VS_CSCD_FORMAT_JUSTIFY above
+// 0x0571 used in IDG_VS_VIEW_OPTIONS above
+
+
+// Format Paragraph menu groups
+#define IDG_VS_FORMAT_FONTFACE       0x0572
+#define IDG_VS_FORMAT_FONTSCRIPT     0x0573
+#define IDG_VS_FORMAT_JUSTIFY        0x0574
+
+// Layout menu
+#define IDM_VS_LAYOUT_MENU            0x0575
+
+// Table cascaded menus
+#define IDM_VS_CSCD_TABLE_INSERT     0x0576
+#define IDM_VS_CSCD_TABLE_DELETE     0x0577
+#define IDM_VS_CSCD_TABLE_SELECT     0x0578
+#define IDM_VS_CSCD_TABLE_RESIZE     0x0596
+
+// Table menu groups
+#define IDG_VS_TABLE_MAIN            0x0579
+#define IDG_VS_TABLE_INSERT_1        0x057A
+#define IDG_VS_TABLE_INSERT_2        0x057B
+#define IDG_VS_TABLE_INSERT_3        0x057C
+#define IDG_VS_TABLE_INSERT_4        0x057D
+#define IDG_VS_TABLE_DELETE          0x057E
+#define IDG_VS_TABLE_SELECT          0x057F
+#define IDM_VS_CSCD_LAYOUT_POSITION  0x0593
+#define IDG_VS_LAYOUT_INSERT	     0x0594
+#define IDG_VS_TABLE_RESIZE          0x0595
+
+// Frame Set Menu
+#define IDM_VS_FRAMESET_MENU         0x0580
+
+// Frame Set Menu groups
+#define IDG_VS_FRAME_WHOLE           0x0581
+#define IDG_VS_FRAME_INDV            0x0582
+#define IDG_VS_FRAME_NEW             0x0583
+
+// Tools Menu groups
+#define IDG_VS_TOOLS_EDITOPT         0x0584
+
+// Insert Menu
+#define IDM_VS_INSERT_MENU           0x0585
+
+// Insert Menu groups
+#define IDG_VS_INSERT_TAGS           0x0586
+#define IDG_VS_INSERT_TAGS2          0x0587
+
+// Continuation of Format Menu groups
+#define IDG_VS_FORMAT_ANCHORS        0x0590
+#define IDG_VS_LAYOUT_POSITION       0x0591
+
+// Project cascaded menus
+#define IDM_VS_CSCD_PROJECT_WEB      0x0600
+
+// More Object browser groups
+#define IDG_VS_OBJBROWSER_ADDREFERENCE       0x0610
+#define IDG_VS_OBJBROWSER_ADDTOFAVOURITES    0x0611
+#define IDG_VS_OBJBROWSER_SHOW_INHERITED     0x0612
+
+// Code Definition View groups
+#define IDG_VS_CODEDEFVIEW                   0x0617
+
+// Project menu groups
+#define IDG_VS_CTXT_PROJECT_BUILD_ORDER      0x0620
+#define IDG_VS_CTXT_PROJECT_BUILD_PGO        0x0621
+
+///////////////////////////////////////////////
+//
+// EzMDI files command group
+//
+///////////////////////////////////////////////
+
+#define IDM_EZMDI_FILELIST                   0x0650
+#define IDG_EZMDI_FILELIST                   0x0651
+
+///////////////////////
+// Calls Browser groups
+///////////////////////
+
+#define IDG_VS_CALLBROWSER_TYPE                 0x0660
+#define IDG_VS_CALLBROWSER_EDIT                 0x0661
+#define IDG_VS_CALLBROWSER_NAVIGATION           0x0662
+#define IDM_VS_CTXT_CALLBROWSER                 0x0663
+
+#define IDG_VS_TOOLBAR_CALLBROWSER1_CBSETTINGS  0x0670
+#define IDG_VS_TOOLBAR_CALLBROWSER2_CBSETTINGS  0x0671
+#define IDG_VS_TOOLBAR_CALLBROWSER3_CBSETTINGS  0x0672
+#define IDG_VS_TOOLBAR_CALLBROWSER4_CBSETTINGS  0x0673
+#define IDG_VS_TOOLBAR_CALLBROWSER5_CBSETTINGS  0x0674
+#define IDG_VS_TOOLBAR_CALLBROWSER6_CBSETTINGS  0x0675
+#define IDG_VS_TOOLBAR_CALLBROWSER7_CBSETTINGS  0x0676
+#define IDG_VS_TOOLBAR_CALLBROWSER8_CBSETTINGS  0x0677
+#define IDG_VS_TOOLBAR_CALLBROWSER9_CBSETTINGS  0x0678
+#define IDG_VS_TOOLBAR_CALLBROWSER10_CBSETTINGS 0x0679
+#define IDG_VS_TOOLBAR_CALLBROWSER11_CBSETTINGS 0x067A
+#define IDG_VS_TOOLBAR_CALLBROWSER12_CBSETTINGS 0x067B
+#define IDG_VS_TOOLBAR_CALLBROWSER13_CBSETTINGS 0x067C
+#define IDG_VS_TOOLBAR_CALLBROWSER14_CBSETTINGS 0x067D
+#define IDG_VS_TOOLBAR_CALLBROWSER15_CBSETTINGS 0x067E
+#define IDG_VS_TOOLBAR_CALLBROWSER16_CBSETTINGS 0x067F
+
+#define IDG_VS_CALLBROWSER1_SETTINGSBTN         0x0680
+#define IDG_VS_CALLBROWSER2_SETTINGSBTN         0x0681
+#define IDG_VS_CALLBROWSER3_SETTINGSBTN         0x0682
+#define IDG_VS_CALLBROWSER4_SETTINGSBTN         0x0683
+#define IDG_VS_CALLBROWSER5_SETTINGSBTN         0x0684
+#define IDG_VS_CALLBROWSER6_SETTINGSBTN         0x0685
+#define IDG_VS_CALLBROWSER7_SETTINGSBTN         0x0686
+#define IDG_VS_CALLBROWSER8_SETTINGSBTN         0x0687
+#define IDG_VS_CALLBROWSER9_SETTINGSBTN         0x0688
+#define IDG_VS_CALLBROWSER10_SETTINGSBTN        0x0689
+#define IDG_VS_CALLBROWSER11_SETTINGSBTN        0x068A
+#define IDG_VS_CALLBROWSER12_SETTINGSBTN        0x068B
+#define IDG_VS_CALLBROWSER13_SETTINGSBTN        0x068C
+#define IDG_VS_CALLBROWSER14_SETTINGSBTN        0x068D
+#define IDG_VS_CALLBROWSER15_SETTINGSBTN        0x068E
+#define IDG_VS_CALLBROWSER16_SETTINGSBTN        0x068F
+
+#define IDG_VS_CALLBROWSER1_SORTING             0x0690
+#define IDG_VS_CALLBROWSER2_SORTING             0x0691
+#define IDG_VS_CALLBROWSER3_SORTING             0x0692
+#define IDG_VS_CALLBROWSER4_SORTING             0x0693
+#define IDG_VS_CALLBROWSER5_SORTING             0x0694
+#define IDG_VS_CALLBROWSER6_SORTING             0x0695
+#define IDG_VS_CALLBROWSER7_SORTING             0x0696
+#define IDG_VS_CALLBROWSER8_SORTING             0x0697
+#define IDG_VS_CALLBROWSER9_SORTING             0x0698
+#define IDG_VS_CALLBROWSER10_SORTING            0x0699
+#define IDG_VS_CALLBROWSER11_SORTING            0x069A
+#define IDG_VS_CALLBROWSER12_SORTING            0x069B
+#define IDG_VS_CALLBROWSER13_SORTING            0x069C
+#define IDG_VS_CALLBROWSER14_SORTING            0x069D
+#define IDG_VS_CALLBROWSER15_SORTING            0x069E
+#define IDG_VS_CALLBROWSER16_SORTING            0x069F
+
+#define IDG_VS_CALLBROWSER1_SETTINGS            0x06A0
+#define IDG_VS_CALLBROWSER2_SETTINGS            0x06A1
+#define IDG_VS_CALLBROWSER3_SETTINGS            0x06A2
+#define IDG_VS_CALLBROWSER4_SETTINGS            0x06A3
+#define IDG_VS_CALLBROWSER5_SETTINGS            0x06A4
+#define IDG_VS_CALLBROWSER6_SETTINGS            0x06A5
+#define IDG_VS_CALLBROWSER7_SETTINGS            0x06A6
+#define IDG_VS_CALLBROWSER8_SETTINGS            0x06A7
+#define IDG_VS_CALLBROWSER9_SETTINGS            0x06A8
+#define IDG_VS_CALLBROWSER10_SETTINGS           0x06A9
+#define IDG_VS_CALLBROWSER11_SETTINGS           0x06AA
+#define IDG_VS_CALLBROWSER12_SETTINGS           0x06AB
+#define IDG_VS_CALLBROWSER13_SETTINGS           0x06AC
+#define IDG_VS_CALLBROWSER14_SETTINGS           0x06AD
+#define IDG_VS_CALLBROWSER15_SETTINGS           0x06AE
+#define IDG_VS_CALLBROWSER16_SETTINGS           0x06AF
+
+#define IDG_VS_TOOLBAR_CALLBROWSER1_TYPE        0x06B0
+#define IDG_VS_TOOLBAR_CALLBROWSER2_TYPE        0x06B1
+#define IDG_VS_TOOLBAR_CALLBROWSER3_TYPE        0x06B2
+#define IDG_VS_TOOLBAR_CALLBROWSER4_TYPE        0x06B3
+#define IDG_VS_TOOLBAR_CALLBROWSER5_TYPE        0x06B4
+#define IDG_VS_TOOLBAR_CALLBROWSER6_TYPE        0x06B5
+#define IDG_VS_TOOLBAR_CALLBROWSER7_TYPE        0x06B6
+#define IDG_VS_TOOLBAR_CALLBROWSER8_TYPE        0x06B7
+#define IDG_VS_TOOLBAR_CALLBROWSER9_TYPE        0x06B8
+#define IDG_VS_TOOLBAR_CALLBROWSER10_TYPE       0x06B9
+#define IDG_VS_TOOLBAR_CALLBROWSER11_TYPE       0x06BA
+#define IDG_VS_TOOLBAR_CALLBROWSER12_TYPE       0x06BB
+#define IDG_VS_TOOLBAR_CALLBROWSER13_TYPE       0x06BC
+#define IDG_VS_TOOLBAR_CALLBROWSER14_TYPE       0x06BD
+#define IDG_VS_TOOLBAR_CALLBROWSER15_TYPE       0x06BE
+#define IDG_VS_TOOLBAR_CALLBROWSER16_TYPE       0x06BF
+
+#define IDG_VS_CALLBROWSER_TYPE_POPUP           0x06C0
+
+///////////////////////
+// Preview Changes groups
+///////////////////////
+
+#define IDG_VS_PREVIEWCHANGES_EDIT              0x06D0
+#define IDM_VS_CTXT_PREVIEWCHANGES              0x06D1
+
+#define IDG_VS_TOOLBAR_CALLBROWSER1_ACTIONS     0x06E0
+#define IDG_VS_TOOLBAR_CALLBROWSER2_ACTIONS     0x06E1
+#define IDG_VS_TOOLBAR_CALLBROWSER3_ACTIONS     0x06E2
+#define IDG_VS_TOOLBAR_CALLBROWSER4_ACTIONS     0x06E3
+#define IDG_VS_TOOLBAR_CALLBROWSER5_ACTIONS     0x06E4
+#define IDG_VS_TOOLBAR_CALLBROWSER6_ACTIONS     0x06E5
+#define IDG_VS_TOOLBAR_CALLBROWSER7_ACTIONS     0x06E6
+#define IDG_VS_TOOLBAR_CALLBROWSER8_ACTIONS     0x06E7
+#define IDG_VS_TOOLBAR_CALLBROWSER9_ACTIONS     0x06E8
+#define IDG_VS_TOOLBAR_CALLBROWSER10_ACTIONS    0x06E9
+#define IDG_VS_TOOLBAR_CALLBROWSER11_ACTIONS    0x06EA
+#define IDG_VS_TOOLBAR_CALLBROWSER12_ACTIONS    0x06EB
+#define IDG_VS_TOOLBAR_CALLBROWSER13_ACTIONS    0x06EC
+#define IDG_VS_TOOLBAR_CALLBROWSER14_ACTIONS    0x06ED
+#define IDG_VS_TOOLBAR_CALLBROWSER15_ACTIONS    0x06EE
+#define IDG_VS_TOOLBAR_CALLBROWSER16_ACTIONS    0x06EF
+
+///////////////////////////////////////////////
+//
+// VS Enterprise menu and menu groups
+//
+///////////////////////////////////////////////
+
+// Team Foundation Client standard menu
+#define IDM_MENU_TEAM_FOUNDATION_CLIENT     0x700
+#define IDM_MENU_PROJECT_CONTEXT_MENU       0x707
+#define IDM_TEAM_PROJECT_SETTINGS_MENU      0x708
+#define IDM_TEAM_SERVER_SETTINGS_MENU       0x709
+
+// Team Foundation Client Toolbar Group
+#define IDG_TEAM_FOUNDATION_CLIENT_TOOLBAR  0x701
+
+// Commands on the Team menu for projects that require project context
+#define IDG_MENU_PROJECT_CONTEXT            0x702
+// Commands on the Team menu shared by tools (e.g. Properties)
+#define IDG_SHARED_COMMANDS                 0x703
+// Tool-specific commands on the Team menu
+#define IDG_TOOL_COMMANDS                   0x704
+
+// Team Project Settings Cascade Menu Group
+#define IDG_TEAM_PROJECT_SETTINGS_COMMANDS  0x705
+// Team Server Settings Cascade Menu Group
+#define IDG_TEAM_SERVER_SETTINGS_COMMANDS   0x706
+
+// Commands on the TE context menu for projects that require project context
+#define IDG_CTXT_PROJECT_CONTEXT            0x710
+
+
+////////////////////////////////////////////////
+//
+// Refactor menu groups
+//
+////////////////////////////////////////////////
+
+#define IDG_REFACTORING_COMMON              0x1801
+#define IDG_REFACTORING_ADVANCED            0x1802
+
+#define IDBI_ExtractMethod      1
+#define IDBI_EncapsulateField   2
+#define IDBI_ExtractInterface   3
+#define IDBI_Rename             4
+#define IDBI_ReorderParameters  5
+#define IDBI_RemoveParameters   6
+#define IDBI_AddUsing           7
+#define IDBI_GenerateMethod     8
+#define IDBI_PromoteLocal       9
+#define IDBI_Snippet            10
+
+
+///////////////////////////////////////////////
+//
+// Server Explorer menu groups
+//
+///////////////////////////////////////////////
+
+// Groups
+#define IDG_SE_CONTEXT_GENERAL                  0x0312
+#define IDG_SE_CONTEXT_DELETE                   0x0313
+#define IDG_SE_CONTEXT_DATA                     0x0314
+#define IDG_SE_CONTEXT_NODE                     0x0315
+#define IDG_SE_CONTEXT_DATAPROP                 0x0316
+#define IDG_SE_CONTEXT_SQLINSTANCE              0x0317
+
+#define IDG_SE_TOOLBAR_REFRESH                  0X0403
+#define IDG_SE_TOOLBAR_VIEW                     0x0404
+#define IDG_SE_TOOLBAR_VIEW_LIST                0x0405
+#define IDG_SE_TOOLBAR_VIEW_SAVE                0x0406
+
+// A new group under the Tools menu.  It's for <Add..> nodes.
+#define IDG_SE_TOOLS_ADD                        0x0408
+
+// Menus
+#define IDM_SE_CONTEXT_STANDARD                 0x0503
+#define IDM_SE_TOOLBAR_VIEW                     0x0504
+#define IDM_SE_TOOLBAR_SERVEREXPLORER           0x0600
+
+///////////////////////////////////////////////
+//
+// Data Explorer menu groups
+//
+///////////////////////////////////////////////
+
+#define IDG_DV_GLOBAL1                   0x4001
+#define IDG_DV_GLOBAL2                   0x4002
+#define IDG_DV_GLOBAL3                   0x4003
+#define IDG_DV_CONNECTION                0x4101
+
+// These are the old (DDEX 1.0) names
+#define IDG_DV_STATIC                    0x4401
+#define IDG_DV_OBJECT                    0x4301
+#define IDG_DV_STATICS                   0x4701
+#define IDG_DV_OBJECTS                   0x4501
+#define IDG_DV_MIXED_OBJECTS             0x4601
+#define IDG_DV_MIXED                     0x4801
+
+// These are the new (DDEX 2.0+) names
+#define IDG_DV_STATIC_NODE               0x4401
+#define IDG_DV_OBJECT_NODE               0x4301
+#define IDG_DV_STATIC_NODES              0x4701
+#define IDG_DV_HOMOGENOUS_OBJECT_NODES   0x4501
+#define IDG_DV_HETEROGENOUS_OBJECT_NODES 0x4601
+#define IDG_DV_HETEROGENOUS_NODES        0x4801
+
+//IDG_VS_TOOLBAR is a group that simply contains IDG_VS_TOOLBAR_LIST (the dynamic toolbar list) and IDG_VS_TOOLBAR_CUSTOMIZE (the customize
+//command).  This group is placed both on IDM_VS_CSCD_COMMANDBARS and the toolbar tray context menu (IDM_VS_CTXT_TOOLBARS)
+#define IDG_VS_TOOLBAR                   0x4802
+#define IDG_VS_TOOLBAR_LIST              0x4803
+#define IDG_VS_TOOLBAR_CUSTOMIZE         0x4804
+#define IDM_VS_CTXT_TOOLBARS             0x4805
+
+// Back/Forward Sub menus (replaced IDG_VS_CSCD_NAVIGATE)
+#define IDG_VS_CSCD_NAVIGATE1            0x5001
+#define IDG_VS_CSCD_NAVIGATE2            0x5002
+#define IDG_VS_CSCD_NAVIGATE3            0x5003
+#define IDG_VS_CSCD_NAVIGATE4            0x5004
+#define IDG_VS_CSCD_NAVIGATE5            0x5005
+#define IDG_VS_CSCD_NAVIGATE6            0x5006
+#define IDG_VS_CSCD_NAVIGATE7            0x5007
+#define IDG_VS_CSCD_NAVIGATE8            0x5008
+#define IDG_VS_CSCD_NAVIGATE9            0x5009
+#define IDG_VS_CSCD_NAVIGATE10            0x500A
+#define IDG_VS_CSCD_NAVIGATE11            0x500B
+#define IDG_VS_CSCD_NAVIGATE12            0x500C
+#define IDG_VS_CSCD_NAVIGATE13            0x500D
+#define IDG_VS_CSCD_NAVIGATE14            0x500E
+#define IDG_VS_CSCD_NAVIGATE15            0x500F
+#define IDG_VS_CSCD_NAVIGATE16            0x5010
+#define IDG_VS_CSCD_NAVIGATE17            0x5011
+#define IDG_VS_CSCD_NAVIGATE18            0x5012
+#define IDG_VS_CSCD_NAVIGATE19            0x5013
+#define IDG_VS_CSCD_NAVIGATE20            0x5014
+#define IDG_VS_CSCD_NAVIGATE21            0x5015
+#define IDG_VS_CSCD_NAVIGATE22            0x5016
+#define IDG_VS_CSCD_NAVIGATE23            0x5017
+#define IDG_VS_CSCD_NAVIGATE24            0x5017
+#define IDG_VS_CSCD_NAVIGATE25            0x5018
+#define IDG_VS_CSCD_NAVIGATE26            0x5019
+#define IDG_VS_CSCD_NAVIGATE27            0x501A
+#define IDG_VS_CSCD_NAVIGATE28            0x501B
+#define IDG_VS_CSCD_NAVIGATE29            0x501C
+#define IDG_VS_CSCD_NAVIGATE30            0x501D
+#define IDG_VS_CSCD_NAVIGATE31            0x501E
+#define IDG_VS_CSCD_NAVIGATE32            0x501F
+
+// Group containing explorer windows in other windows menu
+#define IDG_VS_WNDO_OTRWNDWSEXPLORERS 0x5200
+
+#endif // _VSSHLIDS_H_
diff --git a/tools/bin/ajaxmin.exe b/tools/bin/ajaxmin.exe
new file mode 100644
index 000000000..1e9834ae9
Binary files /dev/null and b/tools/bin/ajaxmin.exe differ
diff --git a/tools/bin/diff.exe b/tools/bin/diff.exe
new file mode 100644
index 000000000..d1246a1ef
Binary files /dev/null and b/tools/bin/diff.exe differ
diff --git a/tools/bin/nuget.exe b/tools/bin/nuget.exe
new file mode 100644
index 000000000..79482f60d
Binary files /dev/null and b/tools/bin/nuget.exe differ
diff --git a/tools/bin/sspp.exe b/tools/bin/sspp.exe
new file mode 100644
index 000000000..41f7b8943
Binary files /dev/null and b/tools/bin/sspp.exe differ
diff --git a/tools/bin/windiff.exe b/tools/bin/windiff.exe
new file mode 100644
index 000000000..a42f4d985
Binary files /dev/null and b/tools/bin/windiff.exe differ